Added query fetches search for join existence when applying JPA order…

…ing. Closes spring-projects#2253 See spring-projects#2253
AntonMolganov · Apr 14, 2022 · 1d1be82 · 1d1be82
1 parent 7cbfad9
commit 1d1be82
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
@@ -76,6 +76,7 @@
  * @author Greg Turnquist
  * @author Diego Krupitza
  * @author Jędrzej Biedrzycki
+ * @author Anton Molganov
  */
 public abstract class QueryUtils {
 
@@ -806,6 +807,16 @@ private static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String pro
 				return join;
 			}
 		}
+
+		for (Fetch<?, ?> fetch : from.getFetches()) {
+
+			Join<?, ?> join = (Join<?, ?>) fetch;
+			if (joinType == join.getJoinType()
+					&& join.getAttribute().getName().equals(attribute)) {
+				return join;
+			}
+		}
+
 		return from.join(attribute, joinType);
 	}