HHH-19364 show that we don't really use the Session until createQuery()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/query/programmatic/internal/MutationSpecificationImpl.java

@@ -8,6 +8,7 @@
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.criteria.Root;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.programmatic.MutationSpecification;
 import org.hibernate.query.IllegalMutationQueryException;
@@ -44,7 +45,7 @@ public MutationSpecificationImpl(
 			Class<T> mutationTarget,
 			SharedSessionContractImplementor session) {
 		this.session = session;
-		this.sqmStatement = resolveSqmTree( hql, session );
+		this.sqmStatement = resolveSqmTree( hql, session.getFactory() );
 		this.mutationTargetRoot = resolveSqmRoot( this.sqmStatement, mutationTarget );
 	}
 
@@ -53,15 +54,17 @@ public MutationSpecificationImpl(
 			SharedSessionContractImplementor session) {
 		this.session = session;
 		this.sqmStatement = (SqmUpdateStatement<T>) criteriaQuery;
-		this.mutationTargetRoot = resolveSqmRoot( sqmStatement, sqmStatement.getTarget().getManagedType().getJavaType() );
+		this.mutationTargetRoot = resolveSqmRoot( sqmStatement,
+				sqmStatement.getTarget().getManagedType().getJavaType() );
 	}
 
 	public MutationSpecificationImpl(
 			CriteriaDelete<T> criteriaQuery,
 			SharedSessionContractImplementor session) {
 		this.session = session;
 		this.sqmStatement = (SqmDeleteStatement<T>) criteriaQuery;
-		this.mutationTargetRoot = resolveSqmRoot( sqmStatement, sqmStatement.getTarget().getManagedType().getJavaType() );
+		this.mutationTargetRoot = resolveSqmRoot( sqmStatement,
+				sqmStatement.getTarget().getManagedType().getJavaType() );
 	}
 
 	@Override
@@ -96,8 +99,8 @@ public MutationQuery createQuery() {
 	 */
 	private static <T> SqmDeleteOrUpdateStatement<T> resolveSqmTree(
 			String hql,
-			SharedSessionContractImplementor session) {
-		final QueryEngine queryEngine = session.getFactory().getQueryEngine();
+			SessionFactoryImplementor sessionFactory) {
+		final QueryEngine queryEngine = sessionFactory.getQueryEngine();
 		final HqlInterpretation<T> hqlInterpretation = queryEngine
 				.getInterpretationCache()
 				.resolveHqlInterpretation( hql, null, queryEngine.getHqlTranslator() );

hibernate-core/src/main/java/org/hibernate/query/programmatic/internal/SelectionSpecificationImpl.java

@@ -7,6 +7,7 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.QueryException;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.IllegalSelectQueryException;
@@ -50,14 +51,14 @@ public SelectionSpecificationImpl(
 			SharedSessionContractImplementor session) {
 		this.resultType = resultType;
 		this.session = session;
-		this.sqmStatement = resolveSqmTree( hql, resultType, session );
+		this.sqmStatement = resolveSqmTree( hql, resultType, session.getFactory() );
 		this.sqmRoot = extractRoot( sqmStatement, resultType, hql );
 	}
 
 	public SelectionSpecificationImpl(
 			Class<T> rootEntityType,
 			SharedSessionContractImplementor session) {
-		this( "from " + determineEntityName( rootEntityType, session ), rootEntityType, session );
+		this( "from " + determineEntityName( rootEntityType, session.getFactory() ), rootEntityType, session );
 	}
 
 	public SelectionSpecificationImpl(
@@ -124,8 +125,8 @@ public SelectionQuery<T> createQuery() {
 	private static <T> SqmSelectStatement<T> resolveSqmTree(
 			String hql,
 			Class<T> resultType,
-			SharedSessionContractImplementor session) {
-		final QueryEngine queryEngine = session.getFactory().getQueryEngine();
+			SessionFactoryImplementor sessionFactory) {
+		final QueryEngine queryEngine = sessionFactory.getQueryEngine();
 		final HqlInterpretation<T> hqlInterpretation = queryEngine
 				.getInterpretationCache()
 				.resolveHqlInterpretation( hql, resultType, queryEngine.getHqlTranslator() );
@@ -174,11 +175,10 @@ private SqmRoot<T> extractRoot(SqmSelectStatement<T> sqmStatement, Class<T> resu
 
 	private static String determineEntityName(
 			Class<?> rootEntityType,
-			SharedSessionContractImplementor session) {
-		final EntityDomainType<?> entityType = session
-				.getFactory()
-				.getJpaMetamodel()
-				.findEntityType( rootEntityType );
+			SessionFactoryImplementor sessionFactory) {
+		final EntityDomainType<?> entityType =
+				sessionFactory.getJpaMetamodel()
+						.findEntityType( rootEntityType );
 		if ( entityType == null ) {
 			return rootEntityType.getName();
 		}