more use of 'var' in engine package

Author: gavinking

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

@@ -6,10 +6,7 @@
 
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.cache.spi.access.CachedDomainDataAccess;
-import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.monitor.spi.EventMonitor;
-import org.hibernate.event.monitor.spi.DiagnosticEvent;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
@@ -39,11 +36,11 @@ public static Object fromSharedCache(
 			EntityPersister persister,
 			boolean isNaturalKey,
 			CachedDomainDataAccess cacheAccess) {
-		final SessionEventListenerManager eventListenerManager = session.getEventListenerManager();
+		final var eventListenerManager = session.getEventListenerManager();
 		Object cachedValue = null;
 		eventListenerManager.cacheGetStart();
-		final EventMonitor eventMonitor = session.getEventMonitor();
-		final DiagnosticEvent cacheGetEvent = eventMonitor.beginCacheGetEvent();
+		final var eventMonitor = session.getEventMonitor();
+		final var cacheGetEvent = eventMonitor.beginCacheGetEvent();
 		try {
 			cachedValue = cacheAccess.get( session, cacheKey );
 		}
@@ -66,11 +63,11 @@ public static Object fromSharedCache(
 			Object cacheKey,
 			CollectionPersister persister,
 			CachedDomainDataAccess cacheAccess) {
-		final SessionEventListenerManager eventListenerManager = session.getEventListenerManager();
+		final var eventListenerManager = session.getEventListenerManager();
 		Object cachedValue = null;
 		eventListenerManager.cacheGetStart();
-		final EventMonitor eventMonitor = session.getEventMonitor();
-		final DiagnosticEvent cacheGetEvent = eventMonitor.beginCacheGetEvent();
+		final var eventMonitor = session.getEventMonitor();
+		final var cacheGetEvent = eventMonitor.beginCacheGetEvent();
 		try {
 			cachedValue = cacheAccess.get( session, cacheKey );
 		}

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

@@ -10,8 +10,6 @@
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.EntityEntry;
-import org.hibernate.engine.spi.EntityKey;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.event.spi.EventSource;
@@ -46,9 +44,9 @@ public static void processUnreachableCollection(PersistentCollection<?> coll, Se
 	}
 
 	private static void processDereferencedCollection(PersistentCollection<?> coll, SessionImplementor session) {
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
-		final CollectionEntry entry = persistenceContext.getCollectionEntry( coll );
-		final CollectionPersister loadedPersister = entry.getLoadedPersister();
+		final var persistenceContext = session.getPersistenceContextInternal();
+		final var entry = persistenceContext.getCollectionEntry( coll );
+		final var loadedPersister = entry.getLoadedPersister();
 
 		if ( loadedPersister != null && LOG.isTraceEnabled() ) {
 			LOG.trace("Collection dereferenced: "
@@ -59,7 +57,7 @@ private static void processDereferencedCollection(PersistentCollection<?> coll,
 		final boolean hasOrphanDelete = loadedPersister != null && loadedPersister.hasOrphanDelete();
 		if ( hasOrphanDelete ) {
 			final Object ownerId = getOwnerId( coll, session, loadedPersister );
-			final EntityKey key = session.generateEntityKey( ownerId, loadedPersister.getOwnerEntityPersister() );
+			final var key = session.generateEntityKey( ownerId, loadedPersister.getOwnerEntityPersister() );
 			final Object owner = persistenceContext.getEntity( key );
 			if ( owner == null ) {
 				throw new AssertionFailure( "collection owner not associated with session: " + loadedPersister.getRole() );
@@ -95,7 +93,7 @@ private static Object getOwnerId(
 			// the persistence context
 			if ( session.getFactory().getSessionFactoryOptions()
 					.isIdentifierRollbackEnabled() ) {
-				final EntityEntry ownerEntry =
+				final var ownerEntry =
 						session.getPersistenceContextInternal()
 								.getEntry( coll.getOwner() );
 				if ( ownerEntry != null ) {
@@ -111,7 +109,7 @@ private static Object getOwnerId(
 
 	private static void processNeverReferencedCollection(PersistentCollection<?> coll, SessionImplementor session)
 			throws HibernateException {
-		final CollectionEntry entry =
+		final var entry =
 				session.getPersistenceContextInternal()
 						.getCollectionEntry( coll );
 
@@ -141,23 +139,23 @@ public static void processReachableCollection(
 			Object entity,
 			SessionImplementor session) {
 		collection.setOwner( entity );
-		final CollectionEntry ce =
+		final var entry =
 				session.getPersistenceContextInternal()
 						.getCollectionEntry( collection );
 
-		if ( ce == null ) {
+		if ( entry == null ) {
 			// refer to comment in StatefulPersistenceContext.addCollection()
 			throw new HibernateException( "Found two representations of same collection: " + type.getRole() );
 		}
 
-		final SessionFactoryImplementor factory = session.getFactory();
-		final CollectionPersister persister =
+		final var factory = session.getFactory();
+		final var persister =
 				factory.getMappingMetamodel()
 						.getCollectionDescriptor( type.getRole() );
 
-		ce.setCurrentPersister( persister );
+		entry.setCurrentPersister( persister );
 		//TODO: better to pass the id in as an argument?
-		ce.setCurrentKey( type.getKeyOfOwner( entity, session ) );
+		entry.setCurrentKey( type.getKeyOfOwner( entity, session ) );
 
 		final boolean isBytecodeEnhanced =
 				persister.getOwnerEntityPersister()
@@ -168,21 +166,21 @@ public static void processReachableCollection(
 			// 		- skip it
 			if ( LOG.isTraceEnabled() ) {
 				LOG.trace( "Skipping uninitialized bytecode-lazy collection: "
-						+ collectionInfoString( persister, collection, ce.getCurrentKey(), session ) );
+						+ collectionInfoString( persister, collection, entry.getCurrentKey(), session ) );
 			}
-			ce.setReached( true );
-			ce.setProcessed( true );
+			entry.setReached( true );
+			entry.setProcessed( true );
 			return;
 		}
 
 		// The CollectionEntry.isReached() stuff is just to detect any silly users
 		// who set up circular or shared references between/to collections.
-		if ( ce.isReached() ) {
+		if ( entry.isReached() ) {
 			// We've been here before
 			throw new HibernateException( "Found shared references to a collection: " + type.getRole() );
 		}
 
-		ce.setReached( true );
+		entry.setReached( true );
 
 		if ( LOG.isTraceEnabled() ) {
 			if ( collection.wasInitialized() ) {
@@ -191,13 +189,13 @@ public static void processReachableCollection(
 						collectionInfoString(
 								persister,
 								collection,
-								ce.getCurrentKey(),
+								entry.getCurrentKey(),
 								session
 						),
 						collectionInfoString(
-								ce.getLoadedPersister(),
+								entry.getLoadedPersister(),
 								collection,
-								ce.getLoadedKey(),
+								entry.getLoadedKey(),
 								session
 						)
 				);
@@ -208,20 +206,20 @@ public static void processReachableCollection(
 						collectionInfoString(
 								persister,
 								collection,
-								ce.getCurrentKey(),
+								entry.getCurrentKey(),
 								session
 						),
 						collectionInfoString(
-								ce.getLoadedPersister(),
+								entry.getLoadedPersister(),
 								collection,
-								ce.getLoadedKey(),
+								entry.getLoadedKey(),
 								session
 						)
 				);
 			}
 		}
 
-		prepareCollectionForUpdate( collection, ce, factory );
+		prepareCollectionForUpdate( collection, entry, factory );
 	}
 
 	/**
@@ -238,8 +236,8 @@ private static void prepareCollectionForUpdate(
 		}
 		entry.setProcessed( true );
 
-		final CollectionPersister loadedPersister = entry.getLoadedPersister();
-		final CollectionPersister currentPersister = entry.getCurrentPersister();
+		final var loadedPersister = entry.getLoadedPersister();
+		final var currentPersister = entry.getCurrentPersister();
 		if ( loadedPersister != null || currentPersister != null ) {
 			// it is or was referenced _somewhere_
 
@@ -301,9 +299,9 @@ public static boolean skipRemoval(EventSource session, CollectionPersister persi
 		if ( persister != null
 				// TODO: same optimization for @OneToMany @OnDelete(action=SET_NULL)
 				&& !persister.isOneToMany() && persister.isCascadeDeleteEnabled() ) {
-			final EntityKey entityKey = session.generateEntityKey( key, persister.getOwnerEntityPersister() );
-			final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
-			final EntityEntry entry = persistenceContext.getEntry( persistenceContext.getEntity( entityKey ) );
+			final var entityKey = session.generateEntityKey( key, persister.getOwnerEntityPersister() );
+			final var persistenceContext = session.getPersistenceContextInternal();
+			final var entry = persistenceContext.getEntry( persistenceContext.getEntity( entityKey ) );
 			return entry == null || entry.getStatus().isDeletedOrGone();
 		}
 		else {

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

@@ -11,7 +11,6 @@
 import org.hibernate.engine.spi.ManagedEntity;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
-import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.InstanceIdentityStore;
@@ -94,13 +93,13 @@ public void addEntityEntry(Object entity, EntityEntry entityEntry) {
 		// Determine the appropriate ManagedEntity instance to use based on whether the entity is enhanced or not.
 		// Throw an exception if entity is a mutable ManagedEntity that is associated with a different
 		// PersistenceContext.
-		ManagedEntity managedEntity = getAssociatedManagedEntity( entity );
+		var managedEntity = getAssociatedManagedEntity( entity );
 
 		int instanceId = nextManagedEntityInstanceId();
 		final boolean alreadyAssociated = managedEntity != null;
 		if ( !alreadyAssociated ) {
 			if ( isManagedEntity( entity ) ) {
-				final ManagedEntity managed = asManagedEntity( entity );
+				final var managed = asManagedEntity( entity );
 				assert managed.$$_hibernate_getInstanceId() == 0;
 				if ( entityEntry.getPersister().isMutable() ) {
 					managedEntity = managed;
@@ -164,13 +163,14 @@ private static boolean isReferenceCachingEnabled(EntityPersister persister) {
 
 	private ManagedEntity getAssociatedManagedEntity(Object entity) {
 		if ( isManagedEntity( entity ) ) {
-			final ManagedEntity managedEntity = asManagedEntity( entity );
+			final var managedEntity = asManagedEntity( entity );
 			if ( managedEntity.$$_hibernate_getEntityEntry() == null ) {
 				// it is not associated
 				return null;
 			}
-			final EntityEntryImpl entityEntry =
-					(EntityEntryImpl) managedEntity.$$_hibernate_getEntityEntry();
+			final var entityEntry =
+					(EntityEntryImpl)
+							managedEntity.$$_hibernate_getEntityEntry();
 
 			if ( entityEntry.getPersister().isMutable() ) {
 				return entityEntry.getPersistenceContext() == persistenceContext
@@ -210,7 +210,7 @@ private void putImmutableManagedEntity(ManagedEntity managed, int instanceId, Im
 
 	private void checkNotAssociatedWithOtherPersistenceContextIfMutable(ManagedEntity managedEntity) {
 		// we only have to check mutable managedEntity
-		final EntityEntryImpl entityEntry = (EntityEntryImpl) managedEntity.$$_hibernate_getEntityEntry();
+		final var entityEntry = (EntityEntryImpl) managedEntity.$$_hibernate_getEntityEntry();
 		if ( entityEntry == null ||
 				!entityEntry.getPersister().isMutable() ||
 				entityEntry.getPersistenceContext() == null ||
@@ -250,7 +250,7 @@ public boolean hasEntityEntry(Object entity) {
 	 */
 	public EntityEntry getEntityEntry(Object entity) {
 		// locate a ManagedEntity for the entity, but only if it is associated with the same PersistenceContext.
-		final ManagedEntity managedEntity = getAssociatedManagedEntity( entity );
+		final var managedEntity = getAssociatedManagedEntity( entity );
 		// and get/return the EntityEntry from the ManagedEntry
 		return managedEntity == null
 				? null
@@ -267,7 +267,7 @@ public EntityEntry getEntityEntry(Object entity) {
 	public EntityEntry removeEntityEntry(Object entity) {
 		// locate a ManagedEntity for the entity, but only if it is associated with the same PersistenceContext.
 		// no need to check if the entity is a ManagedEntity that is associated with a different PersistenceContext
-		final ManagedEntity managedEntity = getAssociatedManagedEntity( entity );
+		final var managedEntity = getAssociatedManagedEntity( entity );
 		if ( managedEntity == null ) {
 			// not associated with this EntityEntryContext, so nothing to do.
 			return null;
@@ -301,8 +301,8 @@ else if ( !isManagedEntity( entity ) ) {
 		}
 		else {
 			// otherwise, previous or next (or both) should be non-null
-			final ManagedEntity previous = managedEntity.$$_hibernate_getPreviousManagedEntity();
-			final ManagedEntity next = managedEntity.$$_hibernate_getNextManagedEntity();
+			final var previous = managedEntity.$$_hibernate_getPreviousManagedEntity();
+			final var next = managedEntity.$$_hibernate_getNextManagedEntity();
 			if ( previous == null ) {
 				// we are removing head
 				assert managedEntity == head;
@@ -340,7 +340,7 @@ public Map.Entry<Object, EntityEntry>[] reentrantSafeEntityEntries() {
 		if ( dirty ) {
 			reentrantSafeEntries = new EntityEntryCrossRefImpl[count];
 			int i = 0;
-			ManagedEntity managedEntity = head;
+			var managedEntity = head;
 			while ( managedEntity != null ) {
 				reentrantSafeEntries[i++] = new EntityEntryCrossRefImpl(
 						managedEntity.$$_hibernate_getEntityInstance(),
@@ -354,9 +354,9 @@ public Map.Entry<Object, EntityEntry>[] reentrantSafeEntityEntries() {
 	}
 
 	private void processEachManagedEntity(final Consumer<ManagedEntity> action) {
-		ManagedEntity node = head;
+		var node = head;
 		while ( node != null ) {
-			final ManagedEntity next = node.$$_hibernate_getNextManagedEntity();
+			final var next = node.$$_hibernate_getNextManagedEntity();
 			action.accept( node );
 			node = next;
 		}
@@ -367,9 +367,9 @@ private void processEachManagedEntity(final Consumer<ManagedEntity> action) {
 	// Also: we perform two operations at once, so to not iterate on the list twice;
 	// being a linked list, multiple iterations are not cache friendly at all.
 	private void clearAllReferencesFromManagedEntities() {
-		ManagedEntity nextManagedEntity = head;
+		var nextManagedEntity = head;
 		while ( nextManagedEntity != null ) {
-			final ManagedEntity current = nextManagedEntity;
+			final var current = nextManagedEntity;
 			nextManagedEntity = current.$$_hibernate_getNextManagedEntity();
 			Object toProcess = current.$$_hibernate_getEntityInstance();
 			unsetSession( asPersistentAttributeInterceptableOrNull( toProcess ) );
@@ -378,11 +378,10 @@ private void clearAllReferencesFromManagedEntities() {
 	}
 
 	private static void unsetSession(PersistentAttributeInterceptable persistentAttributeInterceptable) {
-		if ( persistentAttributeInterceptable != null ) {
-			final PersistentAttributeInterceptor interceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-			if ( interceptor instanceof LazyAttributeLoadingInterceptor ) {
-				( (LazyAttributeLoadingInterceptor) interceptor ).unsetSession();
-			}
+		if ( persistentAttributeInterceptable != null
+				&& persistentAttributeInterceptable.$$_hibernate_getInterceptor()
+						instanceof LazyAttributeLoadingInterceptor lazinessInterceptor ) {
+			lazinessInterceptor.unsetSession();
 		}
 	}
 
@@ -428,7 +427,7 @@ public void downgradeLocks() {
 	}
 
 	private static void downgradeLockOnManagedEntity(final ManagedEntity node) {
-		final EntityEntry entityEntry = node.$$_hibernate_getEntityEntry();
+		final var entityEntry = node.$$_hibernate_getEntityEntry();
 		if ( entityEntry != null ) {
 			entityEntry.setLockMode( LockMode.NONE );
 		}
@@ -448,7 +447,7 @@ public void serialize(ObjectOutputStream oos) throws IOException {
 			return;
 		}
 
-		ManagedEntity managedEntity = head;
+		var managedEntity = head;
 		while ( managedEntity != null ) {
 			// so we know whether or not to build a ManagedEntityImpl on deserialize
 			oos.writeBoolean( managedEntity == managedEntity.$$_hibernate_getEntityInstance() );
@@ -478,7 +477,7 @@ public static EntityEntryContext deserialize(ObjectInputStream ois, StatefulPers
 		final int count = ois.readInt();
 		log.tracef( "Starting deserialization of [%s] EntityEntry entries", count );
 
-		final EntityEntryContext context = new EntityEntryContext( rtn );
+		final var context = new EntityEntryContext( rtn );
 		context.count = count;
 		context.dirty = true;
 
@@ -499,19 +498,20 @@ public static EntityEntryContext deserialize(ObjectInputStream ois, StatefulPers
 				entityEntryClassNameArr[j] = ois.readChar();
 			}
 
-			final EntityEntry entry = deserializeEntityEntry( entityEntryClassNameArr, ois, rtn );
+			final var entry = deserializeEntityEntry( entityEntryClassNameArr, ois, rtn );
 
 			final int instanceId = context.nextManagedEntityInstanceId();
 			final ManagedEntity managedEntity;
 			if ( isEnhanced ) {
-				final ManagedEntity castedEntity = asManagedEntity( entity );
+				final var castedEntity = asManagedEntity( entity );
 				if ( entry.getPersister().isMutable() ) {
 					managedEntity = castedEntity;
 				}
 				else {
-					managedEntity = new ImmutableManagedEntityHolder( castedEntity );
+					final var holder = new ImmutableManagedEntityHolder( castedEntity );
+					managedEntity = holder;
 					if ( !isReferenceCachingEnabled( entry.getPersister() ) ) {
-						context.putImmutableManagedEntity( castedEntity, instanceId, (ImmutableManagedEntityHolder) managedEntity );
+						context.putImmutableManagedEntity( castedEntity, instanceId, holder );
 					}
 					else {
 						context.putManagedEntity( entity, castedEntity );