get rid of inheritance of SessionFactoryImplementor from query creation context stuff

Let's make the NodeBuilder the thing that is the SqmCreationContext, and introduce a
new thing that performs a similar role for SqlAstCreationContext. The reason here is
twofold:

- it is part of my long struggle to decouple query parsing/typing from the
  SessionFactory, in order to make HibernateProcessor less of a hack and I
  guess more robust
- SessionFactoryImplementor was already starting to be polluted with weird
  little operations that didn't belong there. That will only get worse with
  time.

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java

@@ -4,17 +4,6 @@
  */
 package org.hibernate.boot.query;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.function.Supplier;
-
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.boot.BootLogging;
@@ -43,10 +32,9 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.query.internal.FetchMementoBasicStandard;
 import org.hibernate.query.internal.FetchMementoEmbeddableStandard;
 import org.hibernate.query.internal.FetchMementoEntityStandard;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.query.internal.FetchMementoBasicStandard;
 import org.hibernate.query.internal.FetchMementoHbmStandard;
 import org.hibernate.query.internal.FetchMementoHbmStandard.FetchParentMemento;
 import org.hibernate.query.internal.NamedResultSetMappingMementoImpl;
@@ -58,11 +46,23 @@
 import org.hibernate.query.named.FetchMementoBasic;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.named.ResultMemento;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.FetchableContainer;
 import org.hibernate.sql.results.graph.entity.EntityValuedFetchable;
 import org.hibernate.type.BasicType;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.function.Supplier;
