HHH-16383 - NaturalIdClass

# Conflicts:
#	hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java

@@ -29,7 +29,40 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
-import org.hibernate.annotations.*;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.CacheLayout;
+import org.hibernate.annotations.Check;
+import org.hibernate.annotations.Checks;
+import org.hibernate.annotations.ConcreteProxy;
+import org.hibernate.annotations.DiscriminatorFormula;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.Filters;
+import org.hibernate.annotations.HQLSelect;
+import org.hibernate.annotations.Immutable;
+import org.hibernate.annotations.Mutability;
+import org.hibernate.annotations.NaturalIdCache;
+import org.hibernate.annotations.NaturalIdClass;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OptimisticLockType;
+import org.hibernate.annotations.OptimisticLocking;
+import org.hibernate.annotations.QueryCacheLayout;
+import org.hibernate.annotations.RowId;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLDeleteAll;
+import org.hibernate.annotations.SQLInsert;
+import org.hibernate.annotations.SQLRestriction;
+import org.hibernate.annotations.SQLSelect;
+import org.hibernate.annotations.SQLUpdate;
+import org.hibernate.annotations.SecondaryRow;
+import org.hibernate.annotations.SecondaryRows;
+import org.hibernate.annotations.SoftDelete;
+import org.hibernate.annotations.Subselect;
+import org.hibernate.annotations.Synchronize;
+import org.hibernate.annotations.TypeBinderType;
+import org.hibernate.annotations.View;
 import org.hibernate.binder.TypeBinder;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.model.internal.InheritanceState.ElementsToProcess;
@@ -86,6 +119,7 @@
 
 import static jakarta.persistence.InheritanceType.SINGLE_TABLE;
 import static java.util.Collections.addAll;
+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.boot.model.internal.AnnotatedClassType.MAPPED_SUPERCLASS;
 import static org.hibernate.boot.model.internal.AnnotatedDiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN_NAME;
 import static org.hibernate.boot.model.internal.AnnotatedDiscriminatorColumn.buildDiscriminatorColumn;
@@ -112,7 +146,6 @@
 import static org.hibernate.boot.spi.AccessType.getAccessStrategy;
 import static org.hibernate.engine.OptimisticLockStyle.fromLockType;
 import static org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle.fromResultCheckStyle;
-import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.internal.util.ReflectHelper.getDefaultSupplier;
 import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.internal.util.StringHelper.isNotBlank;
@@ -159,7 +192,7 @@ public class EntityBinder {
 	private String cacheRegion;
 	private boolean cacheLazyProperty;
 	private String naturalIdCacheRegion;
-	private Class<?> naturalIdClass;
+	private ClassDetails naturalIdClass;
 	private CacheLayout queryCacheLayout;
 
 	private ModelsContext modelsContext() {
@@ -1340,7 +1373,7 @@ private void bindRootEntity() {
 			rootClass.setLazyPropertiesCacheable( cacheLazyProperty );
 		}
 		rootClass.setNaturalIdCacheRegionName( naturalIdCacheRegion );
-		rootClass.setNaturalIdClass(  naturalIdClass );
+		rootClass.setNaturalIdClass( naturalIdClass );
 	}
 
 	private void bindCustomSql() {
@@ -1618,7 +1651,16 @@ private SQLRestriction extractSQLRestriction(ClassDetails classDetails) {
 
 	private void bindNaturalIdClass() {
 		final var ann = annotatedClass.getAnnotationUsage( NaturalIdClass.class, modelsContext() );
-		naturalIdClass = ann != null ? ann.value() : null;
+		if ( ann != null ) {
+			if ( ann.value() == void.class ) {
+				throw new IllegalStateException( "NaturalIdClass#value must not be void.class" );
+			}
+			naturalIdClass = context
+					.getBootstrapContext()
+					.getModelsContext()
+					.getClassDetailsRegistry()
+					.resolveClassDetails( ann.value().getName() );
+		}
 	}
 
 	private void bindNaturalIdCache() {

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

@@ -151,6 +151,11 @@ public List<T> multiLoad(Object... ids) {
 			}
 
 			try {
+				// normalize the incoming natural-id values
+				for ( int i = 0; i < ids.length; i++ ) {
+					ids[i] = entityDescriptor.getNaturalIdMapping().normalizeInput( ids[ i ] );
+				}
+
 				return (List<T>)
 						entityDescriptor.getMultiNaturalIdLoader()
 								.multiLoad( ids, this, session );

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java

@@ -144,9 +144,8 @@ private <K> Object[] checkPersistenceContextForCachedResults(
 			Consumer<E> results ) {
 		final List<K> unresolvedIds = arrayList( naturalIds.length );
 		final var context = session.getPersistenceContextInternal();
-		final var naturalIdMapping = getEntityDescriptor().getNaturalIdMapping();
 		for ( K naturalId : naturalIds ) {
-			final Object entity = entityForNaturalId( context, naturalIdMapping.normalizeInput( naturalId ) );
+			final Object entity = entityForNaturalId( context, naturalId );
 			if ( entity != null ) {
 				// Entity is already in the persistence context
 				final var entry = context.getEntry( entity );

hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java

@@ -12,6 +12,7 @@
 import org.hibernate.annotations.SoftDeleteType;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.models.spi.ClassDetails;
 
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.ReflectHelper.overridesEquals;
@@ -34,7 +35,7 @@ public final class RootClass extends PersistentClass implements TableOwner, Soft
 	private String cacheConcurrencyStrategy;
 	private String cacheRegionName;
 	private boolean lazyPropertiesCacheable = true;
-	private Class<?> naturalIdClass;
+	private ClassDetails naturalIdClass;
 	private String naturalIdCacheRegionName;
 
 	private Value discriminator;
@@ -366,11 +367,11 @@ public void setLazyPropertiesCacheable(boolean lazyPropertiesCacheable) {
 		this.lazyPropertiesCacheable = lazyPropertiesCacheable;
 	}
 
-	public Class<?> getNaturalIdClass() {
+	public ClassDetails getNaturalIdClass() {
 		return naturalIdClass;
 	}
 
-	public void setNaturalIdClass(Class<?> naturalIdClass) {
+	public void setNaturalIdClass(ClassDetails naturalIdClass) {
 		this.naturalIdClass = naturalIdClass;
 	}