HHH-19466 demote operations dealing with EntityGraphs from JpaMetamodel to Implementor

because they're simply not needed there

Author: gavinking

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

@@ -641,9 +641,9 @@ public SqlStringGenerationContext getSqlStringGenerationContext() {
 		return sqlStringGenerationContext;
 	}
 
-	@Override @SuppressWarnings({"rawtypes","unchecked"})
+	@Override
 	public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityClass) {
-		return (List) getJpaMetamodel().findEntityGraphsByJavaType( entityClass );
+		return getJpaMetamodel().findEntityGraphsByJavaType( entityClass );
 	}
 
 	// todo : (5.2) review synchronizationType, persistenceContextType, transactionType usage

hibernate-core/src/main/java/org/hibernate/metamodel/internal/InjectionHelper.java

@@ -10,7 +10,6 @@
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
-import org.hibernate.metamodel.model.domain.JpaMetamodel;
 
 import java.lang.reflect.Field;
 
@@ -22,7 +21,7 @@ public class InjectionHelper {
 	public static void injectEntityGraph(
 			NamedEntityGraphDefinition definition,
 			Class<?> metamodelClass,
-			JpaMetamodel jpaMetamodel) {
+			JpaMetamodelImplementor jpaMetamodel) {
 		if ( metamodelClass != null ) {
 			try {
 				injectField(

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

@@ -4,11 +4,8 @@
  */
 package org.hibernate.metamodel.model.domain;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import jakarta.persistence.EntityGraph;
 
 import jakarta.persistence.metamodel.Metamodel;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -124,12 +121,4 @@ public interface JpaMetamodel extends Metamodel {
 	@Override
 	<X> EmbeddableDomainType<X> embeddable(Class<X> cls);
 
-	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Entity graphs
-
-	EntityGraph<?> findEntityGraphByName(String name);
-
-	<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

@@ -400,13 +400,13 @@ public RootGraphImplementor<?> findEntityGraphByName(String name) {
 	}
 
 	@Override
-	public <T> List<RootGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass) {
+	public <T> List<EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass) {
 		final EntityDomainType<T> entityType = entity( entityClass );
 		if ( entityType == null ) {
 			throw new IllegalArgumentException( "Given class is not an entity: " + entityClass.getName() );
 		}
 		else {
-			final List<RootGraph<? super T>> results = new ArrayList<>();
+			final List<EntityGraph<? super T>> results = new ArrayList<>();
 			for ( var entityGraph : entityGraphMap.values() ) {
 				if ( entityGraph.appliesTo( entityType ) ) {
 					@SuppressWarnings("unchecked") // safe, we just checked

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

@@ -68,7 +68,6 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import jakarta.persistence.EntityGraph;
 import jakarta.persistence.metamodel.EmbeddableType;
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.ManagedType;
@@ -566,21 +565,10 @@ public void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph) {
 		jpaMetamodel.addNamedEntityGraph( graphName, entityGraph );
 	}
 
-	@Override
-	public RootGraph<?> findEntityGraphByName(String name) {
+	private RootGraph<?> findEntityGraphByName(String name) {
 		return jpaMetamodel.findEntityGraphByName( name );
 	}
 
-	@Override
-	public <T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityType) {
-		return jpaMetamodel.getNamedEntityGraphs( entityType );
-	}
-
-	@Override
-	public <T> List<RootGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass) {
-		return jpaMetamodel.findEntityGraphsByJavaType( entityClass );
-	}
-
 	@Override
 	public RootGraph<?> findNamedGraph(String name) {
 		return findEntityGraphByName( name );

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

@@ -4,10 +4,14 @@
  */
 package org.hibernate.metamodel.model.domain.spi;
 
+import jakarta.persistence.EntityGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * SPI extending {@link JpaMetamodel}.
  *
@@ -16,6 +20,8 @@
 public interface JpaMetamodelImplementor extends JpaMetamodel {
 	MappingMetamodel getMappingMetamodel();
 
-	@Override
 	RootGraphImplementor<?> findEntityGraphByName(String name);
+
+	<T> List<EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass);
+	<T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityClass);
 }