Polishing.

Introduce refined names: EntityQuery, TemplatedQuery, ParametrizedQuery, QueryProvider. Return QueryProvider where possible. Introduce rewrite as concept on DeclaredQuery to retain its nature and track the origin of the query rewriting.

Move methods solely used in tests to TestEntityQuery.

Author: mp911de

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

@@ -78,12 +78,12 @@ public AbstractStringBasedJpaQuery(JpaQueryMethod method, EntityManager em, Stri
 		this.valueExpressionDelegate = queryConfiguration.getValueExpressionDelegate();
 		this.valueExpressionContextProvider = valueExpressionDelegate.createValueContextProvider(method.getParameters());
 
-		this.query = ExpressionQuery.create(queryString, method, queryConfiguration);
+		this.query = TemplatedQuery.create(queryString, method, queryConfiguration);
 
 		this.countQuery = Lazy.of(() -> {
 
 			if (StringUtils.hasText(countQueryString)) {
-				return ExpressionQuery.create(countQueryString, method, queryConfiguration);
+				return TemplatedQuery.create(countQueryString, method, queryConfiguration);
 			}
 
 			return this.query.deriveCountQuery(method.getCountQueryProjection());

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

@@ -28,7 +28,7 @@
  * @since 4.0
  * @see EntityQuery
  * @see EntityQuery#create(DeclaredQuery, QueryEnhancerSelector)
- * @see ExpressionQuery#create(String, JpaQueryMethod, JpaQueryConfiguration)
+ * @see TemplatedQuery#create(String, JpaQueryMethod, JpaQueryConfiguration)
  */
 interface StructuredQuery extends QueryProvider {
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ExpressionQuery.java renamed to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/TemplatedQuery.java

@@ -27,7 +27,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Extension of {@link DefaultEntityQuery} that evaluates the given query string as a SpEL template-expression.
+ * Factory methods to obtain {@link EntityQuery} from a declared query using SpEL template-expressions.
  * <p>
  * Currently, the following template variables are available:
  * <ol>
@@ -41,7 +41,7 @@
  * @author Diego Krupitza
  * @author Greg Turnquist
  */
-class ExpressionQuery {
+class TemplatedQuery {
 
 	private static final String EXPRESSION_PARAMETER = "$1#{";
 	private static final String QUOTED_EXPRESSION_PARAMETER = "$1__HASH__{";

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

@@ -82,7 +82,7 @@ void setOperationListWorks() {
 				+ "except \n" //
 				+ "select SOME_COLUMN from SOME_OTHER_TABLE where REPORTING_DATE = :REPORTING_DATE";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancer.create(query);
 
 		assertThat(query.getAlias()).isNullOrEmpty();
@@ -105,7 +105,7 @@ void complexSetOperationListWorks() {
 				+ "select SOME_COLUMN from SOME_OTHER_TABLE where REPORTING_DATE = :REPORTING_DATE \n" //
 				+ "union select SOME_COLUMN from SOME_OTHER_OTHER_TABLE";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isNullOrEmpty();
@@ -132,7 +132,7 @@ void deeplyNestedcomplexSetOperationListWorks() {
 				+ "\tselect CustomerID  from customers where country = 'Germany'\n"//
 				+ "\t;";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isNullOrEmpty();
@@ -152,7 +152,7 @@ void valuesStatementsWorks() {
 
 		String setQuery = "VALUES (1, 2, 'test')";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isNullOrEmpty();
@@ -173,7 +173,7 @@ void withStatementsWorks() {
 		String setQuery = "with sample_data(day, value) as (values ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))) \n"
 				+ "select day, value from sample_data as a";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isEqualToIgnoringCase("a");
@@ -196,7 +196,7 @@ void multipleWithStatementsWorks() {
 		String setQuery = "with sample_data(day, value) as (values ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))), test2 as (values (1,2,3)) \n"
 				+ "select day, value from sample_data as a";
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(setQuery, true);
+		DefaultEntityQuery query = new TestEntityQuery(setQuery, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isEqualToIgnoringCase("a");
@@ -216,7 +216,7 @@ void multipleWithStatementsWorks() {
 	@Test // GH-3038
 	void truncateStatementShouldWork() {
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery("TRUNCATE TABLE foo", true);
+		DefaultEntityQuery query = new TestEntityQuery("TRUNCATE TABLE foo", true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(query.getAlias()).isNull();
@@ -234,7 +234,7 @@ void truncateStatementShouldWork() {
 	@MethodSource("mergeStatementWorksSource")
 	void mergeStatementWorksWithJSqlParser(String queryString, String alias) {
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery(queryString, true);
+		DefaultEntityQuery query = new TestEntityQuery(queryString, true);
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 
 		assertThat(queryEnhancer.detectAlias()).isEqualTo(alias);

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

@@ -67,7 +67,7 @@ void identificationOfParameters() {
 
 	private void checkHasParameter(SoftAssertions softly, String query, boolean containsParameter, String label) {
 
-		DefaultEntityQuery stringQuery = new TestDefaultEntityQuery(query, false);
+		DefaultEntityQuery stringQuery = new TestEntityQuery(query, false);
 
 		softly.assertThat(stringQuery.getParameterBindings().size()) //
 				.describedAs(String.format("<%s> (%s)", query, label)) //

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

@@ -32,7 +32,7 @@ class QueryEnhancerFactoryUnitTests {
 	@Test
 	void createsParsingImplementationForNonNativeQuery() {
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery("select new com.example.User(u.firstname) from User u",
+		DefaultEntityQuery query = new TestEntityQuery("select new com.example.User(u.firstname) from User u",
 				false);
 
 		QueryEnhancer queryEnhancer = QueryEnhancer.create(query);
@@ -48,7 +48,7 @@ void createsParsingImplementationForNonNativeQuery() {
 	@Test
 	void createsJSqlImplementationForNativeQuery() {
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery("select * from User", true);
+		DefaultEntityQuery query = new TestEntityQuery("select * from User", true);
 
 		QueryEnhancer queryEnhancer = QueryEnhancerFactory.forQuery(query).create(query);
 

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

@@ -203,7 +203,7 @@ static Stream<Arguments> nativeQueriesWithVariables() {
 	// DATAJPA-1696
 	void findProjectionClauseWithIncludedFrom() {
 
-		DefaultEntityQuery query = new TestDefaultEntityQuery("select x, frommage, y from t", true);
+		DefaultEntityQuery query = new TestEntityQuery("select x, frommage, y from t", true);
 
 		assertThat(createQueryEnhancer(query).getProjection()).isEqualTo("x, frommage, y");
 	}