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 18:29:20 UTC
svn commit: r606578 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/access/ test/java/org/apache/cayenne/access/
Author: aadamchik
Date: Sun Dec 23 09:29:18 2007
New Revision: 606578
URL: http://svn.apache.org/viewvc?rev=606578&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushObserver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OperationObserver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java Sun Dec 23 09:29:18 2007
@@ -30,6 +30,7 @@
import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
@@ -53,11 +54,11 @@
private final DataDomain domain;
private DataContext context;
- private Map changesByObjectId;
+ private Map<Object, ObjectDiff> changesByObjectId;
private CompoundDiff resultDiff;
private Collection<ObjectId> resultDeletedIds;
- private Map resultModifiedSnapshots;
+ private Map<ObjectId, DataRow> resultModifiedSnapshots;
private Collection<ObjectId> resultIndirectlyModifiedIds;
private DataDomainInsertBucket insertBucket;
@@ -91,12 +92,12 @@
return resultIndirectlyModifiedIds;
}
- Map getResultModifiedSnapshots() {
+ Map<ObjectId, DataRow> getResultModifiedSnapshots() {
return resultModifiedSnapshots;
}
ObjectDiff objectDiff(Object objectId) {
- return (ObjectDiff) changesByObjectId.get(objectId);
+ return changesByObjectId.get(objectId);
}
void addFlattenedInsert(DbEntity flattenedEntity, FlattenedArcKey flattenedInsertInfo) {
@@ -139,7 +140,7 @@
this.resultDiff = new CompoundDiff();
this.resultDeletedIds = new ArrayList<ObjectId>();
- this.resultModifiedSnapshots = new HashMap();
+ this.resultModifiedSnapshots = new HashMap<ObjectId, DataRow>();
runQueries();
@@ -157,7 +158,7 @@
ObjectStore objectStore = context.getObjectStore();
- Iterator it = changesByObjectId.keySet().iterator();
+ Iterator<?> it = changesByObjectId.keySet().iterator();
while (it.hasNext()) {
ObjectId id = (ObjectId) it.next();
Persistent object = (Persistent) objectStore.getNode(id);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushObserver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushObserver.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushObserver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushObserver.java Sun Dec 23 09:29:18 2007
@@ -19,7 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Iterator;
import java.util.List;
import org.apache.cayenne.CayenneException;
@@ -59,7 +58,7 @@
public void nextGeneratedDataRows(Query query, ResultIterator keysIterator) {
// read and close the iterator before doing anything else
- List keys;
+ List<DataRow> keys;
try {
keys = keysIterator.dataRows(true);
}
@@ -87,7 +86,7 @@
"One and only one PK row is expected, instead got " + keys.size());
}
- DataRow key = (DataRow) keys.get(0);
+ DataRow key = keys.get(0);
// empty key?
if (key.size() == 0) {
@@ -107,9 +106,7 @@
+ key);
}
- Iterator it = batch.getDbEntity().getGeneratedAttributes().iterator();
- while (it.hasNext()) {
- DbAttribute attribute = (DbAttribute) it.next();
+ for (DbAttribute attribute : batch.getDbEntity().getGeneratedAttributes()) {
// batch can have generated attributes that are not PKs, e.g. columns with
// DB DEFAULT values. Ignore those.
@@ -130,7 +127,7 @@
public void nextCount(Query query, int resultCount) {
}
- public void nextDataRows(Query query, List dataRows) {
+ public void nextDataRows(Query query, List<DataRow> dataRows) {
}
public void nextDataRows(Query q, ResultIterator it) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java Sun Dec 23 09:29:18 2007
@@ -170,7 +170,8 @@
if (!objectsByDescriptor.isEmpty()) {
CompoundDiff result = parent.getResultDiff();
- Map modifiedSnapshots = parent.getResultModifiedSnapshots();
+ Map<ObjectId, DataRow> modifiedSnapshots = parent
+ .getResultModifiedSnapshots();
Collection<ObjectId> deletedIds = parent.getResultDeletedIds();
for (Map.Entry<ClassDescriptor, List<Persistent>> entry : objectsByDescriptor
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java Sun Dec 23 09:29:18 2007
@@ -86,7 +86,7 @@
}
protected Map objectMap;
- protected Map changes;
+ protected Map<Object, ObjectDiff> changes;
// a sequential id used to tag GraphDiffs so that they can later be sorted in the
// original creation order
@@ -128,7 +128,7 @@
public ObjectStore(DataRowStore dataRowCache, Map objectMap) {
setDataRowCache(dataRowCache);
this.objectMap = objectMap != null ? objectMap : ObjectStore.createObjectMap();
- this.changes = new HashMap();
+ this.changes = new HashMap<Object, ObjectDiff>();
}
/**
@@ -142,7 +142,7 @@
diff.setDiffId(++currentDiffId);
}
- ObjectDiff objectDiff = (ObjectDiff) changes.get(nodeId);
+ ObjectDiff objectDiff = changes.get(nodeId);
if (objectDiff == null) {
@@ -365,7 +365,7 @@
// reset changes ... using new HashMap to allow event listeners to analyze the
// original changes map after the rollback
- this.changes = new HashMap();
+ this.changes = new HashMap<Object, ObjectDiff>();
}
/**
@@ -407,7 +407,7 @@
*
* @since 1.2
*/
- Map getChangesByObjectId() {
+ Map<Object, ObjectDiff> getChangesByObjectId() {
return changes;
}
@@ -416,9 +416,7 @@
*/
void postprocessAfterPhantomCommit() {
- Iterator it = changes.keySet().iterator();
- while (it.hasNext()) {
- ObjectId id = (ObjectId) it.next();
+ for (Object id : changes.keySet()) {
Persistent object = (Persistent) objectMap.get(id);
@@ -490,7 +488,7 @@
// create new instance of changes map so that event listeners who stored the
// original diff don't get affected
- this.changes = new HashMap();
+ this.changes = new HashMap<Object, ObjectDiff>();
}
/**
@@ -690,7 +688,7 @@
object.setObjectId((ObjectId) newId);
objectMap.put(newId, object);
- Object change = changes.remove(nodeId);
+ ObjectDiff change = changes.remove(nodeId);
if (change != null) {
changes.put(newId, change);
}
@@ -750,7 +748,7 @@
nodeCreated(nodeId);
delegate.finishedProcessDelete(dataObject);
- }
+ }
break;
}
@@ -1098,7 +1096,7 @@
public String getCacheKey() {
return cacheKey;
}
-
+
public SQLResultSetMapping getResultSetMapping() {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java Sun Dec 23 09:29:18 2007
@@ -53,7 +53,7 @@
preprocess(objectStore);
}
- Map getChangesByObjectId() {
+ Map<Object, ObjectDiff> getChangesByObjectId() {
return objectStore.getChangesByObjectId();
}
@@ -124,9 +124,8 @@
return true;
}
- Iterator it = getChangesByObjectId().values().iterator();
- while (it.hasNext()) {
- if (!((ObjectDiff) it.next()).isNoop()) {
+ for (ObjectDiff diff : getChangesByObjectId().values()) {
+ if (!diff.isNoop()) {
return false;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OperationObserver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OperationObserver.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OperationObserver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OperationObserver.java Sun Dec 23 09:29:18 2007
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.access;
import java.util.List;
@@ -60,7 +59,7 @@
public void nextDataRows(Query q, ResultIterator it);
/**
- * Callback method invoked after each batch of generated values is read durring an
+ * Callback method invoked after each batch of generated values is read during an
* update.
*
* @since 1.2
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java?rev=606578&r1=606577&r2=606578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java Sun Dec 23 09:29:18 2007
@@ -93,10 +93,8 @@
int oldRule = changeDeleteRule(DeleteRule.NO_ACTION);
try {
- DeleteRuleFlatA a = context
- .newObject(DeleteRuleFlatA.class);
- DeleteRuleFlatB b = context
- .newObject(DeleteRuleFlatB.class);
+ DeleteRuleFlatA a = context.newObject(DeleteRuleFlatA.class);
+ DeleteRuleFlatB b = context.newObject(DeleteRuleFlatB.class);
a.addToFlatB(b);
context.commitChanges();
@@ -123,10 +121,8 @@
ObjRelationship reverse = unsetReverse();
try {
- DeleteRuleFlatA a = context
- .newObject(DeleteRuleFlatA.class);
- DeleteRuleFlatB b = context
- .newObject(DeleteRuleFlatB.class);
+ DeleteRuleFlatA a = context.newObject(DeleteRuleFlatA.class);
+ DeleteRuleFlatB b = context.newObject(DeleteRuleFlatB.class);
a.addToFlatB(b);
context.commitChanges();
@@ -367,8 +363,7 @@
}
private void assertJoinNotDeleted(DeleteRuleFlatA a, DeleteRuleFlatB b) {
- ObjectDiff changes = (ObjectDiff) context.getObjectStore().changes.get(a
- .getObjectId());
+ ObjectDiff changes = context.getObjectStore().changes.get(a.getObjectId());
if (changes != null) {
Collection diffs = new ArrayList();