consistently use EntityGraph instead of RootGraph in (incubating) JpaMetamodel SPI

Author: gavinking

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

@@ -14,7 +14,7 @@
  * <p>
  * Encapsulates a {@link JavaType} describing the more rudimentary aspects
  * of the Java type. The {@code DomainType} is a higher-level construct
- * incorporating information such as bean properties, constructors, etc.
+ * incorporating information such as bean properties, constructors, and so on.
  *
  * @implNote The actual JPA type system is more akin to {@link SimpleDomainType}.
  *           This contract represents a "higher level" abstraction, allowing

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

@@ -13,7 +13,6 @@
 import jakarta.persistence.metamodel.Metamodel;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -100,6 +99,9 @@ public interface JpaMetamodel extends Metamodel {
 
 	String qualifyImportableName(String queryName);
 
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Enumerations and Java constants (useful for interpreting HQL)
+
 	@Nullable Set<String> getEnumTypesForValue(String enumValue);
 
 	EnumJavaType<?> getEnumType(String className);
@@ -122,15 +124,12 @@ public interface JpaMetamodel extends Metamodel {
 	@Override
 	<X> EmbeddableDomainType<X> embeddable(Class<X> cls);
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Entity graphs
 
-	void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph);
-
-	RootGraph<?> findEntityGraphByName(String name);
+	EntityGraph<?> findEntityGraphByName(String name);
 
-	<T> List<RootGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass);
+	<T> List<? extends EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass);
 
 	<T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityType);
 }

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

@@ -386,7 +386,6 @@ private Field getJavaField(String className, String fieldName) throws NoSuchFiel
 		return null;
 	}
 
-	@Override
 	public void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph) {
 		final RootGraphImplementor<?> rootGraph = (RootGraphImplementor<?>) entityGraph;
 		final EntityGraph<?> old = entityGraphMap.put( graphName, rootGraph.makeImmutableCopy( graphName ) );