XxxxLoadAccess APIs should accept EntityGraph, not only RootGraph

gavinking · gavinking · commit 27c0e8bd866e · 2025-04-22T12:49:21.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java
@@ -6,8 +6,9 @@
 
 import java.util.Optional;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 
 /**
  * Loads an entity by its primary identifier.
@@ -76,7 +77,7 @@ public interface IdentifierLoadAccess<T> {
 	 *
 	 * @since 6.3
 	 */
-	default IdentifierLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
+	default IdentifierLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.FETCH );
 	}
 
@@ -87,15 +88,15 @@ default IdentifierLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	default IdentifierLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	default IdentifierLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
 	/**
 	 * @deprecated use {@link #withLoadGraph}
 	 */
 	@Deprecated(since = "6.3")
-	default IdentifierLoadAccess<T> with(RootGraph<T> graph) {
+	default IdentifierLoadAccess<T> with(EntityGraph<T> graph) {
 		return withLoadGraph( graph );
 	}
 
@@ -104,7 +105,7 @@ default IdentifierLoadAccess<T> with(RootGraph<T> graph) {
 	 * {@linkplain jakarta.persistence.EntityGraph entity graph},
 	 * and how it should be {@linkplain GraphSemantic interpreted}.
 	 */
-	IdentifierLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);
+	IdentifierLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);
 
 	/**
 	 * Customize the associations fetched by specifying a
diff --git a/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java
@@ -6,8 +6,9 @@
 
 import java.util.List;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 
 /**
  * Loads multiple instances of a given entity type at once, by
@@ -65,7 +66,7 @@ public interface MultiIdentifierLoadAccess<T> {
 	 *
 	 * @since 6.3
 	 */
-	default MultiIdentifierLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
+	default MultiIdentifierLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.FETCH );
 	}
 
@@ -76,15 +77,15 @@ default MultiIdentifierLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	default MultiIdentifierLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	default MultiIdentifierLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
 	/**
 	 * @deprecated use {@link #withLoadGraph}
 	 */
 	@Deprecated(since = "6.3")
-	default MultiIdentifierLoadAccess<T> with(RootGraph<T> graph) {
+	default MultiIdentifierLoadAccess<T> with(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
@@ -93,7 +94,7 @@ default MultiIdentifierLoadAccess<T> with(RootGraph<T> graph) {
 	 * {@linkplain jakarta.persistence.EntityGraph entity graph},
 	 * and how it should be {@linkplain GraphSemantic interpreted}.
 	 */
-	MultiIdentifierLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);
+	MultiIdentifierLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);
 
 	/**
 	 * Customize the associations fetched by specifying a
diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java
@@ -4,9 +4,10 @@
  */
 package org.hibernate;
 
+import jakarta.persistence.EntityGraph;
+
 import jakarta.persistence.metamodel.SingularAttribute;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 
 import java.util.Map;
 import java.util.Optional;
@@ -51,7 +52,7 @@ public interface NaturalIdLoadAccess<T> {
 	 *
 	 * @since 6.3
 	 */
-	default NaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
+	default NaturalIdLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.FETCH );
 	}
 
@@ -62,7 +63,7 @@ default NaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	default NaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	default NaturalIdLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
@@ -73,7 +74,7 @@ default NaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	NaturalIdLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);
+	NaturalIdLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);
 
 	/**
 	 * Customize the associations fetched by specifying a
diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java
@@ -4,8 +4,9 @@
  */
 package org.hibernate;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 
 import java.util.List;
 
@@ -61,7 +62,7 @@ public interface NaturalIdMultiLoadAccess<T> {
 	 *
 	 * @since 6.3
 	 */
-	default NaturalIdMultiLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
+	default NaturalIdMultiLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.FETCH );
 	}
 
@@ -72,15 +73,15 @@ default NaturalIdMultiLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	default NaturalIdMultiLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	default NaturalIdMultiLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
 	/**
 	 * @deprecated use {@link #withLoadGraph}
 	 */
 	@Deprecated(since = "6.3")
-	default NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph) {
+	default NaturalIdMultiLoadAccess<T> with(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
@@ -89,7 +90,7 @@ default NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph) {
 	 * {@linkplain jakarta.persistence.EntityGraph entity graph},
 	 * and how it should be {@linkplain GraphSemantic interpreted}.
 	 */
-	NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);
+	NaturalIdMultiLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);
 
 	/**
 	 * Specify a batch size, that is, how many entities should be
diff --git a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
@@ -4,8 +4,9 @@
  */
 package org.hibernate;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 
 import java.util.Optional;
 
@@ -45,7 +46,7 @@ public interface SimpleNaturalIdLoadAccess<T> {
 	 *
 	 * @since 6.3
 	 */
-	default SimpleNaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
+	default SimpleNaturalIdLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.FETCH );
 	}
 
@@ -56,7 +57,7 @@ default SimpleNaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	default SimpleNaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	default SimpleNaturalIdLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}
 
@@ -67,7 +68,7 @@ default SimpleNaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
 	 *
 	 * @since 6.3
 	 */
