HHH-19096 Add a setNamedEntityGraph shortcut to the selection query

Author: marko-bekhta

Diff for: hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java

@@ -293,13 +293,35 @@ default Stream<R> stream() {
 	 */
 	SelectionQuery<R> setEntityGraph(EntityGraph<? super R> graph, GraphSemantic semantic);
 
+	/**
+	 * Apply a {@linkplain jakarta.persistence.NamedEntityGraph named entity graph}
+	 * to the query.
+	 * <p>
+	 * May throw an {@link IllegalArgumentException} exception if no entity graph for a given name is found.
+	 *
+	 * @param graphName The name of the predefined named entity graph to apply
+	 * @param semantic The way an entity graph should be applied
+	 *
+	 * @since 7.0
+	 */
+	@Incubating
+	default SelectionQuery<R> setNamedEntityGraph(String graphName, GraphSemantic semantic) {
+		EntityGraph<? super R> namedEntityGraph = getNamedEntityGraph( graphName );
+		if ( namedEntityGraph == null ) {
+			throw new IllegalArgumentException( "No entity graph found for name " + graphName );
+		}
+		return setEntityGraph( namedEntityGraph, semantic );
+	}
+
 	/**
 	 * Obtain an immutable reference to a predefined
 	 * {@linkplain jakarta.persistence.NamedEntityGraph named entity graph}
 	 * or return {@code null} if there is no predefined graph with the given
 	 * name.
 	 *
 	 * @param graphName The name of the predefined named entity graph
+	 *
+	 * @since 7.0
 	 */
 	@Incubating
 	EntityGraph<? super R> getNamedEntityGraph(String graphName);

Diff for: hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewGraphTest.java

@@ -8,7 +8,6 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
-import org.hibernate.query.SelectionQuery;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -19,6 +18,7 @@
 import java.util.Set;
 
 import static jakarta.persistence.FetchType.LAZY;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hibernate.Hibernate.isInitialized;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -173,7 +173,7 @@ public class NewGraphTest {
 	}
 
 	@Test
-	void subTypeEntityGraph(SessionFactoryScope scope) {
+	void superTypeEntityGraph(SessionFactoryScope scope) {
 		scope.inTransaction( s -> {
 			A a = new A();
 			Aa aa = new Aa();
@@ -205,27 +205,29 @@ void subTypeEntityGraph(SessionFactoryScope scope) {
 						.getSingleResult() );
 		assertFalse( isInitialized( a.bs ) );
 
-		List<Aa> as = scope.fromSession( s -> {
-			SelectionQuery<Aa> query = s.createSelectionQuery( "from Aa", Aa.class );
-			return query
-					.setEntityGraph( query.getNamedEntityGraph( "a-graph" ), GraphSemantic.FETCH )
-					.getResultList();
-		} );
+		List<Aa> as = scope.fromSession( s -> s.createSelectionQuery( "from Aa", Aa.class )
+				.setNamedEntityGraph( "a-graph", GraphSemantic.FETCH )
+				.getResultList() );
 		for ( Aa el : as ) {
 			assertTrue( isInitialized( el.bs ) );
 			assertFalse( isInitialized( el.bss ) );
 		}
 
-		as = scope.fromSession( s -> {
-			SelectionQuery<Aa> query = s.createSelectionQuery( "from Aa", Aa.class );
-			return query
-					.setEntityGraph( query.getNamedEntityGraph( "aa-graph" ), GraphSemantic.FETCH )
-					.getResultList();
-		} );
+		as = scope.fromSession( s -> s.createSelectionQuery( "from Aa", Aa.class )
+				.setNamedEntityGraph( "aa-graph", GraphSemantic.FETCH )
+				.getResultList() );
 		for ( Aa el : as ) {
 			assertTrue( isInitialized( el.bs ) );
 			assertTrue( isInitialized( el.bss ) );
 		}
+
+		scope.inSession( s -> {
+			assertThatThrownBy( () -> s.createSelectionQuery( "from Aa", Aa.class )
+					.setNamedEntityGraph( "i-do-not-exist-graph", GraphSemantic.FETCH )
+					.getResultList() )
+					.isInstanceOf( IllegalArgumentException.class );
+		} );
+
 	}
 
 	@Entity(name = "E")
@@ -273,8 +275,6 @@ static class A {
 	@NamedEntityGraph(name = "aa-graph", attributeNodes = {@NamedAttributeNode("bs"), @NamedAttributeNode("bss"),})
 	@Entity(name = "Aa")
 	static class Aa extends A {
-		@Id @GeneratedValue
-		Long id;
 
 		@OneToMany(mappedBy = "aa")
 		Set<B> bss;