HSEARCH-5501 Update to Hibernate ORM 7.2.0.CR2

marko-bekhta · marko-bekhta · commit 9656409a335b · 2025-11-11T00:16:49.000+01:00
diff --git a/bom/platform-common/pom.xml b/bom/platform-common/pom.xml
@@ -18,7 +18,7 @@
         <deploy.skip>true</deploy.skip>
 
         <!-- These versions will be checked against the ones resolved by Maven for the project in the enforcer rule -->
-        <version.bom.org.hibernate.orm>7.1.2.Final</version.bom.org.hibernate.orm>
+        <version.bom.org.hibernate.orm>7.2.0.CR2</version.bom.org.hibernate.orm>
         <version.bom.org.elasticsearch.client>9.2.0</version.bom.org.elasticsearch.client>
         <version.bom.software.amazon.awssdk>2.37.3</version.bom.software.amazon.awssdk>
         <version.bom.io.smallrye>3.3.1</version.bom.io.smallrye>
diff --git a/build/config/pom.xml b/build/config/pom.xml
@@ -230,6 +230,8 @@
 
                                 <argument>^org\.hibernate\.dialect\.lock\.spi\.LockingSupport$</argument>
 
+                                <argument>^org\.hibernate\.engine\.creation\.CommonBuilder$</argument>
+
                                 <argument>^org\.hibernate\.metamodel\.MappingMetamodel$</argument>
                                 <argument>^org\.hibernate\.metamodel\.mapping\.Bindable$</argument>
                                 <argument>^org\.hibernate\.metamodel\.mapping\.SelectableMapping$</argument>
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -99,7 +99,7 @@
             NOTE: when Hibernate ORM updates Byte Buddy, make sure to check Jenkinsfile to see if
             `net.bytebuddy.experimental` property can be removed.
          -->
-        <version.org.hibernate.orm>7.1.2.Final</version.org.hibernate.orm>
+        <version.org.hibernate.orm>7.2.0.CR2</version.org.hibernate.orm>
 
         <javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
         <documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateOrmListenerContextProvider.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateOrmListenerContextProvider.java
@@ -5,6 +5,7 @@
 package org.hibernate.search.mapper.orm.event.impl;
 
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.search.mapper.pojo.model.spi.PojoRawTypeIdentifier;
 import org.hibernate.search.mapper.pojo.work.spi.ConfiguredIndexingPlanSynchronizationStrategy;
 import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingPlan;
@@ -18,7 +19,8 @@ public interface HibernateOrmListenerContextProvider {
 
 	PojoIndexingPlan currentIndexingPlanIfExisting(SessionImplementor session);
 
-	PojoTypeIndexingPlan currentIndexingPlanIfTypeIncluded(SessionImplementor session, PojoRawTypeIdentifier<?> typeIdentifier);
+	PojoTypeIndexingPlan currentIndexingPlanIfTypeIncluded(SharedSessionContractImplementor session,
+			PojoRawTypeIdentifier<?> typeIdentifier);
 
 	ConfiguredIndexingPlanSynchronizationStrategy currentAutomaticIndexingSynchronizationStrategy(
 			SessionImplementor session);
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java
@@ -10,6 +10,7 @@
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.AbstractCollectionEvent;
 import org.hibernate.event.spi.AutoFlushEvent;
@@ -289,7 +290,8 @@ public void onClear(ClearEvent event) {
 		}
 	}
 
-	private PojoTypeIndexingPlan getCurrentIndexingPlanIfTypeIncluded(SessionImplementor sessionImplementor,
+	private PojoTypeIndexingPlan getCurrentIndexingPlanIfTypeIncluded(
+			SharedSessionContractImplementor sessionImplementor,
 			HibernateOrmListenerTypeContext typeContext) {
 		return contextProvider.currentIndexingPlanIfTypeIncluded( sessionImplementor, typeContext.typeIdentifier() );
 	}
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmLoadingStrategy.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/AbstractHibernateOrmLoadingStrategy.java
@@ -209,7 +209,7 @@ public HibernateOrmQueryLoader<E, I> createQueryLoader(SessionFactoryImplementor
 			}
 		}
 
