Refactoring.

See #3622
Original pull request: #3527

Author: christophstrobl

spring-data-jpa/src/jmh/java/org/springframework/data/jpa/repository/query/HqlParserBenchmarks.java

@@ -55,7 +55,7 @@ OR TREAT(p AS SmallProject).name LIKE 'Persist%'
 					    OR p.description LIKE "cost overrun"
 					""";
 
-			query = DeclaredQuery.ofJpql(s);
+			query = DeclaredQuery.jpqlQuery(s);
 			enhancer = QueryEnhancerFactory.forQuery(query).create(query);
 		}
 	}

spring-data-jpa/src/jmh/java/org/springframework/data/jpa/repository/query/JSqlParserQueryEnhancerBenchmarks.java

@@ -56,7 +56,7 @@ public void doSetup() throws IOException {
 					select SOME_COLUMN from SOME_OTHER_TABLE where REPORTING_DATE = :REPORTING_DATE
 					union select SOME_COLUMN from SOME_OTHER_OTHER_TABLE""";
 
-			enhancer = new JSqlParserQueryEnhancer(DeclaredQuery.ofNative(s));
+			enhancer = new JSqlParserQueryEnhancer(DeclaredQuery.nativeQuery(s));
 		}
 	}
 

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.query;
+
+import java.util.Collections;
+import java.util.List;
+
+
+/**
+ * @author Christoph Strobl
+ */
+final class BindableQuery implements DeclaredQuery {
+
+    private final DeclaredQuery source;
+    private final String bindableQueryString;
+    private final List<ParameterBinding> bindings;
+    private final boolean usesJdbcStyleParameters;
+
+    public BindableQuery(DeclaredQuery source, String bindableQueryString, List<ParameterBinding> bindings, boolean usesJdbcStyleParameters) {
+        this.source = source;
+        this.bindableQueryString = bindableQueryString;
+        this.bindings = bindings;
+        this.usesJdbcStyleParameters = usesJdbcStyleParameters;
+    }
+
+    @Override
+    public boolean isNativeQuery() {
+        return source.isNativeQuery();
+    }
+
+    boolean hasBindings() {
+        return !bindings.isEmpty();
+    }
+
+    boolean usesJdbcStyleParameters() {
+        return usesJdbcStyleParameters;
+    }
+
+    @Override
+    public String getQueryString() {
+        return bindableQueryString;
+    }
+
+    public BindableQuery unifyBindings(BindableQuery comparisonQuery) {
+        if (comparisonQuery.hasBindings() && !comparisonQuery.bindings.equals(this.bindings)) {
+            return new BindableQuery(source, bindableQueryString, comparisonQuery.bindings, usesJdbcStyleParameters);
+        }
+        return this;
+    }
+
+    public List<ParameterBinding> getBindings() {
+        return Collections.unmodifiableList(bindings);
+    }
+}

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

@@ -23,33 +23,28 @@
  * @author Mark Paluch
  * @since 2.0.3
  */
