HHH-19756 Improve sub-part resolution when specifying a treat type

Author: mbellade

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -333,6 +333,7 @@
 import static org.hibernate.internal.util.collections.CollectionHelper.toSmallList;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.supportsSqlArrayType;
 import static org.hibernate.metamodel.RepresentationMode.POJO;
+import static org.hibernate.metamodel.mapping.MappingModelHelper.isCompatibleModelPart;
 import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
 import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
 import static org.hibernate.pretty.MessageHelper.infoString;
@@ -6219,50 +6220,30 @@ public ModelPart findSubPart(String name, EntityMappingType treatTargetType) {
 			}
 		}
 
-		if ( treatTargetType != null ) {
-			if ( ! treatTargetType.isTypeOrSuperType( this ) ) {
+		if ( treatTargetType == null ) {
+			final var subDefinedAttribute = findSubPartInSubclassMappings( name );
+			if ( subDefinedAttribute != null ) {
+				return subDefinedAttribute;
+			}
+		}
+		else if ( treatTargetType != this ) {
+			if ( !treatTargetType.isTypeOrSuperType( this ) ) {
 				return null;
 			}
-
-			if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
-				for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
-					if ( ! treatTargetType.isTypeOrSuperType( subMappingType ) ) {
-						continue;
-					}
-
-					final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );
-
-					if ( subDefinedAttribute != null ) {
-						return subDefinedAttribute;
-					}
-				}
+			// Prefer attributes defined in the treat target type or its subtypes
+			final var treatTypeSubPart = treatTargetType.findSubTypesSubPart( name, null );
+			if ( treatTypeSubPart != null ) {
+				return treatTypeSubPart;
 			}
-		}
-		else {
-			if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
-				ModelPart attribute = null;
-				for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
-					final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );
-					if ( subDefinedAttribute != null ) {
-						if ( attribute != null && !MappingModelHelper.isCompatibleModelPart( attribute, subDefinedAttribute ) ) {
-							throw new PathException(
-									String.format(
-											Locale.ROOT,
-											"Could not resolve attribute '%s' of '%s' due to the attribute being declared in multiple subtypes '%s' and '%s'",
-											name,
-											getJavaType().getTypeName(),
-											attribute.asAttributeMapping().getDeclaringType()
-													.getJavaType().getTypeName(),
-											subDefinedAttribute.asAttributeMapping().getDeclaringType()
-													.getJavaType().getTypeName()
-									)
-							);
-						}
-						attribute = subDefinedAttribute;
+			else {
+				// If not found, look in the treat target type's supertypes
+				EntityMappingType superType = treatTargetType.getSuperMappingType();
+				while ( superType != this ) {
+					final var superTypeSubPart = superType.findDeclaredAttributeMapping( name );
+					if ( superTypeSubPart != null ) {
+						return superTypeSubPart;
 					}
-				}
-				if ( attribute != null ) {
-					return attribute;
+					superType = superType.getSuperMappingType();
 				}
 			}
 		}
@@ -6285,22 +6266,37 @@ public ModelPart findSubPart(String name, EntityMappingType treatTargetType) {
 		}
 	}
 
+	private ModelPart findSubPartInSubclassMappings(String name) {
+		ModelPart attribute = null;
+		if ( isNotEmpty( subclassMappingTypes ) ) {
+			for ( var subMappingType : subclassMappingTypes.values() ) {
+				final var subDefinedAttribute = subMappingType.findSubTypesSubPart( name, null );
+				if ( subDefinedAttribute != null ) {
+					if ( attribute != null && !isCompatibleModelPart( attribute, subDefinedAttribute ) ) {
+						throw new PathException( String.format(
+								Locale.ROOT,
+								"Could not resolve attribute '%s' of '%s' due to the attribute being declared in multiple subtypes '%s' and '%s'",
+								name,
+								getJavaType().getTypeName(),
+								attribute.asAttributeMapping().getDeclaringType().getJavaType().getTypeName(),
+								subDefinedAttribute.asAttributeMapping().getDeclaringType().getJavaType().getTypeName()
+						) );
+					}
+					attribute = subDefinedAttribute;
+				}
+			}
+		}
+		return attribute;
+	}
+
 	@Override
 	public ModelPart findSubTypesSubPart(String name, EntityMappingType treatTargetType) {
 		final AttributeMapping declaredAttribute = declaredAttributeMappings.get( name );
 		if ( declaredAttribute != null ) {
 			return declaredAttribute;
 		}
 		else {
-			if ( subclassMappingTypes != null && !subclassMappingTypes.isEmpty() ) {
-				for ( EntityMappingType subMappingType : subclassMappingTypes.values() ) {
-					final ModelPart subDefinedAttribute = subMappingType.findSubTypesSubPart( name, treatTargetType );
-					if ( subDefinedAttribute != null ) {
-						return subDefinedAttribute;
-					}
-				}
-			}
-			return null;
+			return findSubPartInSubclassMappings( name );
 		}
 	}