Documentation

Author: mp911de

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

@@ -15,27 +15,17 @@
  */
 package org.springframework.data.jpa.repository;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-
-import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.DeleteSpecification;
 import org.springframework.data.jpa.domain.PredicateSpecification;
@@ -115,7 +105,6 @@ default List<T> findAll(PredicateSpecification<T> spec) {
 	 * Returns a {@link Page} of entities matching the given {@link Specification}.
 	 * <p>
 	 * Supports counting the total number of entities matching the {@link Specification}.
-	 * <p>
 	 *
 	 * @param spec can be {@literal null}, if no {@link Specification} is given all entities matching {@code <T>} will be
 	 *          selected.

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

@@ -94,4 +94,5 @@
 	 * Name of the {@link jakarta.persistence.SqlResultSetMapping @SqlResultSetMapping(name)} to apply for this query.
 	 */
 	String sqlResultSetMapping() default "";
+
 }

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

@@ -90,4 +90,5 @@
 	 * @since 3.0
 	 */
 	Class<? extends QueryRewriter> queryRewriter() default QueryRewriter.IdentityQueryRewriter.class;
+
 }

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

@@ -49,7 +49,7 @@
 abstract class AbstractStringBasedJpaQuery extends AbstractJpaQuery {
 
 	private final EntityQuery query;
-	private final Lazy<StructuredQuery> countQuery;
+	private final Lazy<ParametrizedQuery> countQuery;
 	private final ValueExpressionDelegate valueExpressionDelegate;
 	private final QueryRewriter queryRewriter;
 	private final QuerySortRewriter querySortRewriter;
@@ -151,7 +151,7 @@ protected ParameterBinder createBinder() {
 		return createBinder(query);
 	}
 
-	protected ParameterBinder createBinder(StructuredQuery query) {
+	protected ParameterBinder createBinder(ParametrizedQuery query) {
 		return ParameterBinderFactory.createQueryAwareBinder(getQueryMethod().getParameters(), query,
 				valueExpressionDelegate, valueExpressionContextProvider);
 	}
@@ -182,7 +182,7 @@ public EntityQuery getQuery() {
 	/**
 	 * @return the countQuery
 	 */
-	public StructuredQuery getCountQuery() {
+	public ParametrizedQuery getCountQuery() {
 		return countQuery.get();
 	}
 

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

@@ -22,7 +22,7 @@
 /**
  * Encapsulation of a JPA query string, typically returning entities or DTOs. Provides access to parameter bindings.
  * <p>
- * The internal {@link ParametrizedQuery query string} is cleaned from decorated parameters like {@literal %:lastname%}
+ * The internal {@link PreprocessedQuery query string} is cleaned from decorated parameters like {@literal %:lastname%}
  * and the matching bindings take care of applying the decorations in the {@link ParameterBinding#prepare(Object)}
  * method. Note that this class also handles replacing SpEL expressions with synthetic bind parameters.
  *
@@ -38,10 +38,10 @@
  */
 class DefaultEntityQuery implements EntityQuery, DeclaredQuery {
 
-	private final ParametrizedQuery query;
+	private final PreprocessedQuery query;
 	private final QueryEnhancer queryEnhancer;
 
-	DefaultEntityQuery(ParametrizedQuery query, QueryEnhancerFactory queryEnhancerFactory) {
+	DefaultEntityQuery(PreprocessedQuery query, QueryEnhancerFactory queryEnhancerFactory) {
 		this.query = query;
 		this.queryEnhancer = queryEnhancerFactory.create(query);
 	}
@@ -89,22 +89,23 @@ public boolean isDefaultProjection() {
 		return queryEnhancer.getProjection().equalsIgnoreCase(getAlias());
 	}
 
+	@Nullable
+	String getAlias() {
+		return queryEnhancer.detectAlias();
+	}
+
 	@Override
 	public boolean usesPaging() {
 		return query.containsPageableInSpel();
 	}
 
-	public @Nullable String getAlias() {
-		return queryEnhancer.detectAlias();
-	}
-
 	String getProjection() {
 		return this.queryEnhancer.getProjection();
 	}
 
 	@Override
-	public StructuredQuery deriveCountQuery(@Nullable String countQueryProjection) {
-		return new SimpleStructuredQuery(this.query.rewrite(queryEnhancer.createCountQueryFor(countQueryProjection)));
+	public ParametrizedQuery deriveCountQuery(@Nullable String countQueryProjection) {
+		return new SimpleParametrizedQuery(this.query.rewrite(queryEnhancer.createCountQueryFor(countQueryProjection)));
 	}
 
 	@Override
@@ -118,13 +119,13 @@ public String toString() {
 	}
 
 	/**
-	 * Simple {@link StructuredQuery} variant forwarding to {@link ParametrizedQuery}.
+	 * Simple {@link ParametrizedQuery} variant forwarding to {@link PreprocessedQuery}.
 	 */
-	static class SimpleStructuredQuery implements StructuredQuery {
+	static class SimpleParametrizedQuery implements ParametrizedQuery {
 
-		private final ParametrizedQuery query;
+		private final PreprocessedQuery query;
 
-		SimpleStructuredQuery(ParametrizedQuery query) {
+		SimpleParametrizedQuery(PreprocessedQuery query) {
 			this.query = query;
 		}
 

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

@@ -21,7 +21,7 @@
 import org.jspecify.annotations.Nullable;
 
 /**
- * NULL-Object pattern implementation for {@link StructuredQuery}.
+ * NULL-Object pattern implementation for {@link ParametrizedQuery}.
  *
  * @author Jens Schauder
  * @author Mark Paluch
@@ -73,7 +73,7 @@ public String getQueryString() {
 	}
 
 	@Override
-	public StructuredQuery deriveCountQuery(@Nullable String countQueryProjection) {
+	public ParametrizedQuery deriveCountQuery(@Nullable String countQueryProjection) {
 		return INSTANCE;
 	}
 

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

@@ -18,7 +18,7 @@
 import org.jspecify.annotations.Nullable;
 
 /**
- * An extension to {@link StructuredQuery} exposing query information about its inner structure such as whether
+ * An extension to {@link ParametrizedQuery} exposing query information about its inner structure such as whether
  * constructor expressions (JPQL) are used or the default projection is used.
  * <p>
  * Entity Queries support derivation of {@link #deriveCountQuery(String) count queries} from the original query. They
@@ -28,7 +28,7 @@
  * @author Diego Krupitza
  * @since 4.0
  */
-interface EntityQuery extends StructuredQuery {
+interface EntityQuery extends ParametrizedQuery {
 
 	/**
 	 * Create a new {@link EntityQuery} given {@link DeclaredQuery} and {@link QueryEnhancerSelector}.
@@ -39,7 +39,7 @@ interface EntityQuery extends StructuredQuery {
 	 */
 	static EntityQuery create(DeclaredQuery query, QueryEnhancerSelector selector) {
 
-		ParametrizedQuery preparsed = ParametrizedQuery.parse(query);
+		PreprocessedQuery preparsed = PreprocessedQuery.parse(query);
 		QueryEnhancerFactory enhancerFactory = selector.select(preparsed);
 
 		return new DefaultEntityQuery(preparsed, enhancerFactory);
@@ -73,7 +73,7 @@ default boolean usesPaging() {
 	 * @param countQueryProjection an optional return type for the query.
 	 * @return a new {@literal IntrospectedQuery} instance.
 	 */
-	StructuredQuery deriveCountQuery(@Nullable String countQueryProjection);
+	ParametrizedQuery deriveCountQuery(@Nullable String countQueryProjection);
 
 	/**
 	 * Rewrite the query using the given

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

@@ -140,7 +140,7 @@ static void configureParser(String query, String grammar, Lexer lexer, Parser pa
 	}
 
 	/**
-	 * Factory method to create a {@link JpaQueryEnhancer} for {@link StructuredQuery} using JPQL grammar.
+	 * Factory method to create a {@link JpaQueryEnhancer} for {@link ParametrizedQuery} using JPQL grammar.
 	 *
 	 * @param query must not be {@literal null}.
 	 * @return a new {@link JpaQueryEnhancer} using JPQL.
@@ -150,7 +150,7 @@ public static JpaQueryEnhancer<QueryInformation> forJpql(String query) {
 	}
 
 	/**
-	 * Factory method to create a {@link JpaQueryEnhancer} for {@link StructuredQuery} using HQL grammar.
+	 * Factory method to create a {@link JpaQueryEnhancer} for {@link ParametrizedQuery} using HQL grammar.
 	 *
 	 * @param query must not be {@literal null}.
 	 * @return a new {@link JpaQueryEnhancer} using HQL.
@@ -160,7 +160,7 @@ public static JpaQueryEnhancer<HibernateQueryInformation> forHql(String query) {
 	}
 
 	/**
-	 * Factory method to create a {@link JpaQueryEnhancer} for {@link StructuredQuery} using EQL grammar.
+	 * Factory method to create a {@link JpaQueryEnhancer} for {@link ParametrizedQuery} using EQL grammar.
 	 *
 	 * @param query must not be {@literal null}.
 	 * @return a new {@link JpaQueryEnhancer} using EQL.

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

@@ -84,7 +84,7 @@ static ParameterBinder createBinder(JpaParameters parameters, List<ParameterBind
 	 * @return a {@link ParameterBinder} that can assign values for the method parameters to query parameters of a
 	 *         {@link jakarta.persistence.Query} while processing SpEL expressions where applicable.
 	 */
-	static ParameterBinder createQueryAwareBinder(JpaParameters parameters, StructuredQuery query,
+	static ParameterBinder createQueryAwareBinder(JpaParameters parameters, ParametrizedQuery query,
 			ValueExpressionParser parser, ValueEvaluationContextProvider evaluationContextProvider) {
 
 		Assert.notNull(parameters, "JpaParameters must not be null");
@@ -130,7 +130,7 @@ private static Iterable<QueryParameterSetter> createSetters(List<ParameterBindin
 	}
 
 	private static Iterable<QueryParameterSetter> createSetters(List<ParameterBinding> parameterBindings,
-			StructuredQuery query, QueryParameterSetterFactory... strategies) {
+			ParametrizedQuery query, QueryParameterSetterFactory... strategies) {
 
 		List<QueryParameterSetter> setters = new ArrayList<>(parameterBindings.size());
 		for (ParameterBinding parameterBinding : parameterBindings) {
@@ -141,7 +141,7 @@ private static Iterable<QueryParameterSetter> createSetters(List<ParameterBindin
 	}
 
 	private static QueryParameterSetter createQueryParameterSetter(ParameterBinding binding,
-			QueryParameterSetterFactory[] strategies, StructuredQuery query) {
+			QueryParameterSetterFactory[] strategies, ParametrizedQuery query) {
 
 		for (QueryParameterSetterFactory strategy : strategies) {