-		TypeQueryFactory<E, I> actualQueryFactory = createFactory( commonSuperType );
+		TypeQueryFactory<E, I> actualQueryFactory = createFactory( sessionFactory, commonSuperType );
 
 		if ( !conditionalExpressions.isEmpty() || order != null ) {
 			if ( typeContexts.size() != 1 ) {
@@ -225,13 +225,16 @@ public HibernateOrmQueryLoader<E, I> createQueryLoader(SessionFactoryImplementor
 		return new HibernateOrmQueryLoaderImpl<>( actualQueryFactory, includedTypesFilter );
 	}
 
-	protected abstract TypeQueryFactory<E, I> createFactory(Class<E> entityClass, String ormEntityName,
+	protected abstract TypeQueryFactory<E, I> createFactory(
+			SessionFactoryImplementor sessionFactoryImplementor, Class<E> entityClass, String ormEntityName,
 			Class<I> uniquePropertyType, String uniquePropertyName);
 
 	@SuppressWarnings("unchecked")
-	protected TypeQueryFactory<E, I> createFactory(EntityMappingType entityMappingType) {
-		return createFactory( (Class<E>) entityMappingType.getJavaType().getJavaTypeClass(), entityMappingType.getEntityName(),
-				uniquePropertyType, uniquePropertyName );
+	protected TypeQueryFactory<E, I> createFactory(SessionFactoryImplementor sessionFactoryImplementor,
+			EntityMappingType entityMappingType) {
+		return createFactory( sessionFactoryImplementor, (Class<E>) entityMappingType.getJavaType().getJavaTypeClass(),
+				entityMappingType.getEntityName(), uniquePropertyType, uniquePropertyName
+		);
 	}
 
 	protected static EntityMappingType toMostSpecificCommonEntitySuperType(
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java
@@ -5,8 +5,10 @@
 package org.hibernate.search.mapper.orm.loading.impl;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.FindOption;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.ParameterExpression;
@@ -77,8 +79,15 @@ public Query<E> createQueryForLoadByUniqueProperty(SessionImplementor session, S
 		return session.createQuery( criteriaQuery );
 	}
 
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true, since = "8.2")
 	@Override
 	public MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session) {
 		return session.byMultipleIds( entityClass );
 	}
+
+	@Override
+	public List<E> findMultiple(SessionImplementor session, List<?> ids, FindOption... options) {
+		return session.findMultiple( entityClass, ids, options );
+	}
 }
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmEntityIdEntityLoadingStrategy.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmEntityIdEntityLoadingStrategy.java
@@ -7,6 +7,7 @@
 import java.util.Set;
 
 import org.hibernate.AssertionFailure;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -89,9 +90,11 @@ public PojoSelectionEntityLoader<E> createEntityLoader(
 	}
 
 	@Override
-	protected TypeQueryFactory<E, I> createFactory(Class<E> entityClass, String ormEntityName,
+	protected TypeQueryFactory<E, I> createFactory(
+			SessionFactoryImplementor sessionFactoryImplementor, Class<E> entityClass, String ormEntityName,
 			Class<I> uniquePropertyType, String uniquePropertyName) {
-		return TypeQueryFactory.create( entityClass, ormEntityName, uniquePropertyType, uniquePropertyName, true );
+		return TypeQueryFactory.create( sessionFactoryImplementor, entityClass, ormEntityName, uniquePropertyType,
+				uniquePropertyName, true );
 	}
 
 	private PojoSelectionEntityLoader<?> doCreate(EntityMappingType entityMappingType,
@@ -142,7 +145,7 @@ private PojoSelectionEntityLoader<?> doCreate(EntityMappingType entityMappingTyp
 		// even if we know we actually want instances from the most specific entity type,
 		// because that exception cannot be recovered from.
 		return new HibernateOrmSelectionEntityByIdLoader<>( rootEntityMappingType,
-				createFactory( entityMappingType ),
+				createFactory( sessionFactory, entityMappingType ),
 				sessionContext,
 				persistenceContextLookup, cacheLookupStrategyImplementor, loadingOptions );
 	}
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmMassEntityLoader.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmMassEntityLoader.java
@@ -55,10 +55,7 @@ public void load(List<I> identifiers) throws InterruptedException {
 	}
 
 	private List<E> multiLoad(List<I> identifiers) {
-		return typeQueryLoader.createMultiIdentifierLoadAccess( session )
-				.with( options.cacheMode() )
-				.with( LockMode.NONE )
-				.multiLoad( identifiers );
+		return typeQueryLoader.findMultiple( session, identifiers, options.cacheMode(), LockMode.NONE );
 	}
 
 	private List<E> queryByIds(List<I> identifiers) {
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmNonEntityIdPropertyEntityLoadingStrategy.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmNonEntityIdPropertyEntityLoadingStrategy.java
@@ -8,6 +8,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.search.mapper.orm.common.impl.HibernateOrmUtils;
 import org.hibernate.search.mapper.orm.loading.spi.HibernateOrmEntityLoadingStrategy;
@@ -96,10 +97,11 @@ public PojoSelectionEntityLoader<E> createEntityLoader(
 	}
 
 	@Override
-	protected TypeQueryFactory<E, I> createFactory(Class<E> entityClass, String ormEntityName,
+	protected TypeQueryFactory<E, I> createFactory(
+			SessionFactoryImplementor sessionFactoryImplementor, Class<E> entityClass, String ormEntityName,
 			Class<I> uniquePropertyType, String uniquePropertyName) {
-		return TypeQueryFactory.create(
-				entityClass, ormEntityName, uniquePropertyType, uniquePropertyName, uniquePropertyIsTheEntityId );
+		return TypeQueryFactory.create( sessionFactoryImplementor, entityClass, ormEntityName, uniquePropertyType,
+				uniquePropertyName, uniquePropertyIsTheEntityId );
 	}
 
 	private PojoSelectionEntityLoader<E> doCreate(PojoLoadingTypeContext<? extends E> targetEntityTypeContext,
@@ -121,7 +123,7 @@ private PojoSelectionEntityLoader<E> doCreate(PojoLoadingTypeContext<? extends E
 		@SuppressWarnings("unchecked")
 		PojoSelectionEntityLoader<E> result = new HibernateOrmSelectionEntityByNonIdPropertyLoader<>(
 				entityMapping, (PojoLoadingTypeContext<E>) targetEntityTypeContext,
-				createFactory( entityMapping ),
+				createFactory( sessionFactory, entityMapping ),
 				documentIdSourcePropertyName, documentIdSourceHandle,
 				sessionContext, loadingOptions
 		);
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmQueryLoaderImpl.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmQueryLoaderImpl.java
@@ -7,6 +7,8 @@
 import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.FindOption;
+
 import org.hibernate.MultiIdentifierLoadAccess;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -61,11 +63,18 @@ public Query<E> createLoadingQuery(SessionImplementor session, String idParamete
 		return queryFactory.createQueryForLoadByUniqueProperty( session, idParameterName );
 	}
 
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true, since = "8.2")
 	@Override
 	public MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session) {
 		return queryFactory.createMultiIdentifierLoadAccess( session );
 	}
 
+	@Override
+	public List<E> findMultiple(SessionImplementor session, List<?> ids, FindOption... options) {
+		return queryFactory.findMultiple( session, ids, options );
+	}
+
 	@Override
 	public boolean uniquePropertyIsTheEntityId() {
 		return queryFactory.uniquePropertyIsTheEntityId();
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HqlTypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HqlTypeQueryFactory.java
@@ -4,22 +4,27 @@
  */
 package org.hibernate.search.mapper.orm.loading.impl;
 
+import java.util.List;
 import java.util.Set;
 
-import org.hibernate.MultiIdentifierLoadAccess;
+import jakarta.persistence.FindOption;
+
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.graph.RootGraph;
 import org.hibernate.query.Query;
 
 class HqlTypeQueryFactory<E, I> extends ConditionalExpressionQueryFactory<E, I> {
 
 	private final Class<E> entityClass;
+	private final RootGraph<E> rootGraph;
 	private final String ormEntityName;
 
-	HqlTypeQueryFactory(Class<E> entityClass, String ormEntityName,
+	HqlTypeQueryFactory(RootGraph<E> rootGraph, Class<E> entityClass, String ormEntityName,
 			Class<I> uniquePropertyType, String uniquePropertyName,
 			boolean uniquePropertyIsTheEntityId) {
 		super( uniquePropertyType, uniquePropertyName, uniquePropertyIsTheEntityId );
+		this.rootGraph = rootGraph;
 		this.entityClass = entityClass;
 		this.ormEntityName = ormEntityName;
 	}
@@ -51,11 +56,18 @@ public Query<E> createQueryForLoadByUniqueProperty(SessionImplementor session, S
 		);
 	}
 
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true, since = "8.2")
 	@Override
-	public MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session) {
+	public org.hibernate.MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session) {
 		return session.byMultipleIds( ormEntityName );
 	}
 
+	@Override
+	public List<E> findMultiple(SessionImplementor session, List<?> ids, FindOption... options) {
+		return session.findMultiple( rootGraph, ids, options );
+	}
+
 	private <T> Query<T> createQueryWithTypesFilter(SharedSessionContractImplementor session,
 			String hql, Class<T> returnedType, String entityAlias,
 			Set<? extends Class<? extends E>> includedTypesFilter) {
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/TypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/TypeQueryFactory.java
@@ -8,24 +8,30 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.MultiIdentifierLoadAccess;
+import jakarta.persistence.FindOption;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.graph.RootGraph;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.Query;
 import org.hibernate.search.mapper.orm.loading.spi.ConditionalExpression;
 
 public interface TypeQueryFactory<E, I> {
 
-	static <E, I> TypeQueryFactory<E, I> create(Class<E> entityClass, String ormEntityName,
+	@SuppressWarnings({ "unchecked" })
+	static <E, I> TypeQueryFactory<E, I> create(
+			SessionFactoryImplementor sessionFactoryImplementor, Class<E> entityClass, String ormEntityName,
 			Class<I> uniquePropertyType, String uniquePropertyName,
 			boolean uniquePropertyIsTheEntityId) {
 		if ( entityClass.equals( Map.class ) ) {
 			// This is a dynamic-map entity.
 			// They don't have a representation in the JPA metamodel
 			// and can't be queried using the Criteria API.
-			// Use HQL queries instead, even if it feels a bit dirty.
-			return new HqlTypeQueryFactory<>( entityClass, ormEntityName,
+			// Use HQL queries instead, even if it feels a bit dirty.\
+			RootGraph<E> rootGraph = (RootGraph<E>) sessionFactoryImplementor.createGraphForDynamicEntity( ormEntityName );
+			return new HqlTypeQueryFactory<>( rootGraph, entityClass, ormEntityName,
 					uniquePropertyType, uniquePropertyName,
 					uniquePropertyIsTheEntityId );
 		}
@@ -51,7 +57,14 @@ Query<I> createQueryForIdentifierListing(SharedSessionContractImplementor sessio
 
 	Query<E> createQueryForLoadByUniqueProperty(SessionImplementor session, String parameterName);
 
-	MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session);
+	/**
+	 * @deprecated Use {@link #findMultiple(SessionImplementor, List, FindOption...)} instead.
+	 */
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true, since = "8.2")
+	org.hibernate.MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session);
+
+	List<E> findMultiple(SessionImplementor session, List<?> ids, FindOption... options);
 
 	boolean uniquePropertyIsTheEntityId();
 
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/spi/HibernateOrmQueryLoader.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/spi/HibernateOrmQueryLoader.java
@@ -4,7 +4,10 @@
  */
 package org.hibernate.search.mapper.orm.loading.spi;
 
-import org.hibernate.MultiIdentifierLoadAccess;
+import java.util.List;
+
+import jakarta.persistence.FindOption;
+
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.Query;
@@ -16,7 +19,14 @@ public interface HibernateOrmQueryLoader<E, I> {
 
 	Query<E> createLoadingQuery(SessionImplementor session, String idParameterName);
 
-	MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session);
+	/**
+	 * @deprecated Use {@link #findMultiple(SessionImplementor, List, FindOption...)} instead.
+	 */
+	@Deprecated(forRemoval = true, since = "8.2")
+	@SuppressWarnings("removal")
+	org.hibernate.MultiIdentifierLoadAccess<E> createMultiIdentifierLoadAccess(SessionImplementor session);
+
+	List<E> findMultiple(SessionImplementor session, List<?> ids, FindOption... options);
 
 	boolean uniquePropertyIsTheEntityId();
 }
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/logging/impl/OrmLog.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/logging/impl/OrmLog.java
@@ -48,6 +48,6 @@ public interface OrmLog extends ConfigurationLog, DeprecationLog, IndexingLog, L
 	 * here to the next value.
 	 */
 	@LogMessage(level = TRACE)
-	@Message(id = ID_OFFSET + 143, value = "")
+	@Message(id = ID_OFFSET + 144, value = "")
 	void nextLoggerIdForConvenience();
 }
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/logging/impl/OrmMiscLog.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/logging/impl/OrmMiscLog.java
@@ -158,4 +158,8 @@ void skippingPreliminaryCacheLookupsForNonEntityIdEntityLoader(String entityName
 	@LogMessage(level = Logger.Level.TRACE)
 	@Message(id = ID_OFFSET + 133, value = "Transaction's afterCompletion() phase already been processed, ignoring: %s")
 	void syncAdapterIgnoringAfterCompletionAlreadyExecuted(Synchronization delegate);
+
+	@Message(id = ID_OFFSET + 143,
+			value = "Hibernate Search does not support working with %s session type")
+	SearchException unsupportedSessionType(Class<?> session);
 }
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/SynchronizationAdapter.java
diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import org.hibernate.collection.spi.PersistentCollection;`
`11`	`11`	`import org.hibernate.engine.spi.SessionFactoryImplementor;`
`12`	`12`	`import org.hibernate.engine.spi.SessionImplementor;`
	`13`	`+import org.hibernate.engine.spi.SharedSessionContractImplementor;`
`13`	`14`	`import org.hibernate.event.service.spi.EventListenerRegistry;`
`14`	`15`	`import org.hibernate.event.spi.AbstractCollectionEvent;`
`15`	`16`	`import org.hibernate.event.spi.AutoFlushEvent;`
`@@ -289,7 +290,8 @@ public void onClear(ClearEvent event) {`
`289`	`290`	`}`
`290`	`291`	`}`
`291`	`292`
`292`		`- private PojoTypeIndexingPlan getCurrentIndexingPlanIfTypeIncluded(SessionImplementor sessionImplementor,`
	`293`	`+ private PojoTypeIndexingPlan getCurrentIndexingPlanIfTypeIncluded(`
	`294`	`+ SharedSessionContractImplementor sessionImplementor,`
`293`	`295`	`HibernateOrmListenerTypeContext typeContext) {`
`294`	`296`	`return contextProvider.currentIndexingPlanIfTypeIncluded( sessionImplementor, typeContext.typeIdentifier() );`
`295`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public HibernateOrmQueryLoader<E, I> createQueryLoader(SessionFactoryImplementor`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`- TypeQueryFactory<E, I> actualQueryFactory = createFactory( commonSuperType );`
	`212`	`+ TypeQueryFactory<E, I> actualQueryFactory = createFactory( sessionFactory, commonSuperType );`
`213`	`213`
`214`	`214`	`if ( !conditionalExpressions.isEmpty() \|\| order != null ) {`
`215`	`215`	`if ( typeContexts.size() != 1 ) {`
`@@ -225,13 +225,16 @@ public HibernateOrmQueryLoader<E, I> createQueryLoader(SessionFactoryImplementor`
`225`	`225`	`return new HibernateOrmQueryLoaderImpl<>( actualQueryFactory, includedTypesFilter );`
`226`	`226`	`}`
`227`	`227`
`228`		`- protected abstract TypeQueryFactory<E, I> createFactory(Class<E> entityClass, String ormEntityName,`
	`228`	`+ protected abstract TypeQueryFactory<E, I> createFactory(`
	`229`	`+ SessionFactoryImplementor sessionFactoryImplementor, Class<E> entityClass, String ormEntityName,`
`229`	`230`	`Class<I> uniquePropertyType, String uniquePropertyName);`
`230`	`231`
`231`	`232`	`@SuppressWarnings("unchecked")`
`232`		`- protected TypeQueryFactory<E, I> createFactory(EntityMappingType entityMappingType) {`
`233`		`- return createFactory( (Class<E>) entityMappingType.getJavaType().getJavaTypeClass(), entityMappingType.getEntityName(),`
`234`		`- uniquePropertyType, uniquePropertyName );`
	`233`	`+ protected TypeQueryFactory<E, I> createFactory(SessionFactoryImplementor sessionFactoryImplementor,`
	`234`	`+ EntityMappingType entityMappingType) {`
	`235`	`+ return createFactory( sessionFactoryImplementor, (Class<E>) entityMappingType.getJavaType().getJavaTypeClass(),`
	`236`	`+ entityMappingType.getEntityName(), uniquePropertyType, uniquePropertyName`
	`237`	`+ );`
`235`	`238`	`}`
`236`	`239`
`237`	`240`	`protected static EntityMappingType toMostSpecificCommonEntitySuperType(`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,7 @@ public void load(List<I> identifiers) throws InterruptedException {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`private List<E> multiLoad(List<I> identifiers) {`
`58`		`- return typeQueryLoader.createMultiIdentifierLoadAccess( session )`
`59`		`- .with( options.cacheMode() )`
`60`		`- .with( LockMode.NONE )`
`61`		`- .multiLoad( identifiers );`
	`58`	`+ return typeQueryLoader.findMultiple( session, identifiers, options.cacheMode(), LockMode.NONE );`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`private List<E> queryByIds(List<I> identifiers) {`