Fix count query creation when order by clause contains newlines.

Closes: #3329
Original Pull Request: #3330

Author: edudar

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

@@ -82,6 +82,7 @@
  * @author Chris Fraser
  * @author Donghun Shin
  * @author Pranav HS
+ * @author Eduard Dudar
  */
 public abstract class QueryUtils {
 
@@ -102,7 +103,7 @@ public abstract class QueryUtils {
 	private static final String SIMPLE_COUNT_VALUE = "$2";
 	private static final String COMPLEX_COUNT_VALUE = "$3 $6";
 	private static final String COMPLEX_COUNT_LAST_VALUE = "$6";
-	private static final String ORDER_BY_PART = "(?iu)\\s+order\\s+by\\s+.*";
+	private static final Pattern ORDER_BY_PART = Pattern.compile("(?iu)\\s+order\\s+by\\s+.*", CASE_INSENSITIVE | DOTALL);
 
 	private static final Pattern ALIAS_MATCH;
 	private static final Pattern COUNT_MATCH;
@@ -634,7 +635,7 @@ static String createCountQueryFor(String originalQuery, @Nullable String countPr
 			countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, countProjection));
 		}
 
-		return countQuery.replaceFirst(ORDER_BY_PART, "");
+		return ORDER_BY_PART.matcher(countQuery).replaceFirst("");
 	}
 
 	/**

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

@@ -40,6 +40,7 @@
  * @author Grégoire Druant
  * @author Mohammad Hewedy
  * @author Greg Turnquist
+ * @author Eduard Dudar
  */
 class DefaultQueryUtilsUnitTests {
 
@@ -452,7 +453,15 @@ void createCountQuerySupportsWhitespaceCharacters() {
 		assertThat(createCountQueryFor("select * from User user\n" + //
 				"  where user.age = 18\n" + //
 				"  order by user.name\n ")).isEqualTo("select count(user) from User user\n" + //
-						"  where user.age = 18\n ");
+						"  where user.age = 18");
+	}
+
+	@Test // GH-3329
+	void createCountQuerySupportsNewLineCharacters() {
+		assertThat(createCountQueryFor("select * from User user\n" + //
+				"  where user.age = 18\n" + //
+				"  order by user.name,\n user.age DESC")).isEqualTo("select count(user) from User user\n" + //
+						"  where user.age = 18");
 	}
 
 	@Test
@@ -463,7 +472,7 @@ void createCountQuerySupportsLineBreaksInSelectClause() {
 				"  from User user\n" + //
 				"  where user.age = 18\n" + //
 				"  order\nby\nuser.name\n ")).isEqualTo("select count(user) from User user\n" + //
-						"  where user.age = 18\n ");
+						"  where user.age = 18");
 	}
 
 	@Test // DATAJPA-1061

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

@@ -50,6 +50,7 @@
  * @author Michał Pachucki
  * @author Erik Pellizzon
  * @author Pranav HS
+ * @author Eduard Dudar
  */
 class QueryUtilsUnitTests {
 
@@ -584,8 +585,19 @@ void createCountQuerySupportsWhitespaceCharacters() {
 				  order by user.name
 				\s""")).isEqualTo("""
 				select count(user) from User user
+				  where user.age = 18""");
+	}
+
+	@Test // GH-3329
+	void createCountQuerySupportsNewLineCharacters() {
+		assertThat(createCountQueryFor("""
+				select * from User user
 				  where user.age = 18
-				\s""");
+				  order by user.name,
+						   user.age DESC
+				\s""")).isEqualTo("""
+				select count(user) from User user
+				  where user.age = 18""");
 	}
 
 	@Test // GH-2341
@@ -606,8 +618,7 @@ void createCountQuerySupportsLineBreaksInSelectClause() {
 				user.name
 				\s""")).isEqualTo("""
 				select count(user) from User user
-				  where user.age = 18
-				\s""");
+				  where user.age = 18""");
 	}
 
 	@Test // DATAJPA-1061