Lift restriction on empty JpaEntityGraph attributes

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.x-GH-3682-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.x-GH-3682-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.x-GH-3682-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.x-GH-3682-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.x-GH-3682-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.x-GH-3682-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java

@@ -129,7 +129,6 @@ private static EntityGraph<?> createDynamicEntityGraph(EntityManager em, JpaEnti
 		Assert.notNull(em, "EntityManager must not be null");
 		Assert.notNull(jpaEntityGraph, "JpaEntityGraph must not be null");
 		Assert.notNull(entityType, "Entity type must not be null");
-		Assert.isTrue(jpaEntityGraph.isAdHocEntityGraph(), "The given " + jpaEntityGraph + " is not dynamic");
 
 		EntityGraph<?> entityGraph = em.createEntityGraph(entityType);
 		configureFetchGraphFrom(jpaEntityGraph, entityGraph);

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaEntityGraph.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.EntityGraph;
@@ -29,12 +28,11 @@
  *
  * @author Thomas Darimont
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 1.6
  */
 public class JpaEntityGraph {
 
-	private static String[] EMPTY_ATTRIBUTE_PATHS = {};
-
 	private final String name;
 	private final EntityGraphType type;
 	private final List<String> attributePaths;
@@ -46,8 +44,8 @@ public class JpaEntityGraph {
 	 * @param nameFallback must not be {@literal null} or empty.
 	 */
 	public JpaEntityGraph(EntityGraph entityGraph, String nameFallback) {
-		this(StringUtils.hasText(entityGraph.value()) ? entityGraph.value() : nameFallback, entityGraph.type(), entityGraph
-				.attributePaths());
+		this(StringUtils.hasText(entityGraph.value()) ? entityGraph.value() : nameFallback, entityGraph.type(),
+				entityGraph.attributePaths());
 	}
 
 	/**
@@ -65,7 +63,7 @@ public JpaEntityGraph(String name, EntityGraphType type, @Nullable String[] attr
 
 		this.name = name;
 		this.type = type;
-		this.attributePaths = Arrays.asList(attributePaths == null ? EMPTY_ATTRIBUTE_PATHS : attributePaths);
+		this.attributePaths = attributePaths != null ? List.of(attributePaths) : List.of();
 	}
 
 	/**
@@ -99,9 +97,11 @@ public List<String> getAttributePaths() {
 	/**
 	 * Return {@literal true} if this {@link JpaEntityGraph} needs to be generated on-the-fly.
 	 *
-	 * @return
+	 * @return {@literal true} if {@link #attributePaths} is not empty.
 	 * @since 1.9
+	 * @deprecated since 3.5 as the used evaluation does not represent wether a {@link JpaEntityGraph} is dynamic or not.
 	 */
+	@Deprecated(since = "3.5", forRemoval = true)
 	public boolean isAdHocEntityGraph() {
 		return !attributePaths.isEmpty();
 	}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java

@@ -50,6 +50,7 @@
  * @author Mark Paluch
  * @author Jens Schauder
  * @author Krzysztof Krason
+ * @author Christoph Strobl
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:application-context.xml")
@@ -166,6 +167,15 @@ void errorsOnUnknownProperties() {
 				em.createEntityGraph(User.class)));
 	}
 
+	@Test // GH-3682
+	void allowsEmptyGraph() {
+
+		EntityGraph<User> graph = em.createEntityGraph(User.class);
+		Jpa21Utils.configureFetchGraphFrom(new JpaEntityGraph("User.NoNamedEntityGraphAvailable", EntityGraphType.FETCH, new String[0]), graph);
+
+		Assertions.assertThat(graph.getAttributeNodes()).isEmpty();
+	}
+
 	/**
 	 * Lookup the {@link AttributeNode} with given {@literal nodeName} in the root of the given {@literal graph}.
 	 */