Fix count query creation for simple select.

Closes: #3324
Original Pull Request: #3325

Author: pranav-hsg

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

@@ -81,6 +81,7 @@
  * @author Vladislav Yukharin
  * @author Chris Fraser
  * @author Donghun Shin
+ * @author Pranav HS
  */
 public abstract class QueryUtils {
 
@@ -156,7 +157,7 @@ public abstract class QueryUtils {
 		builder.append("\\s*");
 		builder.append("(select\\s+((distinct)?((?s).+?)?)\\s+)?(from\\s+");
 		builder.append(IDENTIFIER);
-		builder.append("(?:\\s+as)?\\s+)");
+		builder.append("(?:\\s+as)?\\s*)");
 		builder.append(IDENTIFIER_GROUP);
 		builder.append("(.*)");
 

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

@@ -49,6 +49,7 @@
  * @author Chris Fraser
  * @author Michał Pachucki
  * @author Erik Pellizzon
+ * @author Pranav HS
  */
 class QueryUtilsUnitTests {
 
@@ -934,4 +935,10 @@ select q.specialist_id, listagg(q.points, '%s') as points
 				where name like :name
 				""", arg))).containsExactly("points");
 	}
+
+	@Test // GH-3324
+	void createCountQueryForSimpleQuery(){
+		String originalQuery = "select * from User";
+		assertCountQuery(originalQuery,"select count(*) from User");
+	}
 }