You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/23 12:07:06 UTC
svn commit: r606550 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/
Author: aadamchik
Date: Sun Dec 23 03:07:03 2007
New Revision: 606550
URL: http://svn.apache.org/viewvc?rev=606550&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryTest.java Sun Dec 23 03:07:03 2007
@@ -50,7 +50,7 @@
createTestData("prepare");
NamedQuery q = new NamedQuery("AllMtTable1");
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(2, results.size());
assertTrue(results.get(0) instanceof ClientMtTable1);
@@ -60,7 +60,7 @@
createTestData("prepare");
SelectQuery q = new SelectQuery("MtTable1");
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(2, results.size());
@@ -71,7 +71,7 @@
createTestData("prepare");
SelectQuery q = new SelectQuery(ClientMtTable1.class);
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(2, results.size());
assertTrue(results.get(0) instanceof ClientMtTable1);
@@ -82,7 +82,7 @@
SelectQuery q = new SelectQuery(ClientMtTable1.class, Expression
.fromString("globalAttribute1 = 'g1'"));
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(1, results.size());
@@ -94,7 +94,7 @@
SelectQuery q = new SelectQuery(ClientMtTable1.class, Expression
.fromString("table2Array.globalAttribute = 'g1'"));
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(1, results.size());
assertTrue(results.get(0) instanceof ClientMtTable1);
@@ -105,7 +105,7 @@
SelectQuery q = new SelectQuery("MtTable1");
q.addOrdering(ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, true);
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(2, results.size());
@@ -118,7 +118,7 @@
q.clearOrderings();
q.addOrdering(ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, false);
- List results1 = buildContext().performQuery(q);
+ List<?> results1 = buildContext().performQuery(q);
assertEquals(2, results1.size());
@@ -133,7 +133,7 @@
SelectQuery q = new SelectQuery(ClientMtTable2.class, Expression
.fromString("globalAttribute = 'g1'"));
q.addPrefetch(ClientMtTable2.TABLE1_PROPERTY);
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(1, results.size());
@@ -155,13 +155,13 @@
SelectQuery q = new SelectQuery(ClientMtTable1.class, Expression
.fromString("globalAttribute1 = 'g1'"));
q.addPrefetch(ClientMtTable1.TABLE2ARRAY_PROPERTY);
- List results = buildContext().performQuery(q);
+ List<?> results = buildContext().performQuery(q);
assertEquals(1, results.size());
ClientMtTable1 result = (ClientMtTable1) results.get(0);
- List holder = result.getTable2ArrayDirect();
+ List<?> holder = result.getTable2ArrayDirect();
assertNotNull(holder);
assertTrue(holder instanceof PersistentObjectList);
PersistentObjectList objectHolder = (PersistentObjectList) holder;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java Sun Dec 23 03:07:03 2007
@@ -86,7 +86,7 @@
// read the CLOB in the new context
DataContext ctxt2 = createDataContext();
- List objects2 = ctxt2.performQuery(new SelectQuery(ClobTestEntity.class));
+ List<?> objects2 = ctxt2.performQuery(new SelectQuery(ClobTestEntity.class));
assertEquals(1, objects2.size());
ClobTestEntity clobObj2 = (ClobTestEntity) objects2.get(0);
@@ -99,7 +99,7 @@
// read into yet another context and check for changes
DataContext ctxt3 = createDataContext();
- List objects3 = ctxt3.performQuery(new SelectQuery(ClobTestEntity.class));
+ List<?> objects3 = ctxt3.performQuery(new SelectQuery(ClobTestEntity.class));
assertEquals(1, objects3.size());
ClobTestEntity clobObj3 = (ClobTestEntity) objects3.get(0);
@@ -126,7 +126,7 @@
// read the CLOB in the new context
DataContext ctxt2 = createDataContext();
- List objects2 = ctxt2.performQuery(new SelectQuery(ClobTestEntity.class));
+ List<?> objects2 = ctxt2.performQuery(new SelectQuery(ClobTestEntity.class));
assertEquals(1, objects2.size());
ClobTestEntity clobObj2 = (ClobTestEntity) objects2.get(0);
@@ -138,7 +138,7 @@
// read into yet another context and check for changes
DataContext ctxt3 = createDataContext();
- List objects3 = ctxt3.performQuery(new SelectQuery(ClobTestEntity.class));
+ List<?> objects3 = ctxt3.performQuery(new SelectQuery(ClobTestEntity.class));
assertEquals(1, objects3.size());
ClobTestEntity clobObj3 = (ClobTestEntity) objects3.get(0);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java Sun Dec 23 03:07:03 2007
@@ -110,14 +110,14 @@
public void testSelectCompound1() throws Exception {
populateTables();
SelectQuery query = new SelectQuery(CompoundPainting.class);
- List objects = ctxt.performQuery(query);
+ List<?> objects = ctxt.performQuery(query);
assertNotNull(objects);
assertEquals(3, objects.size());
assertTrue("CompoundPainting expected, got " + objects.get(0).getClass(), objects
.get(0) instanceof CompoundPainting);
- for (Iterator i = objects.iterator(); i.hasNext();) {
+ for (Iterator<?> i = objects.iterator(); i.hasNext();) {
CompoundPainting painting = (CompoundPainting) i.next();
Number id = (Number) painting
.getObjectId()
@@ -145,14 +145,14 @@
populateTables();
SelectQuery query = new SelectQuery(CompoundPainting.class, ExpressionFactory
.matchExp("artistName", "artist2"));
- List objects = ctxt.performQuery(query);
+ List<?> objects = ctxt.performQuery(query);
assertNotNull(objects);
assertEquals(1, objects.size());
assertTrue("CompoundPainting expected, got " + objects.get(0).getClass(), objects
.get(0) instanceof CompoundPainting);
- for (Iterator i = objects.iterator(); i.hasNext();) {
+ for (Iterator<?> i = objects.iterator(); i.hasNext();) {
CompoundPainting painting = (CompoundPainting) i.next();
Number id = (Number) painting
.getObjectId()
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java Sun Dec 23 03:07:03 2007
@@ -61,13 +61,13 @@
ctxt = createDataContext();
SelectQuery q = new SelectQuery(CompoundPkTestEntity.class);
- List objs = ctxt.performQuery(q);
+ List<?> objs = ctxt.performQuery(q);
assertEquals(1, objs.size());
master = (CompoundPkTestEntity) objs.get(0);
assertEquals("m1", master.getName());
- List details = master.getCompoundFkArray();
+ List<?> details = master.getCompoundFkArray();
assertEquals(1, details.size());
detail = (CompoundFkTestEntity) details.get(0);
@@ -105,7 +105,7 @@
Expression qual = ExpressionFactory.matchExp("toCompoundPk", master);
SelectQuery q = new SelectQuery(CompoundFkTestEntity.class, qual);
- List objs = ctxt.performQuery(q);
+ List<?> objs = ctxt.performQuery(q);
assertEquals(1, objs.size());
detail = (CompoundFkTestEntity) objs.get(0);
@@ -143,7 +143,7 @@
Expression qual = ExpressionFactory.matchExp("compoundFkArray", detail1);
SelectQuery q = new SelectQuery(CompoundPkTestEntity.class, qual);
- List objs = ctxt.performQuery(q);
+ List<?> objs = ctxt.performQuery(q);
assertEquals(1, objs.size());
master = (CompoundPkTestEntity) objs.get(0);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java Sun Dec 23 03:07:03 2007
@@ -60,7 +60,7 @@
query.setTemplate(
OpenBaseAdapter.class.getName(),
"select #result('COUNT(ARTIST_ID)' 'int' 'x') from ARTIST");
- Map count = (Map) DataObjectUtils.objectForQuery(context, query);
+ Map<?, ?> count = (Map<?, ?>) DataObjectUtils.objectForQuery(context, query);
assertNotNull(count);
assertEquals(new Integer(1), count.get("x"));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java Sun Dec 23 03:07:03 2007
@@ -59,7 +59,7 @@
public void testWillPerformGenericQuery() throws Exception {
- final List queriesPerformed = new ArrayList(1);
+ final List<Query> queriesPerformed = new ArrayList<Query>(1);
DataContextDelegate delegate = new MockDataContextDelegate() {
public Query willPerformGenericQuery(DataContext context, Query query) {
@@ -81,7 +81,7 @@
public void testWillPerformGenericQueryBlocked() throws Exception {
- final List queriesPerformed = new ArrayList(1);
+ final List<Query> queriesPerformed = new ArrayList<Query>(1);
DataContextDelegate delegate = new MockDataContextDelegate() {
public Query willPerformGenericQuery(DataContext context, Query query) {
@@ -102,7 +102,7 @@
public void testWillPerformQuery() throws Exception {
- final List queriesPerformed = new ArrayList(1);
+ final List<Query> queriesPerformed = new ArrayList<Query>(1);
DataContextDelegate delegate = new MockDataContextDelegate() {
public Query willPerformQuery(DataContext context, Query query) {
@@ -114,7 +114,7 @@
// test that delegate is consulted before select
SelectQuery query = new SelectQuery(Gallery.class);
- List results = context.performQuery(query);
+ List<?> results = context.performQuery(query);
assertTrue("Delegate is not notified of a query being run.", queriesPerformed
.contains(query));
@@ -124,7 +124,7 @@
public void testWillPerformQueryBlocked() throws Exception {
- final List queriesPerformed = new ArrayList(1);
+ final List<Query> queriesPerformed = new ArrayList<Query>(1);
DataContextDelegate delegate = new MockDataContextDelegate() {
public Query willPerformQuery(DataContext context, Query query) {
@@ -135,7 +135,7 @@
context.setDelegate(delegate);
SelectQuery query = new SelectQuery(Gallery.class);
- List results = context.performQuery(query);
+ List<?> results = context.performQuery(query);
assertTrue("Delegate is not notified of a query being run.", queriesPerformed
.contains(query));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java Sun Dec 23 03:07:03 2007
@@ -94,7 +94,7 @@
Artist.class,
"SELECT * FROM ARTIST_GROUP");
checkQuery.setFetchingDataRows(true);
- List joins1 = context.performQuery(checkQuery);
+ List<?> joins1 = context.performQuery(checkQuery);
assertEquals(1, joins1.size());
context.deleteObject(anArtist);
@@ -103,7 +103,7 @@
assertFalse(anArtist.getGroupArray().contains(aGroup));
context.commitChanges();
- List joins2 = context.performQuery(checkQuery);
+ List<?> joins2 = context.performQuery(checkQuery);
assertEquals(0, joins2.size());
}
@@ -129,14 +129,14 @@
Artist.class,
"SELECT * FROM ARTIST_GROUP");
checkQuery.setFetchingDataRows(true);
- List joins1 = context.performQuery(checkQuery);
+ List<?> joins1 = context.performQuery(checkQuery);
assertEquals(1, joins1.size());
context.deleteObject(aGroup);
assertFalse(anArtist.getGroupArray().contains(aGroup));
context.commitChanges();
- List joins2 = context.performQuery(checkQuery);
+ List<?> joins2 = context.performQuery(checkQuery);
assertEquals(0, joins2.size());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleTest.java Sun Dec 23 03:07:03 2007
@@ -98,11 +98,11 @@
ObjectContext context = createDataContext();
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = context.performQuery(query);
+ List<?> objects = context.performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<String> ids = new HashSet<String>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Manager m = (Manager) it.next();
ids.add(m.getName());
@@ -120,11 +120,11 @@
ObjectContext context = createDataContext();
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = context.performQuery(query);
+ List<?> objects = context.performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<String> ids = new HashSet<String>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Manager m = (Manager) it.next();
ids.add(m.getName());
@@ -143,7 +143,7 @@
ObjectContext context = createDataContext();
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = context.performQuery(query);
+ List<?> objects = context.performQuery(query);
assertEquals(0, objects.size());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java?rev=606550&r1=606549&r2=606550&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java Sun Dec 23 03:07:03 2007
@@ -42,11 +42,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle LIKE 'A%C'";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -61,11 +61,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle NOT LIKE 'A%C'";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(4, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -80,11 +80,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle LIKE '_DDDD'";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(3, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -101,11 +101,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle LIKE 'X_DDDD' ESCAPE 'X'";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -120,11 +120,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle IN ('A', 'B')";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -140,11 +140,11 @@
String ejbql = "SELECT p FROM Painting p WHERE p.paintingTitle NOT IN ('A', 'B')";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -161,11 +161,11 @@
+ ")";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -181,11 +181,11 @@
String ejbql = "SELECT a FROM Artist a WHERE a.paintingArray IS EMPTY";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -200,11 +200,11 @@
String ejbql = "SELECT a FROM Artist a WHERE a.paintingArray IS NOT EMPTY";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -220,11 +220,11 @@
String ejbql = "SELECT DISTINCT a FROM Artist a WHERE a.paintingArray IS NOT EMPTY";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -246,11 +246,11 @@
context,
Painting.class,
33010));
- List objects = context.performQuery(query);
+ List<?> objects = context.performQuery(query);
assertEquals(1, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -271,11 +271,11 @@
context,
Painting.class,
33010));
- List objects = context.performQuery(query);
+ List<?> objects = context.performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);
@@ -292,11 +292,11 @@
+ "WHERE p MEMBER OF a.paintingArray AND a.artistName = 'B'";
EJBQLQuery query = new EJBQLQuery(ejbql);
- List objects = createDataContext().performQuery(query);
+ List<?> objects = createDataContext().performQuery(query);
assertEquals(2, objects.size());
- Set ids = new HashSet();
- Iterator it = objects.iterator();
+ Set<Object> ids = new HashSet<Object>();
+ Iterator<?> it = objects.iterator();
while (it.hasNext()) {
Object id = DataObjectUtils.pkForObject((Persistent) it.next());
ids.add(id);