+
 /**
  * Boot-time descriptor of a result set mapping as defined in an {@code hbm.xml} file
  * either implicitly or explicitly
@@ -372,10 +372,8 @@ public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext
 					registrationName
 			);
 
-			final EntityMappingType entityDescriptor = resolutionContext
-					.getSessionFactory()
-					.getRuntimeMetamodels()
-					.getEntityMappingType( entityName );
+			final EntityMappingType entityDescriptor =
+					resolutionContext.getMappingMetamodel().getEntityDescriptor( entityName );
 			applyFetchJoins( joinDescriptorsAccess, tableAlias, propertyFetchDescriptors );
 
 			final NavigablePath entityPath = new NavigablePath( entityName );
@@ -421,10 +419,8 @@ public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext
 		@Override
 		public FetchParentMemento resolveParentMemento(ResultSetMappingResolutionContext resolutionContext) {
 			if ( thisAsParentMemento == null ) {
-				final EntityMappingType entityDescriptor = resolutionContext
-						.getSessionFactory()
-						.getRuntimeMetamodels()
-						.getEntityMappingType( entityName );
+				final EntityMappingType entityDescriptor =
+						resolutionContext.getMappingMetamodel().getEntityDescriptor( entityName );
 				thisAsParentMemento = new HbmFetchParentMemento(
 						new NavigablePath( entityDescriptor.getEntityName() ),
 						entityDescriptor
@@ -916,10 +912,9 @@ public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext
 		@Override
 		public FetchParentMemento resolveParentMemento(ResultSetMappingResolutionContext resolutionContext) {
 			if ( thisAsParentMemento == null ) {
-				final CollectionPersister collectionDescriptor = resolutionContext.getSessionFactory()
-						.getRuntimeMetamodels()
-						.getMappingMetamodel()
-						.getCollectionDescriptor( collectionPath.getFullPath() );
+				final CollectionPersister collectionDescriptor =
+						resolutionContext.getMappingMetamodel()
+								.getCollectionDescriptor( collectionPath.getFullPath() );
 
 				thisAsParentMemento = new HbmFetchParentMemento( collectionPath, collectionDescriptor.getAttributeMapping() );
 			}
@@ -957,10 +952,9 @@ public ResultMementoBasicStandard resolve(ResultSetMappingResolutionContext reso
 			);
 
 			if ( hibernateTypeName != null ) {
-				final BasicType<?> namedType = resolutionContext.getSessionFactory()
-						.getTypeConfiguration()
-						.getBasicTypeRegistry()
-						.getRegisteredType( hibernateTypeName );
+				final BasicType<?> namedType =
+						resolutionContext.getTypeConfiguration().getBasicTypeRegistry()
+								.getRegisteredType( hibernateTypeName );
 
 				if ( namedType == null ) {
 					throw new IllegalArgumentException( "Could not resolve named type : " + hibernateTypeName );

hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java

@@ -12,10 +12,8 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.metamodel.RuntimeMetamodels;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -214,10 +212,9 @@ public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext
 					(mapping) -> argumentResultMementos.add( mapping.resolve( resolutionContext ) )
 			);
 
-			final SessionFactoryImplementor sessionFactory = resolutionContext.getSessionFactory();
-			final JavaType<?> targetJtd = sessionFactory.getTypeConfiguration()
-					.getJavaTypeRegistry()
-					.getDescriptor( targetJavaType );
+			final JavaType<?> targetJtd =
+					resolutionContext.getTypeConfiguration().getJavaTypeRegistry()
+							.getDescriptor( targetJavaType );
 
 			return new ResultMementoInstantiationStandard( targetJtd, argumentResultMementos );
 		}
@@ -270,8 +267,8 @@ private static Map<String, AttributeFetchDescriptor> extractFetchMappings(
 
 		@Override
 		public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext) {
-			final RuntimeMetamodels runtimeMetamodels = resolutionContext.getSessionFactory().getRuntimeMetamodels();
-			final EntityMappingType entityDescriptor = runtimeMetamodels.getEntityMappingType( entityName );
+			final EntityMappingType entityDescriptor =
+					resolutionContext.getMappingMetamodel().getEntityDescriptor( entityName );
 
 			final FetchMementoBasic discriminatorMemento = resolveDiscriminatorMemento(
 					entityDescriptor,
@@ -366,8 +363,8 @@ private void addColumn(FieldResult fieldResult) {
 
 		@Override
 		public ResultMemento asResultMemento(NavigablePath path, ResultSetMappingResolutionContext resolutionContext) {
-			final RuntimeMetamodels runtimeMetamodels = resolutionContext.getSessionFactory().getRuntimeMetamodels();
-			final EntityMappingType entityMapping = runtimeMetamodels.getEntityMappingType( entityName );
+			final EntityMappingType entityMapping =
+					resolutionContext.getMappingMetamodel().getEntityDescriptor( entityName );
 
 			final ModelPart subPart = entityMapping.findSubPart( propertyPath, null );
 
@@ -386,8 +383,8 @@ public ResultMemento asResultMemento(NavigablePath path, ResultSetMappingResolut
 
 		@Override
 		public FetchMemento resolve(ResultSetMappingResolutionContext resolutionContext) {
-			final RuntimeMetamodels runtimeMetamodels = resolutionContext.getSessionFactory().getRuntimeMetamodels();
-			final EntityMappingType entityMapping = runtimeMetamodels.getEntityMappingType( entityName );
+			final EntityMappingType entityMapping =
+					resolutionContext.getMappingMetamodel().getEntityDescriptor( entityName );
 
 			ModelPart subPart = entityMapping.findSubPart(
 					propertyPathParts[0],

hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java

@@ -211,8 +211,7 @@ public QuerySpec transform(CteContainer cteContainer, QuerySpec querySpec, SqmTo
 			else {
 				predicateContainer = querySpec;
 			}
-			final BasicType<Integer> integerType = converter.getCreationContext()
-					.getSessionFactory()
+			final BasicType<Integer> integerType = converter.getSqmCreationContext()
 					.getNodeBuilder()
 					.getIntegerType();
 			final Expression oneBasedOrdinal = new ColumnReference(
@@ -247,8 +246,7 @@ public QuerySpec transform(CteContainer cteContainer, QuerySpec querySpec, SqmTo
 			}
 			else {
 				// When start < stop, step must be positive and value is only valid if it's less than or equal to stop
-				final BasicType<Boolean> booleanType = converter.getCreationContext()
-						.getSessionFactory()
+				final BasicType<Boolean> booleanType = converter.getSqmCreationContext()
 						.getNodeBuilder()
 						.getBooleanType();
 				final Predicate positiveProgress = new Junction(

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java

@@ -11,7 +11,6 @@
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
-import org.hibernate.query.sqm.internal.TypecheckUtil;
 import org.hibernate.query.sqm.produce.function.ArgumentsValidator;
 import org.hibernate.query.sqm.produce.function.FunctionArgumentException;
 import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
@@ -23,6 +22,8 @@
 import org.hibernate.type.BottomType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.query.sqm.internal.TypecheckUtil.areTypesComparable;
+
 public class ArrayConstructorFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
 
 	private final boolean withKeyword;
@@ -84,7 +85,8 @@ public void validate(
 				if ( firstType == null ) {
 					firstType = argument;
 				}
-				else if ( !TypecheckUtil.areTypesComparable( firstType, argument, sessionFactory ) ) {
+				else if ( !areTypesComparable( firstType, argument,
+						sessionFactory.getQueryEngine().getCriteriaBuilder() ) ) {
 					throw new FunctionArgumentException(
 							String.format(
 									"All array arguments must have a compatible type compatible to the first argument type [%s], but argument %d has type '%s'",

hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java

@@ -109,8 +109,7 @@ public TableGroup convertToSqlAst(
 									tg -> tg.findTableGroupJoin( functionTableGroup ) == null ? null : tg
 							);
 							final TableGroupJoin join = parentTableGroup.findTableGroupJoin( functionTableGroup );
-							final BasicType<Integer> integerType = walker.getCreationContext()
-									.getSessionFactory()
+							final BasicType<Integer> integerType = walker.getSqmCreationContext()
 									.getNodeBuilder()
 									.getIntegerType();
 							final Expression lhs = new SelfRenderingExpression() {

hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java

@@ -161,8 +161,7 @@ public QuerySpec transform(CteContainer cteContainer, QuerySpec querySpec, SqmTo
 				else {
 					predicateContainer = querySpec;
 				}
-				final BasicType<Integer> integerType = converter.getCreationContext()
-						.getSessionFactory()
+				final BasicType<Integer> integerType = converter.getSqmCreationContext()
 						.getNodeBuilder()
 						.getIntegerType();
 				final Expression jsonDocument;
@@ -233,8 +232,7 @@ public QuerySpec transform(CteContainer cteContainer, QuerySpec querySpec, SqmTo
 						true,
 						converter.getCreationContext().getSessionFactory()
 				);
-				final BasicType<Integer> integerType = converter.getCreationContext()
-						.getSessionFactory()
+				final BasicType<Integer> integerType = converter.getSqmCreationContext()
 						.getNodeBuilder()
 						.getIntegerType();
 

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java

@@ -47,6 +47,7 @@
 import org.hibernate.proxy.EntityNotFoundDelegate;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.spi.QueryEngine;
+import org.hibernate.query.sql.spi.SqlTranslationEngine;
 import org.hibernate.relational.SchemaManager;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
@@ -277,11 +278,6 @@ public ServiceRegistryImplementor getServiceRegistry() {
 		return delegate.getServiceRegistry();
 	}
 
-	@Override
-	public Integer getMaximumFetchDepth() {
-		return delegate.getMaximumFetchDepth();
-	}
-
 	@Override
 	public void addObserver(SessionFactoryObserver observer) {
 		delegate.addObserver( observer );
@@ -342,6 +338,11 @@ public QueryEngine getQueryEngine() {
 		return delegate.getQueryEngine();
 	}
 
+	@Override
+	public SqlTranslationEngine getSqlTranslationEngine() {
+		return delegate.getSqlTranslationEngine();
+	}
+
 	@Override
 	public Reference getReference() throws NamingException {
 		return delegate.getReference();
@@ -392,11 +393,6 @@ public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityCl
 		return delegate.findEntityGraphsByType(entityClass);
 	}
 
-	@Override
-	public Class<?> classForName(String className) {
-		return delegate.classForName( className );
-	}
-
 	@Override
 	public EventListenerGroups getEventListenerGroups() {
 		return delegate.getEventListenerGroups();

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java

@@ -23,14 +23,15 @@
 import org.hibernate.event.spi.EventEngine;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
+import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
 import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.query.sqm.spi.SqmCreationContext;
+import org.hibernate.query.spi.QueryEngine;
+import org.hibernate.query.sql.spi.SqlTranslationEngine;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
-import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
 import org.hibernate.stat.spi.StatisticsImplementor;
 import org.hibernate.generator.Generator;
@@ -49,8 +50,7 @@
  * @author Gavin King
  * @author Steve Ebersole
  */