-	SimpleNaturalIdLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);
+	SimpleNaturalIdLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);
 
 	/**
 	 * Customize the associations fetched by specifying a
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
@@ -9,6 +9,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.CacheMode;
 import org.hibernate.LockOptions;
 import org.hibernate.MultiIdentifierLoadAccess;
@@ -18,7 +20,6 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
@@ -76,7 +77,7 @@ public MultiIdentifierLoadAccess<T> withReadOnly(boolean readOnly) {
 	}
 
 	@Override
-	public MultiIdentifierLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
+	public MultiIdentifierLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic) {
 		this.rootGraph = (RootGraphImplementor<T>) graph;
 		this.graphSemantic = semantic;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
@@ -6,14 +6,15 @@
 
 import java.util.List;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.CacheMode;
 import org.hibernate.LockOptions;
 import org.hibernate.NaturalIdMultiLoadAccess;
 import org.hibernate.engine.spi.EffectiveEntityGraph;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.loader.ast.spi.MultiNaturalIdLoadOptions;
 import org.hibernate.persister.entity.EntityPersister;
@@ -55,7 +56,7 @@ public NaturalIdMultiLoadAccess<T> with(CacheMode cacheMode) {
 	}
 
 	@Override
-	public NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
+	public NaturalIdMultiLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic) {
 		this.rootGraph = (RootGraphImplementor<T>) graph;
 		this.graphSemantic = semantic;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
@@ -7,6 +7,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.HibernateException;
 import org.hibernate.IdentifierLoadAccess;
 import org.hibernate.LockOptions;
@@ -18,7 +20,6 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.loader.LoaderLogging;
 import org.hibernate.loader.ast.spi.NaturalIdLoadOptions;
@@ -63,7 +64,7 @@ public LockOptions getLockOptions() {
 		return lockOptions;
 	}
 
-	public Object with(RootGraph<T> graph, GraphSemantic semantic) {
+	public Object with(EntityGraph<T> graph, GraphSemantic semantic) {
 		this.rootGraph = (RootGraphImplementor<T>) graph;
 		this.graphSemantic = semantic;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
@@ -9,6 +9,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.CacheMode;
 import org.hibernate.IdentifierLoadAccess;
 import org.hibernate.LockOptions;
@@ -23,7 +25,6 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.event.spi.LoadEventListener;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.persister.entity.EntityPersister;
@@ -75,7 +76,7 @@ public IdentifierLoadAccess<T> withReadOnly(boolean readOnly) {
 	}
 
 	@Override
-	public IdentifierLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
+	public IdentifierLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic) {
 		this.rootGraph = (RootGraphImplementor<T>) graph;
 		this.graphSemantic = semantic;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java
@@ -8,11 +8,12 @@
 import java.util.Map;
 import java.util.Optional;
 
+import jakarta.persistence.EntityGraph;
 import jakarta.persistence.metamodel.SingularAttribute;
+
 import org.hibernate.LockOptions;
 import org.hibernate.NaturalIdLoadAccess;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 
 /**
@@ -70,7 +71,7 @@ public Optional<T> loadOptional() {
 	}
 
 	@Override
-	public NaturalIdLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
+	public NaturalIdLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic) {
 		super.with( graph, semantic );
 		return this;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
@@ -9,11 +9,12 @@
 import java.util.Map;
 import java.util.Optional;
 
+import jakarta.persistence.EntityGraph;
+
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
 import org.hibernate.SimpleNaturalIdLoadAccess;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.loader.LoaderLogging;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
@@ -105,13 +106,13 @@ public Optional<T> loadOptional(Object naturalIdValue) {
 	}
 
 	@Override
-	public SimpleNaturalIdLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
+	public SimpleNaturalIdLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic) {
 		super.with( graph, semantic );
 		return this;
 	}
 
 	@Override
-	public SimpleNaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
+	public SimpleNaturalIdLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {
 		return SimpleNaturalIdLoadAccess.super.withLoadGraph(graph);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`*/`
`5`	`5`	`package org.hibernate;`
`6`	`6`
	`7`	`+import jakarta.persistence.EntityGraph;`
	`8`	`+`
`7`	`9`	`import org.hibernate.graph.GraphSemantic;`
`8`		`-import org.hibernate.graph.RootGraph;`
`9`	`10`
`10`	`11`	`import java.util.Optional;`
`11`	`12`
`@@ -45,7 +46,7 @@ public interface SimpleNaturalIdLoadAccess<T> {`
`45`	`46`	`*`
`46`	`47`	`* @since 6.3`
`47`	`48`	`*/`
`48`		`- default SimpleNaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {`
	`49`	`+ default SimpleNaturalIdLoadAccess<T> withFetchGraph(EntityGraph<T> graph) {`
`49`	`50`	`return with( graph, GraphSemantic.FETCH );`
`50`	`51`	`}`
`51`	`52`
`@@ -56,7 +57,7 @@ default SimpleNaturalIdLoadAccess<T> withFetchGraph(RootGraph<T> graph) {`
`56`	`57`	`*`
`57`	`58`	`* @since 6.3`
`58`	`59`	`*/`
`59`		`- default SimpleNaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {`
	`60`	`+ default SimpleNaturalIdLoadAccess<T> withLoadGraph(EntityGraph<T> graph) {`
`60`	`61`	`return with( graph, GraphSemantic.LOAD );`
`61`	`62`	`}`
`62`	`63`
`@@ -67,7 +68,7 @@ default SimpleNaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {`
`67`	`68`	`*`
`68`	`69`	`* @since 6.3`
`69`	`70`	`*/`
`70`		`- SimpleNaturalIdLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic);`
	`71`	`+ SimpleNaturalIdLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic semantic);`
`71`	`72`
`72`	`73`	`/**`
`73`	`74`	`* Customize the associations fetched by specifying a`