HHH-18062 Fix id-class record instantiation and mapper component

Author: mbellade

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

@@ -495,7 +495,7 @@ private boolean mapAsIdClass(
 			else {
 				final boolean ignoreIdAnnotations = isIgnoreIdAnnotations();
 				setIgnoreIdAnnotations( true );
-				bindIdClass(
+				final Component idClassComponent = bindIdClass(
 						inferredData,
 						baseInferredData,
 						propertyHolder,
@@ -514,6 +514,9 @@ private boolean mapAsIdClass(
 						propertyAccessor,
 						true
 				);
+				if ( idClassComponent.isSimpleRecord() ) {
+					mapper.setSimpleRecord( true );
+				}
 				setIgnoreIdAnnotations( ignoreIdAnnotations );
 				for ( Property property : mapper.getProperties() ) {
 					idPropertiesIfIdClass.add( property.getName() );
@@ -656,7 +659,7 @@ private static boolean isIdClassPkOfTheAssociatedEntity(
 		}
 	}
 
-	private void bindIdClass(
+	private Component bindIdClass(
 			PropertyData inferredData,
 			PropertyData baseInferredData,
 			PropertyHolder propertyHolder,
@@ -707,6 +710,8 @@ private void bindIdClass(
 		rootClass.setEmbeddedIdentifier( inferredData.getPropertyClass() == null );
 
 		propertyHolder.setInIdClass( null );
+
+		return id;
 	}
 
 	private static void handleIdGenerator(PropertyData inferredData, MetadataBuildingContext buildingContext, Component id) {

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

@@ -108,6 +108,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
 	private QualifiedName structName;
 	private String[] structColumnNames;
 	private transient Class<?> componentClass;
+	private transient Boolean simpleRecord;
 
 	private transient Generator builtIdentifierGenerator;
 
@@ -377,6 +378,7 @@ public String getParentProperty() {
 	public void setComponentClassName(String componentClass) {
 		this.componentClassName = componentClass;
 		this.componentClass = null;
+		this.simpleRecord = null;
 	}
 
 	public void setEmbedded(boolean embedded) {
@@ -899,26 +901,33 @@ private int[] sortProperties(boolean forceRetainOriginalOrder) {
 		return this.originalPropertyOrder = originalPropertyOrder;
 	}
 
-	private boolean isSimpleRecord() {
-		// A simple record is given, when the properties match the order of the record component names
-		final Class<?> componentClass = resolveComponentClass();
-		if ( customInstantiator != null ) {
-			return false;
-		}
-		if ( componentClass == null || !ReflectHelper.isRecord( componentClass ) ) {
-			return false;
-		}
-		final String[] recordComponentNames = ReflectHelper.getRecordComponentNames( componentClass );
-		if ( recordComponentNames.length != properties.size() ) {
-			return false;
-		}
-		for ( int i = 0; i < recordComponentNames.length; i++ ) {
-			if ( !recordComponentNames[i].equals( properties.get( i ).getName() ) ) {
-				return false;
+	public void setSimpleRecord(boolean simpleRecord) {
+		this.simpleRecord = simpleRecord;
+	}
+
+	public boolean isSimpleRecord() {
+		Boolean simple = simpleRecord;
+		if ( simple == null ) {
+			// A simple record is given, when the properties match the order of the record component names
+			final Class<?> componentClass = resolveComponentClass();
+			if ( customInstantiator != null ) {
+				return simpleRecord = false;
+			}
+			if ( componentClass == null || !ReflectHelper.isRecord( componentClass ) ) {
+				return simpleRecord = false;
 			}
+			final String[] recordComponentNames = ReflectHelper.getRecordComponentNames( componentClass );
+			if ( recordComponentNames.length != properties.size() ) {
+				return simpleRecord = false;
+			}
+			for ( int i = 0; i < recordComponentNames.length; i++ ) {
+				if ( !recordComponentNames[i].equals( properties.get( i ).getName() ) ) {
+					return simpleRecord = false;
+				}
+			}
+			simple = simpleRecord = true;
 		}
-
-		return true;
+		return simple;
 	}
 
 	public Class<? extends EmbeddableInstantiator> getCustomInstantiator() {

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java

@@ -74,7 +74,11 @@ public IdClassEmbeddable(
 				.getJavaTypeRegistry()
 				.resolveManagedTypeDescriptor( idClassSource.getComponentClass() );
 
-		this.representationStrategy = new IdClassRepresentationStrategy( this );
+		this.representationStrategy = new IdClassRepresentationStrategy(
+				this,
+				idClassSource.sortProperties() == null,
+				idClassSource::getPropertyNames
+		);
 
 		final PropertyAccess propertyAccess = PropertyAccessStrategyMapImpl.INSTANCE.buildPropertyAccess(
 				null,
@@ -101,7 +105,7 @@ public IdClassEmbeddable(
 				propertyAccess
 		);
 
-		final CompositeType idClassType = (CompositeType) idClassSource.getType();
+		final CompositeType idClassType = idClassSource.getType();
 		( (CompositeTypeImplementor) idClassType ).injectMappingModelPart( embedded, creationProcess );
 
 		creationProcess.registerInitializationCallback(
@@ -127,10 +131,16 @@ public IdClassEmbeddable(
 		super( new MutableAttributeMappingList( inverseMappingType.attributeMappings.size() ) );
 
 		this.navigableRole = inverseMappingType.getNavigableRole();
-		this.idMapping = (NonAggregatedIdentifierMapping) valueMapping;;
+		this.idMapping = (NonAggregatedIdentifierMapping) valueMapping;
 		this.virtualIdEmbeddable = (VirtualIdEmbeddable) valueMapping.getEmbeddableTypeDescriptor();
 		this.javaType = inverseMappingType.javaType;
-		this.representationStrategy = new IdClassRepresentationStrategy( this );
+		this.representationStrategy = new IdClassRepresentationStrategy( this, false, () -> {
+			final String[] attributeNames = new String[inverseMappingType.getNumberOfAttributeMappings()];
+			for ( int i = 0; i < attributeNames.length; i++ ) {
+				attributeNames[i] = inverseMappingType.getAttributeMapping( i ).getAttributeName();
+			}
+			return attributeNames;
+		} );
 		this.embedded = valueMapping;
 		this.selectableMappings = selectableMappings;
 		creationProcess.registerInitializationCallback(

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassRepresentationStrategy.java

@@ -7,12 +7,14 @@
 package org.hibernate.metamodel.mapping.internal;
 
 import java.util.Locale;
+import java.util.function.Supplier;
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.spi.ReflectionOptimizer;
 import org.hibernate.mapping.Property;
 import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.metamodel.internal.EmbeddableInstantiatorPojoStandard;
+import org.hibernate.metamodel.internal.EmbeddableInstantiatorRecordIndirecting;
 import org.hibernate.metamodel.internal.EmbeddableInstantiatorRecordStandard;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
 import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
@@ -29,11 +31,29 @@ public class IdClassRepresentationStrategy implements EmbeddableRepresentationSt
 	private final JavaType<?> idClassType;
 	private final EmbeddableInstantiator instantiator;
 
-	public IdClassRepresentationStrategy(IdClassEmbeddable idClassEmbeddable) {
+	public IdClassRepresentationStrategy(
+			IdClassEmbeddable idClassEmbeddable,
+			boolean simplePropertyOrder,
+			Supplier<String[]> attributeNamesAccess) {
 		this.idClassType = idClassEmbeddable.getMappedJavaType();
-		this.instantiator = isRecord( idClassType.getJavaTypeClass() ) ?
-				new EmbeddableInstantiatorRecordStandard( idClassType.getJavaTypeClass() ) :
-				new EmbeddableInstantiatorPojoStandard( idClassType.getJavaTypeClass(), () -> idClassEmbeddable );
+		final Class<?> javaTypeClass = idClassType.getJavaTypeClass();
+		if ( isRecord( javaTypeClass ) ) {
+			if ( simplePropertyOrder ) {
+				this.instantiator = new EmbeddableInstantiatorRecordStandard( javaTypeClass );
+			}
+			else {
+				this.instantiator = EmbeddableInstantiatorRecordIndirecting.of(
+						javaTypeClass,
+						attributeNamesAccess.get()
+				);
+			}
+		}
+		else {
+			this.instantiator = new EmbeddableInstantiatorPojoStandard(
+					idClassType.getJavaTypeClass(),
+					() -> idClassEmbeddable
+			);
+		}
 	}
 
 	@Override