use var to eliminate some especially horrible local type declarations

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -55,6 +55,7 @@
 import org.hibernate.event.spi.PostLoadEventListener;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.InstanceIdentityMap;
+import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
@@ -1513,7 +1514,7 @@ public Entry<Object,EntityEntry>[] reentrantSafeEntityEntries() {
 	public Object getOwnerId(String entityName, String propertyName, Object childEntity, Map mergeMap) {
 		final String collectionRole = entityName + '.' + propertyName;
 
-		final MappingMetamodelImplementor mappingMetamodel = session.getFactory().getMappingMetamodel();
+		final MappingMetamodel mappingMetamodel = session.getFactory().getMappingMetamodel();
 		final EntityPersister persister = mappingMetamodel.getEntityDescriptor( entityName );
 		final CollectionPersister collectionPersister = mappingMetamodel.getCollectionDescriptor( collectionRole );
 
@@ -1534,7 +1535,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p
 
 		//not found in case, proceed
 		// iterate all the entities currently associated with the persistence context.
-		for ( Entry<Object,EntityEntry> me : reentrantSafeEntityEntries() ) {
+		for ( var me : reentrantSafeEntityEntries() ) {
 			final EntityEntry entityEntry = me.getValue();
 			// does this entity entry pertain to the entity persister in which we are interested (owner)?
 			if ( persister.isSubclassEntityName( entityEntry.getEntityName() ) ) {
@@ -1680,7 +1681,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity
 		}
 
 		//Not found in cache, proceed
-		for ( Entry<Object, EntityEntry> me : reentrantSafeEntityEntries() ) {
+		for ( var me : reentrantSafeEntityEntries() ) {
 			final EntityEntry ee = me.getValue();
 			if ( persister.isSubclassEntityName( ee.getEntityName() ) ) {
 				final Object instance = me.getKey();

hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java

@@ -5,7 +5,6 @@
 package org.hibernate.event.internal;
 
 import java.lang.invoke.MethodHandles;
-import java.util.Map;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -16,7 +15,6 @@
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.internal.Cascade;
 import org.hibernate.engine.internal.CascadePoint;
-import org.hibernate.engine.internal.Collections;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.ActionQueue;
 import org.hibernate.engine.spi.CascadingActions;
@@ -39,6 +37,7 @@
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.engine.internal.Collections.processUnreachableCollection;
 import static org.hibernate.engine.internal.Collections.skipRemoval;
 
 /**
@@ -126,11 +125,12 @@ protected void logFlushResults(FlushEvent event) {
 	 * any newly referenced entity that must be passed to saveOrUpdate(),
 	 * and also apply orphan delete
 	 */
-	private void prepareEntityFlushes(EventSource session, PersistenceContext persistenceContext) throws HibernateException {
+	private void prepareEntityFlushes(EventSource session, PersistenceContext persistenceContext)
+			throws HibernateException {
 		LOG.debug( "Processing flush-time cascades" );
 		final PersistContext context = PersistContext.create();
 		// safe from concurrent modification because of how concurrentEntries() is implemented on IdentityMap
-		for ( Map.Entry<Object,EntityEntry> me : persistenceContext.reentrantSafeEntityEntries() ) {
+		for ( var me : persistenceContext.reentrantSafeEntityEntries() ) {
 //		for ( Map.Entry me : IdentityMap.concurrentEntries( persistenceContext.getEntityEntries() ) ) {
 			final EntityEntry entry = me.getValue();
 			if ( flushable( entry ) ) {
@@ -145,7 +145,7 @@ void checkForTransientReferences(EventSource session, PersistenceContext persist
 		// processed, so that all entities which will be persisted are
 		// persistent when we do the check (I wonder if we could move this
 		// into Nullability, instead of abusing the Cascade infrastructure)
-		for ( Map.Entry<Object, EntityEntry> me : persistenceContext.reentrantSafeEntityEntries() ) {
+		for ( var me : persistenceContext.reentrantSafeEntityEntries() ) {
 			final EntityEntry entry = me.getValue();
 			if ( checkable( entry ) ) {
 				Cascade.cascade(
@@ -192,11 +192,10 @@ private void prepareCollectionFlushes(PersistenceContext persistenceContext) thr
 		// Initialize dirty flags for arrays + collections with composite elements
 		// and reset reached, doupdate, etc.
 		LOG.debug( "Dirty checking collections" );
-		final Map<PersistentCollection<?>, CollectionEntry> collectionEntries =
-				persistenceContext.getCollectionEntries();
+		final var collectionEntries = persistenceContext.getCollectionEntries();
 		if ( collectionEntries != null ) {
-			for ( Map.Entry<PersistentCollection<?>, CollectionEntry> entry :
-					( (InstanceIdentityMap<PersistentCollection<?>, CollectionEntry>) collectionEntries ).toArray() ) {
+			final var identityMap = (InstanceIdentityMap<PersistentCollection<?>, CollectionEntry>) collectionEntries;
+			for ( var entry : identityMap.toArray() ) {
 				entry.getValue().preFlush( entry.getKey() );
 			}
 		}
@@ -221,12 +220,12 @@ private int flushEntities(final FlushEvent event, final PersistenceContext persi
 		// collections that are changing roles. This might cause entities
 		// to be loaded.
 		// So this needs to be safe from concurrent modification problems.
-		final Map.Entry<Object,EntityEntry>[] entityEntries = persistenceContext.reentrantSafeEntityEntries();
+		final var entityEntries = persistenceContext.reentrantSafeEntityEntries();
 		final int count = entityEntries.length;
 
 		FlushEntityEvent entityEvent = null; //allow reuse of the event as it's heavily allocated in certain use cases
 		int eventGenerationId = 0; //Used to double-check the instance reuse won't cause problems
-		for ( Map.Entry<Object,EntityEntry> me : entityEntries ) {
+		for ( var me : entityEntries ) {
 			// Update the status of the object and if necessary, schedule an update
 			final EntityEntry entry = me.getValue();
 			final Status status = entry.getStatus();
@@ -270,17 +269,18 @@ private FlushEntityEvent createOrReuseEventInstance(
 	private int flushCollections(final EventSource session, final PersistenceContext persistenceContext)
 			throws HibernateException {
 		LOG.trace( "Processing unreferenced collections" );
-		final Map<PersistentCollection<?>, CollectionEntry> collectionEntries = persistenceContext.getCollectionEntries();
+		final var collectionEntries = persistenceContext.getCollectionEntries();
 		final int count;
 		if ( collectionEntries == null ) {
 			count = 0;
 		}
 		else {
 			count = collectionEntries.size();
-			for ( Map.Entry<PersistentCollection<?>, CollectionEntry> me : ( (InstanceIdentityMap<PersistentCollection<?>, CollectionEntry>) collectionEntries ).toArray() ) {
+			final var identityMap = (InstanceIdentityMap<PersistentCollection<?>, CollectionEntry>) collectionEntries;
+			for ( var me : identityMap.toArray() ) {
 				final CollectionEntry ce = me.getValue();
 				if ( !ce.isReached() && !ce.isIgnore() ) {
-					Collections.processUnreachableCollection( me.getKey(), session );
+					processUnreachableCollection( me.getKey(), session );
 				}
 			}
 		}