factor out GraphParserEntityXXXXXResolver interfaces

gavinking · gavinking · commit 7f3424174f73 · 2025-12-08T23:53:47.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java
@@ -4,17 +4,16 @@
  */
 package org.hibernate.boot.model;
 
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.metamodel.model.domain.EntityDomainType;
-
-import java.util.function.Function;
 
 /**
  * @author Steve Ebersole
  */
 @FunctionalInterface
 public interface NamedGraphCreator {
 	RootGraphImplementor<?> createEntityGraph(
-			Function<Class<?>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver);
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java
@@ -11,13 +11,13 @@
 import org.hibernate.boot.model.NamedGraphCreator;
 import org.hibernate.graph.internal.RootGraphImpl;
 import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.GraphImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.graph.spi.SubGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 
-import java.util.function.Function;
-
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 
@@ -38,10 +38,10 @@ class NamedGraphCreatorJpa implements NamedGraphCreator {
 
 	@Override
 	public RootGraphImplementor<?> createEntityGraph(
-			Function<Class<?>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver) {
 		return createGraph( (EntityDomainType<?>)
-				entityDomainNameResolver.apply( jpaEntityName ) );
+				entityDomainNameResolver.resolveEntityName( jpaEntityName ) );
 	}
 
 	private <T> @NonNull RootGraphImplementor<T> createGraph(EntityDomainType<T> rootEntityType) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java
@@ -14,12 +14,12 @@
 import org.hibernate.grammars.graph.GraphLanguageLexer;
 import org.hibernate.grammars.graph.GraphLanguageParser;
 import org.hibernate.graph.InvalidGraphException;
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.internal.parse.GraphParsing;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 
-import java.util.function.Function;
-
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 
 /**
@@ -42,8 +42,8 @@ class NamedGraphCreatorParsed implements NamedGraphCreator {
 
 	@Override
 	public RootGraphImplementor<?> createEntityGraph(
-			Function<Class<?>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver) {
 		final var lexer = new GraphLanguageLexer( CharStreams.fromString( annotation.graph() ) );
 		final var parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
 		final var graphContext = parser.graph();
@@ -54,33 +54,39 @@ public RootGraphImplementor<?> createEntityGraph(
 				throw new InvalidGraphException( "Expecting graph text to include an entity name : " + annotation.graph() );
 			}
 			final String jpaEntityName = typeIndicator.TYPE_NAME().toString();
-			final var entityDomainType = entityDomainNameResolver.apply( jpaEntityName );
+			final var entityDomainType = entityDomainNameResolver.resolveEntityName( jpaEntityName );
 			final String name = this.name == null ? jpaEntityName : this.name;
 			return parse( entityDomainNameResolver, name, entityDomainType, graphContext );
 		}
 		else {
 			if ( typeIndicator != null ) {
 				throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + annotation.graph() );
 			}
-			final var entityDomainType = entityDomainClassResolver.apply( entityType );
+			final var entityDomainType = entityDomainClassResolver.resolveEntityClass( entityType );
 			final String name = this.name == null ? entityDomainType.getName() : this.name;
 			return parse( entityDomainNameResolver, name, entityDomainType, graphContext );
 		}
 	}
 
 	private static @NonNull RootGraphImplementor<?> parse(
-			Function<String, EntityDomainType<?>> entityDomainNameResolver, String name, EntityDomainType<?> entityDomainType,
+			GraphParserEntityNameResolver entityDomainNameResolver,
+			String name,
+			EntityDomainType<?> entityDomainType,
 			GraphLanguageParser.GraphContext graphContext) {
 		return GraphParsing.parse( name, entityDomainType, graphContext.attributeList(),
 				entityName -> resolve( entityName, entityDomainNameResolver ) );
 	}
 
 	private static @NonNull EntityDomainType<?> resolve(
-			String entityName, Function<String, EntityDomainType<?>> entityDomainNameResolver) {
-		final var entityDomainType = (EntityDomainType<?>) entityDomainNameResolver.apply( entityName );
-		if ( entityDomainType != null ) {
+			String entityName, GraphParserEntityNameResolver entityDomainNameResolver) {
+		final var entityDomainType =
+				(EntityDomainType<?>)
+						entityDomainNameResolver.resolveEntityName( entityName );
+		if ( entityDomainType == null ) {
+			throw new UnknownEntityTypeException( entityName );
+		}
+		else {
 			return entityDomainType;
 		}
-		throw new UnknownEntityTypeException( entityName );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
@@ -291,8 +291,6 @@ public static void parseInto(
 	 * Parses the textual graph representation as {@linkplain GraphParser described above}
 	 * into the specified graph.
 	 *
-	 * @param <T> The Java type for the ManagedType described by `graph`
-	 *
 	 * @param graph The target graph.  This is the graph that will be populated
 	 * by this process
 	 * @param graphText Textual representation of the graph
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
@@ -10,6 +10,7 @@
 import org.hibernate.graph.GraphNode;
 import org.hibernate.graph.InvalidGraphException;
 import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.GraphImplementor;
 import org.hibernate.graph.spi.SubGraphImplementor;
 import org.hibernate.internal.util.StringHelper;
@@ -24,21 +25,21 @@
  * @author Steve Ebersole
  */
 public class GraphParser extends GraphLanguageParserBaseVisitor<GraphNode<?>> {
-	private final EntityNameResolver entityNameResolver;
+	private final GraphParserEntityNameResolver entityNameResolver;
 
 	private final Stack<GraphImplementor<?>> graphStack = new StandardStack<>();
 	private final Stack<AttributeNodeImplementor<?,?,?>> attributeNodeStack = new StandardStack<>();
 	private final Stack<SubGraphGenerator> graphSourceStack = new StandardStack<>();
 
-	public GraphParser(EntityNameResolver entityNameResolver) {
+	public GraphParser(GraphParserEntityNameResolver entityNameResolver) {
 		this.entityNameResolver = entityNameResolver;
 	}
 
 	/**
 	 * @apiNote It is important that this form only be used after the session-factory is fully
 	 * initialized, especially the {@linkplain SessionFactoryImplementor#getJpaMetamodel()} JPA metamodel}.
 	 *
-	 * @see GraphParser#GraphParser(EntityNameResolver)
+	 * @see GraphParser#GraphParser(GraphParserEntityNameResolver)
 	 */
 	public GraphParser(SessionFactoryImplementor sessionFactory) {
 		this( sessionFactory.getJpaMetamodel()::findEntityType );
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java
@@ -14,6 +14,7 @@
 import org.hibernate.grammars.graph.GraphLanguageParser.GraphContext;
 import org.hibernate.graph.InvalidGraphException;
 import org.hibernate.graph.internal.RootGraphImpl;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.GraphImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
@@ -86,7 +87,7 @@ public static <T> RootGraphImplementor<T> parse(
 	public static <T> RootGraphImplementor<T> parse(
 			EntityDomainType<T> rootType,
 			GraphLanguageParser.AttributeListContext attributeListContext,
-			EntityNameResolver entityNameResolver) {
+			GraphParserEntityNameResolver entityNameResolver) {
 		return parse( null, rootType, attributeListContext, entityNameResolver );
 	}
 
@@ -100,7 +101,7 @@ public static <T> RootGraphImplementor<T> parse(
 			@Nullable String name,
 			EntityDomainType<T> rootType,
 			GraphLanguageParser.AttributeListContext attributeListContext,
-			EntityNameResolver entityNameResolver) {
+			GraphParserEntityNameResolver entityNameResolver) {
 		final RootGraphImpl<T> targetGraph = new RootGraphImpl<>( name, rootType );
 		visitGraph( targetGraph, entityNameResolver, attributeListContext );
 		return targetGraph;
@@ -126,7 +127,7 @@ public static void parseInto(
 
 	private static void visitGraph(
 			GraphImplementor<?> targetGraph,
-			EntityNameResolver entityNameResolver,
+			GraphParserEntityNameResolver entityNameResolver,
 			GraphLanguageParser.AttributeListContext attributeList) {
 		// Build an instance of this class as a visitor
 		final var visitor = new GraphParser( entityNameResolver );
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
@@ -5,6 +5,7 @@
 package org.hibernate.graph.internal.parse;
 
 
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 
 /**
@@ -22,8 +23,8 @@ public enum PathQualifierType {
 			: attributeNode.addValueSubgraph().addTreatedSubgraph( managedType( subtypeName, entityNameResolver ) )
 	);
 
-	private static <T> ManagedDomainType<T> managedType(String subtypeName, EntityNameResolver entityNameResolver) {
-		final var entityDomainType = entityNameResolver.resolveEntityName( subtypeName );
+	private static <T> ManagedDomainType<T> managedType(String subtypeName, GraphParserEntityNameResolver resolver) {
+		final var entityDomainType = resolver.resolveEntityName( subtypeName );
 		if ( entityDomainType == null ) {
 			throw new IllegalArgumentException( "Unknown managed type: " + subtypeName );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
@@ -5,6 +5,7 @@
 package org.hibernate.graph.internal.parse;
 
 import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.SubGraphImplementor;
 
 /**
@@ -15,5 +16,5 @@ public interface SubGraphGenerator {
 	SubGraphImplementor<?> createSubGraph(
 			AttributeNodeImplementor<?,?,?> attributeNode,
 			String subTypeName,
-			EntityNameResolver entityNameResolver);
+			GraphParserEntityNameResolver entityNameResolver);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityClassResolver.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityClassResolver.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
+/**
+ * @author Gavin King
+ *
+ * @since 7.2
+ */
+@Incubating
+@FunctionalInterface
+public interface GraphParserEntityClassResolver {
+	EntityDomainType<?> resolveEntityClass(Class<?> entityClass);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityNameResolver.java
@@ -2,14 +2,18 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.graph.internal.parse;
+package org.hibernate.graph.spi;
 
+import org.hibernate.Incubating;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 
 /**
  * @author Steve Ebersole
+ *
+ * @since 7.2
  */
+@Incubating
 @FunctionalInterface
-public interface EntityNameResolver {
+public interface GraphParserEntityNameResolver {
 	EntityDomainType<?> resolveEntityName(String entityName);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
@@ -451,7 +451,7 @@ private ImportInfo resolveImport(final String name) {
 			return importInfo;
 		}
 		else {
-			//then check the negative cache, to avoid bothering the classloader unnecessarily
+			//then check the negative cache to avoid bothering the classloader unnecessarily
 			if ( knownInvalidnameToImportMap.containsKey( name ) ) {
 				return null;
 			}
@@ -491,13 +491,13 @@ private void applyNamedEntityGraphs(Collection<NamedEntityGraphDefinition> named
 					definition.name(), definition.source() );
 
 			final var graph = definition.graphCreator().createEntityGraph(
-					(entityClass) -> {
+					entityClass -> {
 						if ( managedTypeByClass.get( entityClass ) instanceof EntityDomainType<?> match ) {
 							return match;
 						}
 						throw new IllegalArgumentException( "Cannot resolve entity class : " + entityClass.getName() );
 					},
-					(jpaEntityName) -> {
+					jpaEntityName -> {
 						for ( var entry : managedTypeByName.entrySet() ) {
 							if ( entry.getValue() instanceof EntityDomainType<?> possibility
 									&& jpaEntityName.equals( possibility.getName() ) ) {
@@ -554,14 +554,14 @@ public <T> EntityDomainType<T> resolveEntityReference(Class<T> javaType) {
 				if ( managedType.getPersistenceType() == Type.PersistenceType.ENTITY
 						// see if we should add EntityDomainType as one of the matching descriptors.
 						&& javaType.isAssignableFrom( managedType.getJavaType() ) ) {
-					// the queried type is assignable from the type of the current entity-type
-					// we should add it to the collecting set of matching descriptors.  it should
+					// The queried type is assignable from the type of the current entity type.
+					// We should add it to the collecting set of matching descriptors. It should
 					// be added aside from a few cases...
 
-					// if the managed-type has a super type and the java type is assignable from the super type,
-					// do not add the managed type as the super itself will get added and the initializers for
-					// entity mappings already handle loading subtypes - adding it would be redundant and lead to
-					// incorrect results
+					// If the managed type has a supertype and the java type is assignable from the super type,
+					// do not add the managed type as the supertype itself will get added and the initializers
+					// for entity mappings already handle loading subtypes - adding it would be redundant and
+					// lead to incorrect results
 					final var superType = managedType.getSuperType();
 					if ( superType == null
 							|| superType.getPersistenceType() != Type.PersistenceType.ENTITY

Original file line number	Diff line number	Diff line change
`@@ -291,8 +291,6 @@ public static void parseInto(`
`291`	`291`	`* Parses the textual graph representation as {@linkplain GraphParser described above}`
`292`	`292`	`* into the specified graph.`
`293`	`293`	`*`
`294`		- * @param <T> The Java type for the ManagedType described by `graph`
`295`		`- *`
`296`	`294`	`* @param graph The target graph. This is the graph that will be populated`
`297`	`295`	`* by this process`
`298`	`296`	`* @param graphText Textual representation of the graph`