HHH-6862 Improve API of IdentityMap helpers to match actual use cases

Sanne · stliu · commit aa4954be8b12 · 2011-11-30T11:39:54.000+08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -1162,7 +1162,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p
 
 		//not found in case, proceed
 		// iterate all the entities currently associated with the persistence context.
-		Iterator<Entry<Object,EntityEntry>> entities = IdentityMap.entries(entityEntries).iterator();
+		Iterator<Entry<Object,EntityEntry>> entities = IdentityMap.entriesIterator( entityEntries );
 		while ( entities.hasNext() ) {
 			final Map.Entry<Object,EntityEntry> me = entities.next();
 			final EntityEntry entityEntry = me.getValue();
@@ -1286,7 +1286,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity
 		}
 
 		//Not found in cache, proceed
-		Iterator<Entry<Object,EntityEntry>> entities = IdentityMap.entries(entityEntries).iterator();
+		Iterator<Entry<Object,EntityEntry>> entities = IdentityMap.entriesIterator( entityEntries );
 		while ( entities.hasNext() ) {
 			Map.Entry<Object,EntityEntry> me = entities.next();
 			EntityEntry ee = me.getValue();
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -25,7 +25,6 @@
 
 import java.io.Serializable;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.jboss.logging.Logger;
@@ -187,11 +186,10 @@ private void prepareCollectionFlushes(PersistenceContext persistenceContext) thr
 
 		LOG.debug( "Dirty checking collections" );
 
-		final List list = IdentityMap.entries( persistenceContext.getCollectionEntries() );
-		final int size = list.size();
-		for ( int i = 0; i < size; i++ ) {
-			Map.Entry e = ( Map.Entry ) list.get( i );
-			( (CollectionEntry) e.getValue() ).preFlush( (PersistentCollection) e.getKey() );
+		Iterator<Map.Entry<PersistentCollection,CollectionEntry>> entriesIterator = IdentityMap.entriesIterator( persistenceContext.getCollectionEntries() );
+		while ( entriesIterator.hasNext() ) {
+			Map.Entry<PersistentCollection,CollectionEntry> e = entriesIterator.next();
+			e.getValue().preFlush( e.getKey() );
 		}
 	}
 
@@ -248,27 +246,25 @@ private void flushCollections(final EventSource session, final PersistenceContex
 
 		LOG.trace( "Processing unreferenced collections" );
 
-		List list = IdentityMap.entries( persistenceContext.getCollectionEntries() );
-		int size = list.size();
-		for ( int i = 0; i < size; i++ ) {
-			Map.Entry me = ( Map.Entry ) list.get( i );
-			CollectionEntry ce = (CollectionEntry) me.getValue();
+		Iterator<Map.Entry<PersistentCollection,CollectionEntry>> entriesIterator = IdentityMap.entriesIterator( persistenceContext.getCollectionEntries() );
+		while ( entriesIterator.hasNext() ) {
+			Map.Entry<PersistentCollection,CollectionEntry> me = entriesIterator.next();
+			CollectionEntry ce = me.getValue();
 			if ( !ce.isReached() && !ce.isIgnore() ) {
-				Collections.processUnreachableCollection( (PersistentCollection) me.getKey(), session );
+				Collections.processUnreachableCollection( me.getKey(), session );
 			}
 		}
 
 		// Schedule updates to collections:
 
 		LOG.trace( "Scheduling collection removes/(re)creates/updates" );
 
-		list = IdentityMap.entries( persistenceContext.getCollectionEntries() );
-		size = list.size();
+		entriesIterator = IdentityMap.entriesIterator( persistenceContext.getCollectionEntries() );
 		ActionQueue actionQueue = session.getActionQueue();
-		for ( int i = 0; i < size; i++ ) {
-			Map.Entry me = (Map.Entry) list.get(i);
-			PersistentCollection coll = (PersistentCollection) me.getKey();
-			CollectionEntry ce = (CollectionEntry) me.getValue();
+		while ( entriesIterator.hasNext() ) {
+			Map.Entry<PersistentCollection,CollectionEntry> me = entriesIterator.next();
+			PersistentCollection coll = me.getKey();
+			CollectionEntry ce = me.getValue();
 
 			if ( ce.isDorecreate() ) {
 				session.getInterceptor().onCollectionRecreate( coll, ce.getCurrentKey() );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
@@ -90,8 +90,8 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {
 		return ( (IdentityMap<K,V>) map ).entryArray();
 	}
 
-	public static <K,V> List<Entry<K,V>> entries(Map<K,V> map) {
-		return ( (IdentityMap<K,V>) map ).entryList();
+	public static <K,V> Iterator<Map.Entry<K,V>> entriesIterator(Map<K,V> map) {
+		return ( (IdentityMap<K,V>) map ).entryList().iterator();
 	}
 
 	public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {`
`90`	`90`	`return ( (IdentityMap<K,V>) map ).entryArray();`
`91`	`91`	`}`
`92`	`92`
`93`		`- public static <K,V> List<Entry<K,V>> entries(Map<K,V> map) {`
`94`		`- return ( (IdentityMap<K,V>) map ).entryList();`
	`93`	`+ public static <K,V> Iterator<Map.Entry<K,V>> entriesIterator(Map<K,V> map) {`
	`94`	`+ return ( (IdentityMap<K,V>) map ).entryList().iterator();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {`