HHH-17491 Fix checking subtype attribute declared in MappedSuperclass

Author: mbellade

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java

@@ -36,6 +36,7 @@
 import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.MappingModelHelper;
+import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.model.domain.internal.AttributeContainer;
 import org.hibernate.metamodel.model.domain.internal.DomainModelHelper;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
@@ -206,19 +207,45 @@ private boolean isCompatible(PersistentAttribute<?, ?> attribute1, PersistentAtt
 			return true;
 		}
 		final MappingMetamodel runtimeMetamodels = jpaMetamodel().getMappingMetamodel();
-		final EntityMappingType entity1 = runtimeMetamodels.getEntityDescriptor(
-				attribute1.getDeclaringType().getTypeName()
+		final ModelPart modelPart1 = getEntityAttributeModelPart(
+				attribute1,
+				attribute1.getDeclaringType(),
+				runtimeMetamodels
 		);
-		final EntityMappingType entity2 = runtimeMetamodels.getEntityDescriptor(
-				attribute2.getDeclaringType().getTypeName()
+		final ModelPart modelPart2 = getEntityAttributeModelPart(
+				attribute2,
+				attribute2.getDeclaringType(),
+				runtimeMetamodels
 		);
-
-		return entity1 != null && entity2 != null && MappingModelHelper.isCompatibleModelPart(
-				entity1.findSubPart( attribute1.getName() ),
-				entity2.findSubPart( attribute2.getName() )
+		return modelPart1 != null && modelPart2 != null && MappingModelHelper.isCompatibleModelPart(
+				modelPart1,
+				modelPart2
 		);
 	}
 
+	private static ModelPart getEntityAttributeModelPart(
+			PersistentAttribute<?, ?> attribute,
+			ManagedDomainType<?> domainType,
+			MappingMetamodel mappingMetamodel) {
+		if ( domainType instanceof EntityDomainType<?> ) {
+			final EntityMappingType entity = mappingMetamodel.getEntityDescriptor( domainType.getTypeName() );
+			return entity.findSubPart( attribute.getName() );
+		}
+		else {
+			ModelPart candidate = null;
+			for ( ManagedDomainType<?> subType : domainType.getSubTypes() ) {
+				final ModelPart modelPart = getEntityAttributeModelPart( attribute, subType, mappingMetamodel );
+				if ( modelPart != null ) {
+					if ( candidate != null && !MappingModelHelper.isCompatibleModelPart( candidate, modelPart ) ) {
+						return null;
+					}
+					candidate = modelPart;
+				}
+			}
+			return candidate;
+		}
+	}
+
 	@Override
 	public PersistentAttribute<? super J, ?> findAttributeInSuperTypes(String name) {
 		final PersistentAttribute<J, ?> local = findDeclaredAttribute( name );