-public interface SessionFactoryImplementor
-		extends MappingContext, SessionFactory, SqmCreationContext, SqlAstCreationContext {
+public interface SessionFactoryImplementor extends MappingContext, SessionFactory {
 	/**
 	 * Get the UUID for this {@code SessionFactory}.
 	 * <p>
@@ -80,19 +80,6 @@ public interface SessionFactoryImplementor
 	@Override
 	SessionImplementor openSession();
 
-	@Override
-	TypeConfiguration getTypeConfiguration();
-
-	@Override
-	default SessionFactoryImplementor getSessionFactory() {
-		return this;
-	}
-
-	@Override
-	default MappingMetamodelImplementor getMappingMetamodel() {
-		return getRuntimeMetamodels().getMappingMetamodel();
-	}
-
 	@Override
 	SessionBuilderImplementor withOptions();
 
@@ -107,8 +94,22 @@ default MappingMetamodelImplementor getMappingMetamodel() {
 	@Override
 	StatisticsImplementor getStatistics();
 
+	TypeConfiguration getTypeConfiguration();
+
 	RuntimeMetamodelsImplementor getRuntimeMetamodels();
 
+	default MappingMetamodelImplementor getMappingMetamodel() {
+		return getRuntimeMetamodels().getMappingMetamodel();
+	}
+
+	default JpaMetamodel getJpaMetamodel() {
+		return getRuntimeMetamodels().getJpaMetamodel();
+	}
+
+	QueryEngine getQueryEngine();
+
+	SqlTranslationEngine getSqlTranslationEngine();
+
 	/**
 	 * Access to the {@code ServiceRegistry} for this {@code SessionFactory}.
 	 *
@@ -228,4 +229,5 @@ default MappingMetamodelImplementor getMappingMetamodel() {
 	 * The best guess entity name for an entity not in an association
 	 */
 	String bestGuessEntityName(Object object);
+
 }