consistently reuse local vars in actions

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -127,24 +127,27 @@ protected final void nullifyTransientReferencesIfNotAlready() {
 	 */
 	public final void makeEntityManaged() {
 		nullifyTransientReferencesIfNotAlready();
-		final Object version = getVersion( getState(), getPersister() );
+		final var persister = getPersister();
+		final var key = getEntityKey();
+		final Object[] state = getState();
+		final Object version = getVersion( state, persister );
 		final var persistenceContext = getSession().getPersistenceContextInternal();
-		final var entityHolder = persistenceContext.addEntityHolder( getEntityKey(), getInstance() );
+		final var entityHolder = persistenceContext.addEntityHolder( key, getInstance() );
 		final var entityEntry = persistenceContext.addEntry(
 				getInstance(),
-				getPersister().isMutable() ? Status.MANAGED : Status.READ_ONLY,
-				getState(),
+				persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
+				state,
 				getRowId(),
-				getEntityKey().getIdentifier(),
+				key.getIdentifier(),
 				version,
 				LockMode.WRITE,
 				isExecuted,
-				getPersister(),
+				persister,
 				isVersionIncrementDisabled
 		);
 		entityHolder.setEntityEntry( entityEntry );
 		if ( isEarlyInsert() ) {
-			addCollectionsByKeyToPersistenceContext( persistenceContext, getState() );
+			addCollectionsByKeyToPersistenceContext( persistenceContext, state );
 		}
 	}
 
@@ -270,7 +273,8 @@ protected void handleNaturalIdPreSaveNotifications() {
 	 * @param generatedId The generated entity identifier
 	 */
 	public void handleNaturalIdPostSaveNotifications(Object generatedId) {
-		final var naturalIdMapping = getPersister().getNaturalIdMapping();
+		final var persister = getPersister();
+		final var naturalIdMapping = persister.getNaturalIdMapping();
 		if ( naturalIdMapping != null ) {
 			final Object naturalIdValues = naturalIdMapping.extractNaturalIdFromEntityState( state );
 			final var resolutions = getNaturalIdResolutions();
@@ -279,7 +283,7 @@ public void handleNaturalIdPostSaveNotifications(Object generatedId) {
 				resolutions.manageLocalResolution(
 						generatedId,
 						naturalIdValues,
-						getPersister(),
+						persister,
 						CachedNaturalIdValueSource.INSERT
 				);
 			}
@@ -288,7 +292,7 @@ public void handleNaturalIdPostSaveNotifications(Object generatedId) {
 					generatedId,
 					naturalIdValues,
 					null,
-					getPersister(),
+					persister,
 					CachedNaturalIdValueSource.INSERT
 			);
 		}

hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java

@@ -112,7 +112,7 @@ public void execute() throws HibernateException {
 					.removeLocalResolution(
 							getId(),
 							naturalIdMapping.extractNaturalIdFromEntityState( state ),
-							getPersister()
+							persister
 					);
 		}
 
@@ -139,20 +139,21 @@ public void execute() throws HibernateException {
 			postDeleteUnloaded( id, persister, session, ck );
 		}
 
-		final var statistics = getSession().getFactory().getStatistics();
+		final var statistics = session.getFactory().getStatistics();
 		if ( statistics.isStatisticsEnabled() && !veto ) {
-			statistics.deleteEntity( getPersister().getEntityName() );
+			statistics.deleteEntity( persister.getEntityName() );
 		}
 	}
 
 	protected Object getCurrentVersion() {
-		return getPersister().isVersionPropertyGenerated()
-						// skip if we're deleting an unloaded proxy, no need for the version
-						&& isInstanceLoaded()
+		final var persister = getPersister();
+		return persister.isVersionPropertyGenerated()
+			// skip if we're deleting an unloaded proxy, no need for the version
+			&& isInstanceLoaded()
 				// we need to grab the version value from the entity, otherwise
 				// we have issues with generated-version entities that may have
 				// multiple actions queued during the same flush
-				? getPersister().getVersion( getInstance() )
+				? persister.getVersion( getInstance() )
 				: version;
 	}
 
@@ -287,13 +288,14 @@ protected void unlockCacheItem() {
 	protected void removeCacheItem(Object ck) {
 		final var persister = getPersister();
 		if ( persister.canWriteToCache() ) {
-			persister.getCacheAccessStrategy().remove( getSession(), ck );
+			final var cache = persister.getCacheAccessStrategy();
+			cache.remove( getSession(), ck );
 
 			final var statistics = getSession().getFactory().getStatistics();
 			if ( statistics.isStatisticsEnabled() ) {
 				statistics.entityCacheRemove(
 						StatsHelper.getRootEntityRole( persister ),
-						getPersister().getCacheAccessStrategy().getRegion().getName()
+						cache.getRegion().getName()
 				);
 			}
 		}

hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java

@@ -79,9 +79,10 @@ public void execute() throws HibernateException {
 			final var eventMonitor = session.getEventMonitor();
 			final var event = eventMonitor.beginEntityInsertEvent();
 			boolean success = false;
+			final Object[] state = getState();
 			final GeneratedValues generatedValues;
 			try {
-				generatedValues = persister.getInsertCoordinator().insert( instance, getState(), session );
+				generatedValues = persister.getInsertCoordinator().insert( instance, state, session );
 				generatedId = castNonNull( generatedValues ).getGeneratedValue( persister.getIdentifierMapping() );
 				success = true;
 			}
@@ -96,12 +97,12 @@ public void execute() throws HibernateException {
 				}
 			}
 			if ( persister.hasInsertGeneratedProperties() ) {
-				persister.processInsertGeneratedProperties( generatedId, instance, getState(), generatedValues, session );
+				persister.processInsertGeneratedProperties( generatedId, instance, state, generatedValues, session );
 			}
 			//need to do that here rather than in the save event listener to let
 			//the post insert events to have an id-filled entity when IDENTITY is used (EJB3)
 			persister.setIdentifier( instance, generatedId, session );
-			persistenceContext.registerInsertedKey( getPersister(), generatedId );
+			persistenceContext.registerInsertedKey( persister, generatedId );
 			entityKey = session.generateEntityKey( generatedId, persister );
 			persistenceContext.checkUniqueness( entityKey, getInstance() );
 		}
@@ -118,7 +119,7 @@ public void execute() throws HibernateException {
 
 		final var statistics = session.getFactory().getStatistics();
 		if ( statistics.isStatisticsEnabled() && !isVeto() ) {
-			statistics.insertEntity( getPersister().getEntityName() );
+			statistics.insertEntity( persister.getEntityName() );
 		}
 
 		markExecuted();

hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java

@@ -116,7 +116,7 @@ public void execute() throws HibernateException {
 			}
 			entry.postInsert( getState() );
 			handleGeneratedProperties( entry, generatedValues, persistenceContext );
-			persistenceContext.registerInsertedKey( persister, getId() );
+			persistenceContext.registerInsertedKey( persister, id );
 			addCollectionsByKeyToPersistenceContext( persistenceContext, getState() );
 		}
 		putCacheIfNecessary();
@@ -136,16 +136,17 @@ private void handleGeneratedProperties(
 			GeneratedValues generatedValues,
 			PersistenceContext persistenceContext) {
 		final var persister = getPersister();
+		final Object[] state = getState();
 		if ( persister.hasInsertGeneratedProperties() ) {
 			final Object instance = getInstance();
-			persister.processInsertGeneratedProperties( getId(), instance, getState(), generatedValues, getSession() );
+			persister.processInsertGeneratedProperties( getId(), instance, state, generatedValues, getSession() );
 			if ( persister.isVersionPropertyGenerated() ) {
-				version = Versioning.getVersion( getState(), persister );
+				version = Versioning.getVersion( state, persister );
 			}
-			entry.postUpdate( instance, getState(), version );
+			entry.postUpdate( instance, state, version );
 		}
 		else if ( persister.isVersionPropertyGenerated() ) {
-			version = Versioning.getVersion( getState(), persister );
+			version = Versioning.getVersion( state, persister );
 			entry.postInsert( version );
 		}
 		// Process row-id values when available early by replacing the entity entry

hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java

@@ -87,7 +87,8 @@ public EntityUpdateAction(
 			previousNaturalIdValues = null;
 		}
 		else {
-			previousNaturalIdValues = determinePreviousNaturalIdValues( persister, naturalIdMapping, id, previousState, session );
+			previousNaturalIdValues =
+					determinePreviousNaturalIdValues( persister, naturalIdMapping, id, previousState, session );
 			session.getPersistenceContextInternal().getNaturalIdResolutions().manageLocalResolution(
 					id,
 					naturalIdMapping.extractNaturalIdFromEntityState( state ),
@@ -223,7 +224,7 @@ else if ( session.getCacheMode().isPutEnabled() ) {
 				if ( put && statistics.isStatisticsEnabled() ) {
 					statistics.entityCachePut(
 							StatsHelper.getRootEntityRole( persister ),
-							getPersister().getCacheAccessStrategy().getRegion().getName()
+							persister.getCacheAccessStrategy().getRegion().getName()
 					);
 				}
 			}
@@ -439,18 +440,19 @@ protected void cacheAfterUpdate(EntityDataAccess cache, Object ck, SharedSession
 			put = cache.afterUpdate( session, ck, cacheEntry, nextVersion, previousVersion, lock );
 		}
 		finally {
+			final var persister = getPersister();
 			eventMonitor.completeCachePutEvent(
 					cachePutEvent,
 					session,
 					cache,
-					getPersister(),
+					persister,
 					put,
 					EventMonitor.CacheActionDescription.ENTITY_AFTER_UPDATE
 			);
 			final var statistics = session.getFactory().getStatistics();
 			if ( put && statistics.isStatisticsEnabled() ) {
 				statistics.entityCachePut(
-						StatsHelper.getRootEntityRole( getPersister() ),
+						StatsHelper.getRootEntityRole( persister ),
 						cache.getRegion().getName()
 				);
 			}