-public interface DeclaredQuery {
+public interface DeclaredQuery extends StructuredQuery {
 
 	/**
 	 * Creates a DeclaredQuery for a JPQL query.
 	 *
-	 * @param query the JPQL query string.
-	 * @return
+	 * @param jpql the JPQL query string.
+	 * @return new instance of {@link DeclaredQuery}.
 	 */
-	static DeclaredQuery ofJpql(String query) {
-		return new DefaultDeclaredQuery(query, false);
+	static DeclaredQuery jpqlQuery(String jpql) {
+		return new JpqlQuery(jpql);
 	}
 
 	/**
 	 * Creates a DeclaredQuery for a native query.
 	 *
-	 * @param query the native query string.
-	 * @return
+	 * @param sql the native query string.
+	 * @return new instance of {@link DeclaredQuery}.
 	 */
-	static DeclaredQuery ofNative(String query) {
-		return new DefaultDeclaredQuery(query, true);
+	static DeclaredQuery nativeQuery(String sql) {
+		return new NativeQuery(sql);
 	}
 
-	/**
-	 * Returns the query string.
-	 */
-	String getQueryString();
-
 	/**
 	 * Return whether the query is a native query of not.
 	 *

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

@@ -29,13 +29,13 @@
  */
 public class DefaultQueryEnhancer implements QueryEnhancer {
 
-	private final DeclaredQuery query;
+	private final StructuredQuery query;
 	private final boolean hasConstructorExpression;
 	private final @Nullable  String alias;
 	private final String projection;
 	private final Set<String> joinAliases;
 
-	public DefaultQueryEnhancer(DeclaredQuery query) {
+	public DefaultQueryEnhancer(StructuredQuery query) {
 		this.query = query;
 		this.hasConstructorExpression = QueryUtils.hasConstructorExpression(query.getQueryString());
 		this.alias = QueryUtils.detectAlias(query.getQueryString());
@@ -60,7 +60,9 @@ public String rewrite(QueryRewriteInformation rewriteInformation) {
 
 	@Override
 	public String createCountQueryFor(@Nullable String countProjection) {
-		return QueryUtils.createCountQueryFor(this.query.getQueryString(), countProjection, this.query.isNativeQuery());
+
+		boolean nativeQuery = this.query instanceof DeclaredQuery dc ? dc.isNativeQuery() : true;
+		return QueryUtils.createCountQueryFor(this.query.getQueryString(), countProjection, nativeQuery);
 	}
 
 	@Override
@@ -84,7 +86,7 @@ public Set<String> getJoinAliases() {
 	}
 
 	@Override
-	public DeclaredQuery getQuery() {
+	public StructuredQuery getQuery() {
 		return this.query;
 	}
 }

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

@@ -63,6 +63,11 @@ public boolean isDefaultProjection() {
 		return false;
 	}
 
+	@Override
+	public String getQueryString() {
+		return "";
+	}
+
 	@Override
 	public List<ParameterBinding> getParameterBindings() {
 		return Collections.emptyList();
@@ -82,4 +87,9 @@ public String applySorting(Sort sort) {
 	public boolean usesJdbcStyleParameters() {
 		return false;
 	}
+
+	@Override
+	public DeclaredQuery getDeclaredQuery() {
+		return DeclaredQuery.nativeQuery("");
+	}
 }

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

@@ -24,7 +24,13 @@
  * @author Diego Krupitza
  * @since 2.0.3
  */
-interface IntrospectedQuery extends DeclaredQuery {
+interface IntrospectedQuery extends StructuredQuery {
+
+	DeclaredQuery getDeclaredQuery();
+
+	default String getQueryString() {
+		return getDeclaredQuery().getQueryString();
+	}
 
 	/**
 	 * @return whether the underlying query has at least one named parameter.

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

@@ -70,7 +70,7 @@
  */
 public class JSqlParserQueryEnhancer implements QueryEnhancer {
 
-	private final DeclaredQuery query;
+	private final StructuredQuery query;
 	private final Statement statement;
 	private final ParsedType parsedType;
 	private final boolean hasConstructorExpression;
@@ -83,7 +83,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 	/**
 	 * @param query the query we want to enhance. Must not be {@literal null}.
 	 */
-	public JSqlParserQueryEnhancer(DeclaredQuery query) {
+	public JSqlParserQueryEnhancer(StructuredQuery query) {
 
 		this.query = query;
 		this.statement = parseStatement(query.getQueryString(), Statement.class);
@@ -295,7 +295,7 @@ public Set<String> getSelectionAliases() {
 	}
 
 	@Override
-	public DeclaredQuery getQuery() {
+	public StructuredQuery getQuery() {
 		return this.query;
 	}
 
@@ -373,8 +373,8 @@ public String createCountQueryFor(@Nullable String countProjection) {
 		return createCountQueryFor(selectBody, countProjection, primaryAlias);
 	}
 
-	private static String createCountQueryFor(PlainSelect selectBody, @Nullable String countProjection,
-			@Nullable String primaryAlias) {
+	private static String createCountQueryFor(StructuredQuery query, PlainSelect selectBody,
+			@Nullable String countProjection, @Nullable String primaryAlias) {
 
 		// remove order by
 		selectBody.setOrderByElements(null);

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.query;
+
+/**
+ * @author Christoph Strobl
+ */
+final class JpqlQuery implements DeclaredQuery {
+
+    private final String jpql;
+
+    JpqlQuery(String jpql) {
+        this.jpql = jpql;
+    }
+
+    @Override
+    public boolean isNativeQuery() {
+        return false;
+    }
+
+    @Override
+    public String getQueryString() {
+        return jpql;
+    }
+}

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

@@ -185,16 +185,11 @@ protected TypedQuery<Long> doCreateCountQuery(JpaParametersParameterAccessor acc
 		EntityManager em = getEntityManager();
 		TypedQuery<Long> countQuery;
 
-		String cacheKey;
 		if (namedCountQueryIsPresent) {
-			cacheKey = countQueryName;
 			countQuery = em.createNamedQuery(countQueryName, Long.class);
-
 		} else {
 
 			String countQueryString = entityQuery.get().deriveCountQuery(countProjection).getQueryString();
-			countQueryString = potentiallyRewriteQuery(countQueryString, accessor.getSort(), accessor.getPageable());
-			cacheKey = countQueryString;
 			countQuery = em.createQuery(countQueryString, Long.class);
 		}