HHH-16191 Add test and fix checks for skipping resolving polymorphic associated entity instances

Author: mbellade

hibernate-core/src/main/java/org/hibernate/sql/results/graph/Initializer.java

@@ -78,15 +78,15 @@ default void endLoading(ExecutionContext context) {
 	default boolean isAttributeAssignableToConcreteDescriptor(
 			FetchParentAccess parentAccess,
 			AttributeMapping referencedModelPart) {
-		if ( parentAccess != null && parentAccess.isEntityInitializer() ) {
-			final EntityPersister concreteDescriptor = parentAccess.findFirstEntityInitializer()
-					.getConcreteDescriptor();
+		final EntityInitializer entityInitializer = parentAccess == null ?
+				null :
+				parentAccess.findFirstEntityInitializer();
+		if ( entityInitializer != null ) {
+			final EntityPersister concreteDescriptor = entityInitializer.getConcreteDescriptor();
 			if ( concreteDescriptor.getEntityMetamodel().isPolymorphic() ) {
 				final EntityPersister declaringType = (EntityPersister) referencedModelPart.getDeclaringType();
 				if ( concreteDescriptor != declaringType ) {
-					if ( !declaringType.getSubclassEntityNames().contains( concreteDescriptor.getEntityName() ) ) {
-						return false;
-					}
+					return declaringType.getSubclassEntityNames().contains( concreteDescriptor.getEntityName() );
 				}
 			}
 		}

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java

@@ -98,7 +98,7 @@ public abstract class AbstractEntityInitializer extends AbstractFetchParentAcces
 	private EntityKey entityKey;
 	private Object entityInstance;
 	private Object entityInstanceForNotify;
-	private boolean missing;
+	protected boolean missing;
 	boolean isInitialized;
 	private boolean isOwningInitializer;
 	private Object[] resolvedEntityState;
@@ -399,26 +399,44 @@ else if ( existingLoadingEntry != null && existingLoadingEntry.getEntityInitiali
 		}
 	}
 
-	private boolean shouldSkipResolveInstance(RowProcessingState rowProcessingState) {
-		final NavigablePath parent = navigablePath.getParent();
-		if ( parent != null ) {
-			final Initializer parentInitializer = rowProcessingState.resolveInitializer( parent );
-			if ( parentInitializer != null && parentInitializer.isEntityInitializer() ) {
-				if ( isReferencedModelPartAssignableToConcreteParent( parentInitializer ) ) {
-					return true;
+	protected boolean shouldSkipResolveInstance(RowProcessingState rowProcessingState) {
+		if ( navigablePath.getParent() != null ) {
+			Initializer parentInitializer = rowProcessingState.resolveInitializer( navigablePath.getParent() );
+			if ( parentInitializer != null ) {
+				ModelPart modelPart = referencedModelPart;
+				NavigablePath currentNavigablePath = navigablePath;
+				// Walk back initializers until we find an EntityInitializer
+				while ( parentInitializer != null && !parentInitializer.isEntityInitializer() ) {
+					modelPart = parentInitializer.getInitializedPart();
+					currentNavigablePath = currentNavigablePath.getParent();
+					parentInitializer = rowProcessingState.resolveInitializer( currentNavigablePath.getParent() );
+				}
+				if ( parentInitializer != null && parentInitializer.asEntityInitializer()
+						.getEntityDescriptor()
+						.getEntityMetamodel()
+						.isPolymorphic() ) {
+					parentInitializer.resolveKey( rowProcessingState );
+					return isReferencedModelPartInConcreteParent(
+							modelPart,
+							currentNavigablePath,
+							parentInitializer
+					);
 				}
 			}
 		}
 		return false;
 	}
 
-	private boolean isReferencedModelPartAssignableToConcreteParent(Initializer parentInitializer) {
+	private boolean isReferencedModelPartInConcreteParent(
+			ModelPart modelPart,
+			NavigablePath partNavigablePath,
+			Initializer parentInitializer) {
 		final EntityPersister parentConcreteDescriptor = parentInitializer.asEntityInitializer()
 				.getConcreteDescriptor();
-		if ( parentConcreteDescriptor != null && parentConcreteDescriptor.getEntityMetamodel().isPolymorphic()) {
-			final ModelPart concreteModelPart = parentConcreteDescriptor.findByPath( navigablePath.getLocalName() );
+		if ( parentConcreteDescriptor != null && parentConcreteDescriptor.getEntityMetamodel().isPolymorphic() ) {
+			final ModelPart concreteModelPart = parentConcreteDescriptor.findByPath( partNavigablePath.getLocalName() );
 			if ( concreteModelPart == null
-					|| !referencedModelPart.getJavaType().getJavaTypeClass()
+					|| !modelPart.getJavaType().getJavaTypeClass()
 					.isAssignableFrom( concreteModelPart.getJavaType().getJavaTypeClass() ) ) {
 		/*
 			Given:

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityJoinedFetchInitializer.java

@@ -71,6 +71,11 @@ public EntityJoinedFetchInitializer(
 
 	@Override
 	public void resolveKey(RowProcessingState rowProcessingState) {
+		if ( shouldSkipResolveInstance( rowProcessingState ) ) {
+			missing = true;
+			return;
+		}
+
 		super.resolveKey( rowProcessingState );
 
 		// super processes the foreign-key target column.  here we

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java

@@ -67,10 +67,8 @@ public void loadEntityWithNotFoundAssociation() {
 				}
 		);
 
-		// The Employee#employer must be initialized immediately because
-		// enhanced proxies (and HibernateProxy objects) should never be created
-		// for a "not found" association.
-		assertEquals( 2, statistics.getPrepareStatementCount() );
+		// we should get 1 query for the Employee with join
+		assertEquals( 1, statistics.getPrepareStatementCount() );
 	}
 
 	@Test
@@ -86,10 +84,8 @@ public void getEntityWithNotFoundAssociation() {
 				}
 		);
 
-		// The Employee#employer must be initialized immediately because
-		// enhanced proxies (and HibernateProxy objects) should never be created
-		// for a "not found" association.
-		assertEquals( 2, statistics.getPrepareStatementCount() );
+		// we should get 1 query for the Employee with join
+		assertEquals( 1, statistics.getPrepareStatementCount() );
 	}
 
 	@Test
@@ -178,7 +174,7 @@ public static class Employee {
 
 		private String name;
 
-		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+		@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 		@JoinColumn(name = "employer_id",foreignKey = @ForeignKey(value= ConstraintMode.NO_CONSTRAINT))
 		@NotFound(action=NotFoundAction.IGNORE)
 		private Employer employer;

hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java

@@ -7,10 +7,6 @@
 package org.hibernate.orm.test.inheritance;
 
 import java.util.List;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.DiscriminatorColumn;
@@ -307,7 +303,6 @@ public Writer(String name, Group group) {
 		// Editor#title (which uses the same e_title column) can be non-null,
 		// and there is no associated group.
 		@ManyToOne(optional = false)
-		@NotFound(action = NotFoundAction.IGNORE)
 		@JoinColumn(name = "e_title", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 		public Group getGroup() {
 			return group;

hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java

@@ -7,10 +7,6 @@
 package org.hibernate.orm.test.inheritance;
 
 import java.util.List;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.DiscriminatorColumn;
@@ -300,7 +296,6 @@ public Writer(String name, Group group) {
 		// Editor#title (which uses the same e_title column) can be non-null,
 		// and there is no associated group.
 		@ManyToOne(optional = false)
-		@NotFound(action = NotFoundAction.IGNORE)
 		@JoinColumn(name = "e_title", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 		public Group getGroup() {
 			return group;

hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java

@@ -8,10 +8,6 @@
 
 import java.util.Comparator;
 import java.util.List;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.DiscriminatorColumn;
@@ -303,7 +299,6 @@ public Writer(String name, Group group) {
 		// Editor#title (which uses the same e_title column) can be non-null,
 		// and there is no associated group.
 		@ManyToOne(optional = false)
-		@NotFound(action = NotFoundAction.IGNORE)
 		@JoinColumn(name = "e_title", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 		public Group getGroup() {
 			return group;