From 1d1be8285c532dbd53c3cb7db2785abe17749cc9 Mon Sep 17 00:00:00 2001
From: Anton Molganov <anton.molganov@gmail.com>
Date: Wed, 9 Feb 2022 00:41:00 +0500
Subject: [PATCH] Added query fetches search for join existence when applying
 JPA ordering.

Closes #2253
See https://github.com/spring-projects/spring-data-jpa/issues/2253
---
 .../data/jpa/repository/query/QueryUtils.java         | 11 +++++++++++
 1 file changed, 11 insertions(+)

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
index eba4466bb7..3670c2f1f0 100644
--- 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);
 	}