HHH-19216 - NamedEntityGraph annotation supporting Hibernate parseable format

HHH-19237 - Expand graph language to optionally specify entity
HHH-19217 - Expose GraphParser#parse on SessionFactory

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java

@@ -6,7 +6,6 @@
 
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 
 import java.util.function.Function;
 
@@ -17,6 +16,5 @@
 public interface NamedGraphCreator {
 	<T> RootGraphImplementor<T> createEntityGraph(
 			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver,
-			RuntimeModelCreationContext runtimeModelCreationContext);
+			Function<String, EntityDomainType<?>> entityDomainNameResolver);
 }

hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreatorJpa.java

@@ -16,7 +16,6 @@
 import org.hibernate.graph.spi.SubGraphImplementor;
 import org.hibernate.internal.util.NullnessHelper;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 
 import java.util.function.Function;
 
@@ -39,8 +38,7 @@ public NamedGraphCreatorJpa(NamedEntityGraph annotation, String jpaEntityName) {
 	@Override
 	public <T> RootGraphImplementor<T> createEntityGraph(
 			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver,
-			RuntimeModelCreationContext runtimeModelCreationContext) {
+			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
 		//noinspection unchecked
 		final EntityDomainType<T> rootEntityType = (EntityDomainType<T>) entityDomainNameResolver.apply( jpaEntityName );
 		final RootGraphImplementor<T> entityGraph = createRootGraph( name, rootEntityType, annotation.includeAllAttributes() );

hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreatorParsed.java

@@ -15,7 +15,6 @@
 import org.hibernate.graph.internal.parse.GraphParsing;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 
 import java.util.function.Function;
 
@@ -38,8 +37,7 @@ public NamedGraphCreatorParsed(Class<?> entityType, NamedEntityGraph annotation)
 	@Override
 	public <T> RootGraphImplementor<T> createEntityGraph(
 			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver,
-			RuntimeModelCreationContext runtimeModelCreationContext) {
+			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
 		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( annotation.graph() ) );
 		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
 		final GraphLanguageParser.GraphContext graphContext = parser.graph();

hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java

@@ -138,12 +138,13 @@ public static <T> RootGraphImplementor<T> parse(
 
 	/**
 	 * Parse the passed graph textual representation into the passed Graph.
+	 * Essentially overlays the text representation on top of the graph.
 	 */
 	public static void parseInto(
 			GraphImplementor<?> targetGraph,
-			String graphString,
+			CharSequence graphString,
 			SessionFactoryImplementor sessionFactory) {
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphString ) );
+		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphString.toString() ) );
 		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
 		final GraphLanguageParser.GraphContext graphContext = parser.graph();
 
@@ -165,14 +166,4 @@ public static void parseInto(
 			assert visitor.getGraphStack().isEmpty();
 		}
 	}
-
-	/**
-	 * Parse the passed graph textual representation into the passed Graph.
-	 */
-	public static void parseInto(
-			GraphImplementor<?> targetGraph,
-			CharSequence graphString,
-			SessionFactoryImplementor sessionFactory) {
-		parseInto( targetGraph, graphString.toString(), sessionFactory );
-	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java

@@ -516,8 +516,7 @@ private void applyNamedEntityGraphs(Collection<NamedEntityGraphDefinition> named
 							}
 						}
 						throw new IllegalArgumentException( "Cannot resolve entity name : " + jpaEntityName );
-					},
-					runtimeModelCreationContext
+					}
 			);
 			entityGraphMap.put( definition.getRegisteredName(), graph );
 		}