unexpose the ServiceRegistry on SqmCreationContext + SqlAstCreationContext

Author: gavinking

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

@@ -403,4 +403,9 @@ public WrapperOptions getWrapperOptions() {
 	public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityClass) {
 		return delegate.findEntityGraphsByType(entityClass);
 	}
+
+	@Override
+	public Class<?> classForName(String className) {
+		return delegate.classForName( className );
+	}
 }

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

@@ -111,7 +111,6 @@ default MappingMetamodelImplementor getMappingMetamodel() {
 	 *
 	 * @return The factory's ServiceRegistry
 	 */
-	@Override
 	ServiceRegistryImplementor getServiceRegistry();
 
 	/**

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

@@ -458,8 +458,7 @@ private static SqlStringGenerationContext createSqlStringGenerationContext(
 	private static SessionFactoryServiceRegistry getServiceRegistry(
 			SessionFactoryOptions options,
 			SessionFactoryImplementor self) {
-		return options
-				.getServiceRegistry()
+		return options.getServiceRegistry()
 				.requireService( SessionFactoryServiceRegistryFactory.class )
 				// it is not great how we pass in an instance to
 				// an incompletely-initialized instance here:
@@ -1704,6 +1703,12 @@ public SchemaManager getSchemaManager() {
 		return schemaManager;
 	}
 
+	@Override
+	public Class<?> classForName(String className) {
+		return serviceRegistry.requireService( ClassLoaderService.class )
+				.classForName( className );
+	}
+
 	private enum Status {
 		OPEN,
 		CLOSING,

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

@@ -13,7 +13,6 @@
 import java.util.function.Function;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.criteria.JpaSelection;
@@ -69,8 +68,6 @@ public FullyQualifiedReflectivePathTerminal<E> copy(SqmCopyContext context) {
 	private Function<SemanticQueryWalker<?>, ?> resolveTerminalSemantic() {
 		return semanticQueryWalker -> {
 			final SqmCreationContext creationContext = creationState.getCreationContext();
-			final ClassLoaderService cls =
-					creationContext.getServiceRegistry().requireService( ClassLoaderService.class );
 			final String fullPath = getFullPath();
 
 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -85,7 +82,7 @@ public FullyQualifiedReflectivePathTerminal<E> copy(SqmCopyContext context) {
 			// See if it is a Class FQN
 
 			try {
-				final Class<?> namedClass = cls.classForName( fullPath );
+				final Class<?> namedClass = creationContext.classForName( fullPath );
 				if ( namedClass != null ) {
 					return semanticQueryWalker.visitFullyQualifiedClass( namedClass );
 				}
@@ -99,7 +96,7 @@ public FullyQualifiedReflectivePathTerminal<E> copy(SqmCopyContext context) {
 
 			final String parentFullPath = getParent().getFullPath();
 			try {
-				final Class<?> namedClass = cls.classForName( parentFullPath );
+				final Class<?> namedClass = creationContext.classForName( parentFullPath );
 				if ( namedClass != null ) {
 					return createEnumOrFieldLiteral( namedClass );
 				}

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

@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.dialect.function.SqlColumn;
 import org.hibernate.grammars.hql.HqlLexer;
@@ -1553,17 +1552,12 @@ public SqmDynamicInstantiation<?> visitInstantiation(HqlParser.InstantiationCont
 	}
 
 	private JavaType<?> resolveInstantiationTargetJtd(String className) {
-		final Class<?> targetJavaType = classForName( creationContext.getJpaMetamodel().qualifyImportableName( className ) );
-		return creationContext.getJpaMetamodel()
-				.getTypeConfiguration()
-				.getJavaTypeRegistry()
+		final String qualifiedName = creationContext.getJpaMetamodel().qualifyImportableName( className );
+		final Class<?> targetJavaType = creationContext.classForName( qualifiedName );
+		return creationContext.getTypeConfiguration().getJavaTypeRegistry()
 				.resolveDescriptor( targetJavaType );
 	}
 
-	private Class<?> classForName(String className) {
-		return creationContext.getServiceRegistry().requireService( ClassLoaderService.class ).classForName( className );
-	}
-
 	@Override
 	public SqmDynamicInstantiationArgument<?> visitInstantiationArgument(HqlParser.InstantiationArgumentContext ctx) {
 		final HqlParser.VariableContext variable = ctx.variable();

hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationContext.java

@@ -10,7 +10,6 @@
 import org.hibernate.query.BindingContext;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.NodeBuilder;
-import org.hibernate.service.ServiceRegistry;
 
 /**
  * The context in which all SQM creations occur.
@@ -25,7 +24,10 @@ default NodeBuilder getNodeBuilder() {
 		return getQueryEngine().getCriteriaBuilder();
 	}
 
-	default ServiceRegistry getServiceRegistry() {
-		return getJpaMetamodel().getServiceRegistry();
-	}
+	/**
+	 * @apiNote Avoid calling this method, since {@link Class}
+	 *          objects are not available to the query validator
+	 *          in Hibernate Processor at compilation time.
+	 */
+	Class<?> classForName(String className);
 }

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

@@ -9,7 +9,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.query.BindingContext;
-import org.hibernate.service.ServiceRegistry;
 
 /**
  * The "context" in which creation of SQL AST occurs.  Provides
@@ -28,11 +27,6 @@ public interface SqlAstCreationContext extends BindingContext {
 	 */
 	MappingMetamodelImplementor getMappingMetamodel();
 
-	/**
-	 * Access to Services
-	 */
-	ServiceRegistry getServiceRegistry();
-
 	/**
 	 * When creating {@link org.hibernate.sql.results.graph.Fetch} references,
 	 * defines a limit to how deep we should join for fetches.

hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java

@@ -15,7 +15,6 @@
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.exec.spi.Callback;
 
@@ -92,11 +91,6 @@ public JpaMetamodel getJpaMetamodel() {
 		return sessionFactory().getJpaMetamodel();
 	}
 
-	@Override
-	public ServiceRegistry getServiceRegistry() {
-		return sessionFactory().getServiceRegistry();
-	}
-
 	@Override
 	public Integer getMaximumFetchDepth() {
 		return sessionFactory().getMaximumFetchDepth();

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

@@ -24,6 +24,7 @@
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.boot.spi.BootstrapContext;
@@ -364,6 +365,12 @@ public StandardServiceRegistryImpl getServiceRegistry() {
 		return serviceRegistry;
 	}
 
+	@Override
+	public Class<?> classForName(String className) {
+		return serviceRegistry.requireService( ClassLoaderService.class )
+				.classForName( className );
+	}
+
 	@Override
 	public JdbcServices getJdbcServices() {
 		return MockJdbcServicesInitiator.jdbcServices;