HHH-17305: Remove commit e842669 by Christian Thiel <[email protected]>

Author: koentsje

hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java

@@ -38,8 +38,8 @@ public static <R> SqmSelectStatement<R>[] split(SqmSelectStatement<R> statement)
 			return sqmSelectStatement;
 		}
 
-		final SqmPolymorphicRootDescriptor<R> unmappedPolymorphicDescriptor = (SqmPolymorphicRootDescriptor<R>) unmappedPolymorphicReference.getReferencedPathSource();
-		final Set<EntityDomainType<? extends R>> implementors = unmappedPolymorphicDescriptor.getImplementors();
+		final SqmPolymorphicRootDescriptor<?> unmappedPolymorphicDescriptor = (SqmPolymorphicRootDescriptor<?>) unmappedPolymorphicReference.getReferencedPathSource();
+		final Set<EntityDomainType<?>> implementors = unmappedPolymorphicDescriptor.getImplementors();
 		@SuppressWarnings("unchecked")
 		final SqmSelectStatement<R>[] expanded = new SqmSelectStatement[ implementors.size() ];
 
@@ -105,8 +105,8 @@ public static <R> SqmDeleteStatement<R>[] split(SqmDeleteStatement<R> statement)
 			return sqmDeleteStatement;
 		}
 
-		final SqmPolymorphicRootDescriptor<R> unmappedPolymorphicDescriptor = (SqmPolymorphicRootDescriptor<R>) unmappedPolymorphicReference.getReferencedPathSource();
-		final Set<EntityDomainType<? extends R>> implementors = unmappedPolymorphicDescriptor.getImplementors();
+		final SqmPolymorphicRootDescriptor<?> unmappedPolymorphicDescriptor = (SqmPolymorphicRootDescriptor<?>) unmappedPolymorphicReference.getReferencedPathSource();
+		final Set<EntityDomainType<?>> implementors = unmappedPolymorphicDescriptor.getImplementors();
 		@SuppressWarnings("unchecked")
 		final SqmDeleteStatement<R>[] expanded = new SqmDeleteStatement[ implementors.size() ];
 

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java

@@ -32,11 +32,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.function.Consumer;
 
 import static java.util.Collections.unmodifiableMap;
-import static java.util.Comparator.comparing;
 
 /**
  * Acts as the {@link EntityDomainType} for a "polymorphic query" grouping.
@@ -56,8 +54,7 @@ public SqmPolymorphicRootDescriptor(
 			JpaMetamodel jpaMetamodel) {
 		this.polymorphicJavaType = polymorphicJavaType;
 		this.jpaMetamodel = jpaMetamodel;
-		this.implementors = new TreeSet<>( comparing(EntityDomainType::getTypeName) );
-		this.implementors.addAll( implementors );
+		this.implementors = implementors;
 		this.commonAttributes = unmodifiableMap( inferCommonAttributes( implementors ) );
 	}
 
@@ -120,8 +117,8 @@ private static boolean isACommonAttribute(List<EntityDomainType<?>> subList, Per
 		return true;
 	}
 
-	public Set<EntityDomainType<? extends T>> getImplementors() {
-		return implementors;
+	public Set<EntityDomainType<?>> getImplementors() {
+		return new HashSet<>( implementors );
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java

@@ -64,17 +64,13 @@ public void testQuery(SessionFactoryScope scope) {
 				session -> {
 					List<I> results = session.createQuery( "from " + I.class.getName(), I.class ).list();
 					assertThat( results.size() ).isEqualTo( 2 );
-					assertThat(results.get(0)).isInstanceOf(EntityA.class);
-					assertThat(results.get(1)).isInstanceOf(EntityB.class);
 				}
 		);
 
 		scope.inTransaction(
 				session -> {
 					List<I> results = session.createQuery( "from " + I.class.getName() + " i", I.class ).list();
 					assertThat( results.size() ).isEqualTo( 2 );
-					assertThat(results.get(0)).isInstanceOf(EntityA.class);
-					assertThat(results.get(1)).isInstanceOf(EntityB.class);
 				}
 		);
 
@@ -83,8 +79,6 @@ public void testQuery(SessionFactoryScope scope) {
 					List<I> results = session.createQuery( "select i from " + I.class.getName() + " i", I.class )
 							.list();
 					assertThat( results.size() ).isEqualTo( 2 );
-					assertThat(results.get(0)).isInstanceOf(EntityA.class);
-					assertThat(results.get(1)).isInstanceOf(EntityB.class);
 				}
 		);
 	}