HHH-19076 Resolve member of MappedSuperclass specially

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java

@@ -776,72 +776,63 @@ private static Member resolveMappedSuperclassMember(
 			Property property,
 			MappedSuperclassDomainType<?> ownerType,
 			MetadataContext metadataContext) {
-		final EntityPersister declaringEntity = getDeclaringEntity( (AbstractIdentifiableType<?>) ownerType, metadataContext );
-		if ( declaringEntity != null ) {
-			return resolveEntityMember( property, declaringEntity );
-		}
-		else {
-			final ManagedDomainType<?> subType = ownerType.getSubTypes().iterator().next();
-			final Type.PersistenceType persistenceType = subType.getPersistenceType();
-			if ( persistenceType == Type.PersistenceType.ENTITY ) {
-				return resolveEntityMember( property, getDeclaringEntity( (AbstractIdentifiableType<?>) subType, metadataContext ) );
-			}
-			else if ( persistenceType == Type.PersistenceType.EMBEDDABLE ) {
-				return resolveEmbeddedMember( property, (EmbeddableDomainType<?>) subType, metadataContext );
-			}
-			else if ( persistenceType == Type.PersistenceType.MAPPED_SUPERCLASS ) {
-				return resolveMappedSuperclassMember(
-						property,
-						(MappedSuperclassDomainType<?>) subType,
-						metadataContext
-				);
-			}
-			else {
-				throw new IllegalArgumentException( "Unexpected sub-type: " + persistenceType );
-			}
-		}
+		return property.getGetter( ownerType.getJavaType() ).getMember();
 	}
 
 	private final MemberResolver identifierMemberResolver = (attributeContext, metadataContext) -> {
 		final AbstractIdentifiableType<?> identifiableType =
 				(AbstractIdentifiableType<?>) attributeContext.getOwnerType();
-		final EntityPersister declaringEntityMapping = getDeclaringEntity( identifiableType, metadataContext );
-		final EntityIdentifierMapping identifierMapping = declaringEntityMapping.getIdentifierMapping();
-		final Property propertyMapping = attributeContext.getPropertyMapping();
-		if ( !propertyMapping.getName().equals( identifierMapping.getAttributeName() ) ) {
-			// this *should* indicate processing part of an IdClass...
-			return virtualIdentifierMemberResolver.resolveMember( attributeContext, metadataContext );
-		}
-
-		final Getter getter = getter( declaringEntityMapping, propertyMapping );
-		if ( getter instanceof PropertyAccessMapImpl.GetterImpl ) {
-			return new MapMember( identifierMapping.getAttributeName(), identifierMapping.getJavaType().getJavaTypeClass() );
+		if ( identifiableType instanceof MappedSuperclassDomainType<?> ) {
+			return attributeContext.getPropertyMapping()
+					.getGetter( identifiableType.getJavaType() )
+					.getMember();
 		}
 		else {
-			return getter.getMember();
+			final EntityPersister declaringEntityMapping = getDeclaringEntity( identifiableType, metadataContext );
+			final EntityIdentifierMapping identifierMapping = declaringEntityMapping.getIdentifierMapping();
+			final Property propertyMapping = attributeContext.getPropertyMapping();
+			if ( !propertyMapping.getName().equals( identifierMapping.getAttributeName() ) ) {
+				// this *should* indicate processing part of an IdClass...
+				return virtualIdentifierMemberResolver.resolveMember( attributeContext, metadataContext );
+			}
+
+			final Getter getter = getter( declaringEntityMapping, propertyMapping );
+			if ( getter instanceof PropertyAccessMapImpl.GetterImpl ) {
+				return new MapMember( identifierMapping.getAttributeName(), identifierMapping.getJavaType().getJavaTypeClass() );
+			}
+			else {
+				return getter.getMember();
+			}
 		}
 	};
 
 	private final MemberResolver versionMemberResolver = (attributeContext, metadataContext) -> {
 		final AbstractIdentifiableType<?> identifiableType =
 				(AbstractIdentifiableType<?>) attributeContext.getOwnerType();
-		final EntityPersister entityPersister = getDeclaringEntity( identifiableType, metadataContext );
-		final EntityVersionMapping versionMapping = entityPersister.getVersionMapping();
-		assert entityPersister.isVersioned();
-		assert versionMapping != null;
-
-		final String versionPropertyName = attributeContext.getPropertyMapping().getName();
-		if ( !versionPropertyName.equals( versionMapping.getVersionAttribute().getAttributeName() ) ) {
-			// this should never happen, but to be safe...
-			throw new IllegalArgumentException( "Given property did not match declared version property" );
-		}
-
-		final Getter getter = getter( entityPersister, attributeContext.getPropertyMapping() );
-		if ( getter instanceof PropertyAccessMapImpl.GetterImpl ) {
-			return new MapMember( versionPropertyName, versionMapping.getJavaType().getJavaTypeClass() );
+		if ( identifiableType instanceof MappedSuperclassDomainType<?> ) {
+			return attributeContext.getPropertyMapping()
+					.getGetter( identifiableType.getJavaType() )
+					.getMember();
 		}
 		else {
-			return getter.getMember();
+			final EntityPersister entityPersister = getDeclaringEntity( identifiableType, metadataContext );
+			final EntityVersionMapping versionMapping = entityPersister.getVersionMapping();
+			assert entityPersister.isVersioned();
+			assert versionMapping != null;
+
+			final String versionPropertyName = attributeContext.getPropertyMapping().getName();
+			if ( !versionPropertyName.equals( versionMapping.getVersionAttribute().getAttributeName() ) ) {
+				// this should never happen, but to be safe...
+				throw new IllegalArgumentException( "Given property did not match declared version property" );
+			}
+
+			final Getter getter = getter( entityPersister, attributeContext.getPropertyMapping() );
+			if ( getter instanceof PropertyAccessMapImpl.GetterImpl ) {
+				return new MapMember( versionPropertyName, versionMapping.getJavaType().getJavaTypeClass() );
+			}
+			else {
+				return getter.getMember();
+			}
 		}
 	};
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceFailTest.java

@@ -0,0 +1,199 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.identifier.composite;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * This test Fails
+ */
+@DomainModel(
+		annotatedClasses = {
+				CompositeInheritanceFailTest.TupAbstractEntity.class,
+				CompositeInheritanceFailTest.DummyEntity.class,
+				CompositeInheritanceFailTest.TestEntity.class, // Here the class is called TestEntity
+				CompositeInheritanceFailTest.Test2Entity.class,
+		}
+)
+@ServiceRegistry(
+		settings = {
+				// For your own convenience to see generated queries:
+				@Setting(name = AvailableSettings.SHOW_SQL, value = "true"),
+				@Setting(name = AvailableSettings.FORMAT_SQL, value = "true"),
+				// @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
+		}
+)
+@SessionFactory
+@Jira("HHH-19076")
+public class CompositeInheritanceFailTest {
+
+	@Test
+	void hhh19076FailingTest(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			TestEntity e1 = new TestEntity("foo", "bar");
+			em.persist(e1);
+
+			CompositeIdClass key = e1.getCompositeId();
+			TestEntity e2 = em.find(TestEntity.class, key);
+			assertNotNull(e2);
+		} );
+	}
+
+	@Test
+	void hhh19076FailingTest2(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Test2Entity e1 = new Test2Entity("foo", "xxxxxx");
+			em.persist(e1);
+
+			CompositeId2Class key = e1.getCompositeId();
+			Test2Entity e2 = em.find(Test2Entity.class, key);
+			assertNotNull(e2);
+		} );
+	}
+
+	@MappedSuperclass
+	public static abstract class TupAbstractEntity {
+		@Id
+		private String oid = null;
+
+
+		@SuppressWarnings("this-escape")
+		protected TupAbstractEntity() {
+		}
+
+		protected TupAbstractEntity(String oid) {
+			this.oid = oid;
+		}
+
+		public String getOid() {
+			return oid;
+		}
+
+	}
+
+	@Entity
+	public static class DummyEntity extends TupAbstractEntity {
+	}
+
+	@Entity
+	@IdClass(CompositeIdClass.class)
+	public static class TestEntity extends TupAbstractEntity {
+
+		@Id
+		private String myId;
+
+		protected TestEntity() {
+			// for JPA
+		}
+
+		public TestEntity(String oid, String myId) {
+			super(oid);
+			this.myId = myId;
+		}
+
+		public String myId() {
+			return myId;
+		}
+
+		public CompositeIdClass getCompositeId() {
+			return new CompositeIdClass(getOid(), myId);
+		}
+
+	}
+
+	@Entity
+	@IdClass(CompositeId2Class.class)
+	public static class Test2Entity extends TupAbstractEntity {
+
+		@Id
+		private String otherId;
+
+		@Version
+		private long tanum = 0;
+
+		protected Test2Entity() {
+			// for JPA
+		}
+
+		public Test2Entity(String oid, String otherId) {
+			super(oid);
+			this.otherId = otherId;
+		}
+
+		public String myId() {
+			return otherId;
+		}
+
+		public long tanum() {
+			return tanum;
+		}
+
+		public CompositeId2Class getCompositeId() {
+			return new CompositeId2Class(getOid(), otherId);
+		}
+
+	}
+
+	public static class CompositeIdClass {
+
+		private String oid;
+		private String myId;
+
+		public CompositeIdClass(String oid, String myId) {
+			this.oid = oid;
+			this.myId = myId;
+		}
+
+		public CompositeIdClass() {
+		}
+
+		public String oid() {
+			return oid;
+		}
+
+		public String myId() {
+			return myId;
+		}
+
+	}
+
+	public static class CompositeId2Class {
+
+		private String oid;
+		private String otherId;
+
+		public CompositeId2Class(String oid, String otherId) {
+			this.oid = oid;
+			this.otherId = otherId;
+		}
+
+		public CompositeId2Class() {
+		}
+
+		public String oid() {
+			return oid;
+		}
+
+		public String otherId() {
+			return otherId;
+		}
+
+	}
+
+}