move management of fetch profiles to the SqlTranslationEngine

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -201,7 +201,6 @@ public class SessionFactoryImpl implements SessionFactoryImplementor, BindingCon
 
 	private final transient Map<String, FilterDefinition> filters;
 	private final transient java.util.Collection<FilterDefinition> autoEnabledFilters = new HashSet<>();
-	private final transient Map<String, FetchProfile> fetchProfiles;
 	private final transient JavaType<Object> tenantIdentifierJavaType;
 
 	private final transient EventListenerGroups eventListenerGroups;
@@ -305,7 +304,6 @@ public SessionFactoryImpl(
 			// and SqmFunctionRegistry, instantiating just the
 			// registry here, and doing the engine later
 			queryEngine = new QueryEngineImpl( bootMetamodel, options, this, serviceRegistry, settings, name );
-			sqlTranslationEngine = new SqlTranslationEngineImpl( this, typeConfiguration );
 
 			// create runtime metamodels (mapping and JPA)
 			final RuntimeMetamodelsImpl runtimeMetamodelsImpl = new RuntimeMetamodelsImpl();
@@ -318,7 +316,8 @@ public SessionFactoryImpl(
 
 			// this needs to happen after the mapping metamodel is
 			// completely built, since we need to use the persisters
-			fetchProfiles = getFetchProfiles( bootMetamodel, runtimeMetamodelsImpl );
+			Map<String, FetchProfile> fetchProfiles = getFetchProfiles( bootMetamodel, runtimeMetamodelsImpl );
+			sqlTranslationEngine = new SqlTranslationEngineImpl( this, typeConfiguration, fetchProfiles );
 
 			defaultSessionOpenOptions = createDefaultSessionOpenOptionsIfPossible();
 			temporarySessionOpenOptions = defaultSessionOpenOptions == null ? null : buildTemporarySessionOpenOptions();
@@ -1035,18 +1034,23 @@ public java.util.Collection<FilterDefinition> getAutoEnabledFilters() {
 	}
 
 	@Override
-	public boolean containsFetchProfileDefinition(String name) {
-		return fetchProfiles.containsKey( name );
+	public Set<String> getDefinedFilterNames() {
+		return unmodifiableSet( filters.keySet() );
 	}
 
 	@Override
-	public Set<String> getDefinedFilterNames() {
-		return unmodifiableSet( filters.keySet() );
+	public FetchProfile getFetchProfile(String name) {
+		return sqlTranslationEngine.getFetchProfile( name );
+	}
+
+	@Override
+	public boolean containsFetchProfileDefinition(String name) {
+		return sqlTranslationEngine.containsFetchProfileDefinition( name );
 	}
 
 	@Override
 	public Set<String> getDefinedFetchProfileNames() {
-		return unmodifiableSet( fetchProfiles.keySet() );
+		return sqlTranslationEngine.getDefinedFetchProfileNames();
 	}
 
 	@Override @Deprecated
@@ -1126,11 +1130,6 @@ public EntityNotFoundDelegate getEntityNotFoundDelegate() {
 		return sessionFactoryOptions.getEntityNotFoundDelegate();
 	}
 
-	@Override
-	public FetchProfile getFetchProfile(String name) {
-		return fetchProfiles.get( name );
-	}
-
 	/**
 	 * @deprecated use {@link #configuredInterceptor(Interceptor, boolean, SessionFactoryOptions)}
 	 */

hibernate-core/src/main/java/org/hibernate/query/sql/internal/SqlTranslationEngineImpl.java

@@ -11,16 +11,31 @@
 import org.hibernate.query.sql.spi.SqlTranslationEngine;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.unmodifiableSet;
+
 public class SqlTranslationEngineImpl implements SqlTranslationEngine {
 
 	//TODO: consider unifying with SqlStringGenerationContextImpl
 
 	private final SessionFactoryImplementor factory;
 	private final TypeConfiguration typeConfiguration;
+	private final Map<String, FetchProfile> fetchProfiles;
 
-	public SqlTranslationEngineImpl(SessionFactoryImplementor factory, TypeConfiguration typeConfiguration) {
+	public SqlTranslationEngineImpl(
+			SessionFactoryImplementor factory,
+			TypeConfiguration typeConfiguration,
+			Map<String, FetchProfile> fetchProfiles) {
 		this.factory = factory;
 		this.typeConfiguration = typeConfiguration;
+		this.fetchProfiles = fetchProfiles;
+	}
+
+	@Override
+	public TypeConfiguration getTypeConfiguration() {
+		return typeConfiguration;
 	}
 
 	@Override
@@ -50,11 +65,16 @@ public JpaMetamodel getJpaMetamodel() {
 
 	@Override
 	public FetchProfile getFetchProfile(String name) {
-		return factory.getFetchProfile( name );
+		return fetchProfiles.get( name );
 	}
 
 	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return typeConfiguration;
+	public boolean containsFetchProfileDefinition(String name) {
+		return fetchProfiles.containsKey( name );
+	}
+
+	@Override
+	public Set<String> getDefinedFetchProfileNames() {
+		return unmodifiableSet( fetchProfiles.keySet() );
 	}
 }

hibernate-core/src/main/java/org/hibernate/query/sql/spi/SqlTranslationEngine.java

@@ -7,6 +7,8 @@
 import org.hibernate.Incubating;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 
+import java.util.Set;
+
 /**
  * Introduced as an analog of {@link org.hibernate.query.spi.QueryEngine}
  * and/or {@link org.hibernate.query.sqm.NodeBuilder} for the SQL
@@ -19,4 +21,8 @@
 @Incubating
 public interface SqlTranslationEngine extends SqlAstCreationContext {
 	// TODO: consider implementing SqlStringGenerationContext
+
+	boolean containsFetchProfileDefinition(String name);
+
+	Set<String> getDefinedFetchProfileNames();
 }

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java

@@ -56,14 +56,24 @@ public interface SqlAstCreationContext extends BindingContext {
 	 */
 	FetchProfile getFetchProfile(String name);
 
+	/**
+	 * Obtain the {@link SqmFunctionRegistry}.
+	 */
 	default SqmFunctionRegistry getSqmFunctionRegistry() {
 		return getSessionFactory().getQueryEngine().getSqmFunctionRegistry();
 	}
 
+	/**
+	 * Obtain the {@link Dialect}.
+	 */
 	default Dialect getDialect() {
 		return getSessionFactory().getQueryEngine().getDialect();
 	}
 
+	/**
+	 * Obtain the "incomplete" {@link WrapperOptions} that would be
+	 * returned by {@link SessionFactoryImplementor#getWrapperOptions()}.
+	 */
 	default WrapperOptions getWrapperOptions() {
 		return getSessionFactory().getWrapperOptions();
 	}

tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java

@@ -239,7 +239,7 @@ public Class<?> classForName(String className) {
 
 		nodeBuilder = new SqmCriteriaNodeBuilder("", "", this, this, this);
 
-		sqlTranslationEngine = new SqlTranslationEngineImpl(this, typeConfiguration);
+		sqlTranslationEngine = new SqlTranslationEngineImpl(this, typeConfiguration, emptyMap() );
 	}
 
 	@Override