Rename QueryString to StructuredQuery & remove interface sealing

Author: christophstrobl

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

@@ -23,7 +23,7 @@
  * @author Mark Paluch
  * @since 2.0.3
  */
-public sealed interface DeclaredQuery extends QueryString permits JpqlQuery, NativeQuery, BindableQuery {
+public interface DeclaredQuery extends StructuredQuery {
 
 	/**
 	 * Creates a DeclaredQuery for a JPQL query.

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

@@ -29,13 +29,13 @@
  */
 public class DefaultQueryEnhancer implements QueryEnhancer {
 
-	private final QueryString 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(QueryString query) {
+	public DefaultQueryEnhancer(StructuredQuery query) {
 		this.query = query;
 		this.hasConstructorExpression = QueryUtils.hasConstructorExpression(query.getQueryString());
 		this.alias = QueryUtils.detectAlias(query.getQueryString());
@@ -86,7 +86,7 @@ public Set<String> getJoinAliases() {
 	}
 
 	@Override
-	public QueryString getQuery() {
+	public StructuredQuery getQuery() {
 		return this.query;
 	}
 }

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

@@ -24,7 +24,7 @@
  * @author Diego Krupitza
  * @since 2.0.3
  */
-interface IntrospectedQuery extends QueryString {
+interface IntrospectedQuery extends StructuredQuery {
 
 	DeclaredQuery getDeclaredQuery();
 

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

@@ -70,7 +70,7 @@
  */
 public class JSqlParserQueryEnhancer implements QueryEnhancer {
 
-	private final QueryString 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(QueryString 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 QueryString getQuery() {
+	public StructuredQuery getQuery() {
 		return this.query;
 	}
 
@@ -373,7 +373,7 @@ public String createCountQueryFor(@Nullable String countProjection) {
 		return createCountQueryFor(selectBody, countProjection, primaryAlias);
 	}
 
-	private static String createCountQueryFor(QueryString query, PlainSelect selectBody,
+	private static String createCountQueryFor(StructuredQuery query, PlainSelect selectBody,
 			@Nullable String countProjection, @Nullable String primaryAlias) {
 
 		// remove order by

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

@@ -66,7 +66,7 @@ public interface QueryEnhancer {
 	 *
 	 * @return non-null {@link DeclaredQuery} that wraps the query.
 	 */
-	QueryString getQuery();
+	StructuredQuery getQuery();
 
 	/**
 	 * Adds {@literal order by} clause to the JPQL query. Uses the first alias to bind the sorting property to.

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

@@ -57,7 +57,7 @@ public boolean supports(DeclaredQuery query) {
 			}
 
 			@Override
-			public QueryEnhancer create(QueryString query) {
+			public QueryEnhancer create(StructuredQuery query) {
 				return new DefaultQueryEnhancer(query);
 			}
 		},
@@ -69,7 +69,7 @@ public boolean supports(DeclaredQuery query) {
 			}
 
 			@Override
-			public QueryEnhancer create(QueryString query) {
+			public QueryEnhancer create(StructuredQuery query) {
 				if (jSqlParserPresent) {
 					return new JSqlParserQueryEnhancer(query);
 				}
@@ -85,7 +85,7 @@ public boolean supports(DeclaredQuery query) {
 			}
 
 			@Override
-			public QueryEnhancer create(QueryString query) {
+			public QueryEnhancer create(StructuredQuery query) {
 				return JpaQueryEnhancer.forHql(query.getQueryString());
 			}
 		},
@@ -96,7 +96,7 @@ public boolean supports(DeclaredQuery query) {
 			}
 
 			@Override
-			public QueryEnhancer create(QueryString query) {
+			public QueryEnhancer create(StructuredQuery query) {
 				return JpaQueryEnhancer.forEql(query.getQueryString());
 			}
 		},
@@ -107,7 +107,7 @@ public boolean supports(DeclaredQuery query) {
 			}
 
 			@Override
-			public QueryEnhancer create(QueryString query) {
+			public QueryEnhancer create(StructuredQuery query) {
 				return JpaQueryEnhancer.forJpql(query.getQueryString());
 			}
 		}

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

@@ -40,7 +40,7 @@ public interface QueryEnhancerFactory {
 	 * @param query the query to be enhanced and introspected.
 	 * @return
 	 */
-	QueryEnhancer create(QueryString query);
+	QueryEnhancer create(StructuredQuery query);
 
 	/**
 	 * Creates a new {@link QueryEnhancerFactory} for the given {@link DeclaredQuery}.

…ta/jpa/repository/query/QueryString.java …pa/repository/query/StructuredQuery.javaspring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryString.java renamed to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/StructuredQuery.java spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryString.java renamed to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/StructuredQuery.java

@@ -18,7 +18,7 @@
 /**
  * @author Christoph Strobl
  */
-public interface QueryString {
+public interface StructuredQuery {
 
     String getQueryString();
 }