Big clean up around natural id stuff

motivated by work on logging cleanup

Author: gavinking

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

@@ -52,10 +52,14 @@ public interface NaturalIdLogging extends BasicLogger {
 	void removingLocallyCachedNaturalIdResolution(String entityName, Object naturalId, Object id);
 
 	@LogMessage(level = TRACE)
-	@Message(value = "Resolved natural key [%s] -> primary key [%s] resolution in session cache for [%s]:", id = 90004)
+	@Message(value = "Resolved natural key [%s] -> primary key [%s] resolution in session cache for [%s]", id = 90004)
 	void resolvedNaturalIdInSessionCache(Object naturalId, Object pk, String entityName);
 
 	@LogMessage(level = TRACE)
 	@Message(value = "Found natural key [%s] -> primary key [%s] xref in second-level cache for [%s]", id = 90005)
 	void foundNaturalIdInSecondLevelCache(Object naturalId, Object pk, String entityName);
+
+	@LogMessage(level = TRACE)
+	@Message(value = "Retrieving primary key of %s from database for natural id: %s", id = 90006)
+	void retrievingIdForNaturalId(String entityName, Object naturalId);
 }

hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java

@@ -10,17 +10,18 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.id.IdentifierGenerationException;
-import org.hibernate.loader.LoaderLogging;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
 
 import java.util.Collection;
 
+import static org.hibernate.engine.internal.NaturalIdLogging.NATURAL_ID_LOGGER;
+
 /**
  * @author Gavin King
  */
 public class NaturalIdHelper {
+
 	public static String[] getNaturalIdPropertyNames(EntityPersister persister) {
 		final int[] naturalIdPropertyIndices = persister.getNaturalIdentifierProperties();
 		if ( naturalIdPropertyIndices == null ) {
@@ -43,58 +44,41 @@ public static void performAnyNeededCrossReferenceSynchronizations(
 			boolean synchronizationEnabled,
 			EntityMappingType entityMappingType,
 			SharedSessionContractImplementor session) {
-
-		if ( !synchronizationEnabled ) {
-			// synchronization (this process) was disabled
-			return;
-		}
-
-		final NaturalIdMapping naturalIdMapping = entityMappingType.getNaturalIdMapping();
-
-		if ( !naturalIdMapping.isMutable() ) {
-			// only mutable natural-ids need this processing
-			return;
-		}
-
-		if ( ! session.isTransactionInProgress() ) {
-			// not in a transaction so skip synchronization
-			return;
-		}
-
-		final EntityPersister entityPersister = entityMappingType.getEntityPersister();
-
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
-		final Collection<?> cachedPkResolutions =
-				persistenceContext.getNaturalIdResolutions()
-						.getCachedPkResolutions( entityPersister );
-		final boolean loggerDebugEnabled = LoaderLogging.LOADER_LOGGER.isDebugEnabled();
-		for ( Object pk : cachedPkResolutions ) {
-			final EntityKey entityKey = session.generateEntityKey( pk, entityPersister );
-			final Object entity = persistenceContext.getEntity( entityKey );
-			final EntityEntry entry = persistenceContext.getEntry( entity );
-
-			if ( entry == null ) {
-				if ( loggerDebugEnabled ) {
-					LoaderLogging.LOADER_LOGGER.debugf(
-							"Cached natural-id/pk resolution linked to null EntityEntry in persistence context: %s#%s",
-							entityMappingType.getEntityName(),
-							pk
-					);
+		// first check if synchronization (this process) was disabled
+		if ( synchronizationEnabled
+				// only mutable natural-ids need this processing
+				&& entityMappingType.getNaturalIdMapping().isMutable()
+				// skip synchronization when not in a transaction
+				&& session.isTransactionInProgress() ) {
+			final EntityPersister entityPersister = entityMappingType.getEntityPersister();
+			final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
+			final Collection<?> cachedResolutions =
+					persistenceContext.getNaturalIdResolutions()
+							.getCachedPkResolutions( entityPersister );
+			final boolean loggerDebugEnabled = NATURAL_ID_LOGGER.isDebugEnabled();
+			for ( Object id : cachedResolutions ) {
+				final EntityKey entityKey = session.generateEntityKey( id, entityPersister );
+				final Object entity = persistenceContext.getEntity( entityKey );
+				final EntityEntry entry = persistenceContext.getEntry( entity );
+				if ( entry != null ) {
+					if ( entry.requiresDirtyCheck( entity )
+							// MANAGED is the only status we care about here
+							&& entry.getStatus() == Status.MANAGED ) {
+						persistenceContext.getNaturalIdResolutions()
+								.handleSynchronization( id, entity, entityPersister );
+					}
+				}
+				else {
+					// no entry
+					if ( loggerDebugEnabled ) {
+						NATURAL_ID_LOGGER.debugf(
+								"Cached natural-id/pk resolution linked to missing EntityEntry in persistence context: %s#%s",
+								entityMappingType.getEntityName(),
+								id
+						);
+					}
 				}
-				continue;
-			}
-
-			if ( !entry.requiresDirtyCheck( entity ) ) {
-				continue;
-			}
-
-			// MANAGED is the only status we care about here...
-			if ( entry.getStatus() != Status.MANAGED ) {
-				continue;
 			}
-
-			persistenceContext.getNaturalIdResolutions().handleSynchronization( pk, entity, entityPersister );
 		}
 	}
-
 }