HHH-18959 remove unused ResolveNaturalIdEvent stuff

this has all been obsolete since Hibernate 6.0

Author: gavinking

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

@@ -29,7 +29,6 @@
 import org.hibernate.event.internal.DefaultPreLoadEventListener;
 import org.hibernate.event.internal.DefaultRefreshEventListener;
 import org.hibernate.event.internal.DefaultReplicateEventListener;
-import org.hibernate.event.internal.DefaultResolveNaturalIdEventListener;
 import org.hibernate.event.internal.PostDeleteEventListenerStandardImpl;
 import org.hibernate.event.internal.PostInsertEventListenerStandardImpl;
 import org.hibernate.event.internal.PostUpdateEventListenerStandardImpl;
@@ -75,7 +74,6 @@
 import static org.hibernate.event.spi.EventType.PRE_UPSERT;
 import static org.hibernate.event.spi.EventType.REFRESH;
 import static org.hibernate.event.spi.EventType.REPLICATE;
-import static org.hibernate.event.spi.EventType.RESOLVE_NATURAL_ID;
 
 /**
  * Standard implementation of EventListenerRegistry
@@ -240,9 +238,6 @@ private void applyStandardListeners() {
 			// load listeners
 			prepareListeners( LOAD, new DefaultLoadEventListener() );
 
-			// resolve natural-id listeners
-			prepareListeners( RESOLVE_NATURAL_ID, new DefaultResolveNaturalIdEventListener() );
-
 			// load-collection listeners
 			prepareListeners( INIT_COLLECTION, new DefaultInitializeCollectionEventListener() );
 

hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java

@@ -25,7 +25,6 @@ public final class EventType<T> {
 	private static final AtomicInteger STANDARD_TYPE_COUNTER = new AtomicInteger();
 
 	public static final EventType<LoadEventListener> LOAD = create( "load", LoadEventListener.class );
-	public static final EventType<ResolveNaturalIdEventListener> RESOLVE_NATURAL_ID = create( "resolve-natural-id", ResolveNaturalIdEventListener.class );
 
 	public static final EventType<InitializeCollectionEventListener> INIT_COLLECTION = create( "load-collection", InitializeCollectionEventListener.class );
 

hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java

@@ -117,7 +117,6 @@ public final class FastSessionServices {
 	public final EventListenerGroup<PreUpsertEventListener> eventListenerGroup_PRE_UPSERT;
 	public final EventListenerGroup<RefreshEventListener> eventListenerGroup_REFRESH;
 	public final EventListenerGroup<ReplicateEventListener> eventListenerGroup_REPLICATE;
-	public final EventListenerGroup<ResolveNaturalIdEventListener> eventListenerGroup_RESOLVE_NATURAL_ID;
 
 	// Fields used only from within this package
 	final boolean disallowOutOfTransactionUpdateOperations;
@@ -196,7 +195,6 @@ public final class FastSessionServices {
 		this.eventListenerGroup_PRE_UPSERT = listeners( eventListenerRegistry, EventType.PRE_UPSERT );
 		this.eventListenerGroup_REFRESH = listeners( eventListenerRegistry, EventType.REFRESH );
 		this.eventListenerGroup_REPLICATE = listeners( eventListenerRegistry, EventType.REPLICATE );
-		this.eventListenerGroup_RESOLVE_NATURAL_ID = listeners( eventListenerRegistry, EventType.RESOLVE_NATURAL_ID );
 
 		//Other highly useful constants:
 		this.dialect = jdbcServices.getJdbcEnvironment().getDialect();

hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java

@@ -104,8 +104,6 @@
 import org.hibernate.event.spi.RefreshEventListener;
 import org.hibernate.event.spi.ReplicateEvent;
 import org.hibernate.event.spi.ReplicateEventListener;
-import org.hibernate.event.spi.ResolveNaturalIdEvent;
-import org.hibernate.event.spi.ResolveNaturalIdEventListener;
 import org.hibernate.loader.internal.CacheLoadHelper;
 import org.hibernate.resource.transaction.spi.TransactionObserver;
 import org.hibernate.event.monitor.spi.EventMonitor;
@@ -1286,14 +1284,6 @@ private void fireLoadNoChecks(final LoadEvent event, final LoadType loadType) {
 				.fireEventOnEachListener( event, loadType, LoadEventListener::onLoad );
 	}
 
-	private void fireResolveNaturalId(final ResolveNaturalIdEvent event) {
-		checkOpenOrWaitingForAutoClose();
-		pulseTransactionCoordinator();
-		fastSessionServices.eventListenerGroup_RESOLVE_NATURAL_ID
-				.fireEventOnEachListener( event, ResolveNaturalIdEventListener::onResolveNaturalId );
-		delayedAfterCompletion();
-	}
-
 
 	// refresh() operations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java

@@ -74,34 +74,29 @@ public T load(Object naturalIdValue) {
 		return doLoad( entityPersister().getNaturalIdMapping().normalizeInput( naturalIdValue) );
 	}
 
+	/**
+	 * Verify that the given natural id is "simple".
+	 * <p>
+	 * We allow compound natural id "simple" loading if all the values are passed as an array,
+	 * list, or map. We assume an array is properly ordered following the attribute ordering.
+	 * For lists, just like arrays, we assume the user has ordered them properly; for maps,
+	 * the key is expected to be the attribute name.
+	 */
 	private void verifySimplicity(Object naturalIdValue) {
 		assert naturalIdValue != null;
-
-		if ( hasSimpleNaturalId ) {
-			// implicitly
-			return;
-		}
-
-		if ( naturalIdValue.getClass().isArray() ) {
-			// we allow compound natural-id "simple" loading all the values are passed as an array
-			// (we assume the array is properly ordered following the mapping-model attribute ordering)
-			return;
-		}
-
-		if ( naturalIdValue instanceof List || naturalIdValue instanceof Map ) {
-			// also allowed.  For Lists, just like arrays, we assume the user has ordered them properly;
-			// for Maps, the key is expected to be the attribute name
-			return;
+		if ( !hasSimpleNaturalId
+				&& !naturalIdValue.getClass().isArray()
+				&& !(naturalIdValue instanceof List)
+				&& !(naturalIdValue instanceof Map) ) {
+			throw new HibernateException(
+					String.format(
+							Locale.ROOT,
+							"Cannot interpret natural-id value [%s] for compound natural-id: %s",
+							naturalIdValue,
+							entityPersister().getEntityName()
+					)
+			);
 		}
-
-		throw new HibernateException(
-				String.format(
-						Locale.ROOT,
-						"Cannot interpret natural-id value [%s] for compound natural-id: %s",
-						naturalIdValue,
-						entityPersister().getEntityName()
-				)
-		);
 	}
 
 	@Override