Fluent query API should use ProjectionFactory provided by the RepositoryFactory

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.x-3410-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.x-3410-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.x-3410-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.x-3410-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.x-3410-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.x-3410-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -85,4 +85,5 @@ public interface CrudMethodMetadata {
 	 * @since 1.9
 	 */
 	Method getMethod();
+
 }

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

@@ -28,6 +28,7 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -274,6 +275,7 @@ public Optional<EntityGraph> getEntityGraph() {
 		public Method getMethod() {
 			return method;
 		}
+
 	}
 
 	private static class ThreadBoundTargetSource implements TargetSource {

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

@@ -34,6 +34,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Window;
 import org.springframework.data.jpa.repository.query.ScrollDelegate;
+import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
 import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.util.Assert;
@@ -51,6 +52,7 @@
  * @author Mark Paluch
  * @author Jens Schauder
  * @author J.R. Onyschak
+ * @author Christoph Strobl
  * @since 2.6
  */
 class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<S, R> implements FetchableFluentQuery<R> {
@@ -64,21 +66,21 @@ class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<S, R> imp
 	private final Function<Predicate, Boolean> existsOperation;
 	private final EntityManager entityManager;
 
-	public FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType,
+	FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType,
 			Function<Sort, AbstractJPAQuery<?, ?>> finder, PredicateScrollDelegate<S> scroll,
 			BiFunction<Sort, Pageable, AbstractJPAQuery<?, ?>> pagedFinder, Function<Predicate, Long> countOperation,
-			Function<Predicate, Boolean> existsOperation, EntityManager entityManager) {
+			Function<Predicate, Boolean> existsOperation, EntityManager entityManager, ProjectionFactory projectionFactory) {
 		this(predicate, entityType, (Class<R>) entityType, Sort.unsorted(), 0, Collections.emptySet(), finder, scroll,
-				pagedFinder, countOperation, existsOperation, entityManager);
+				pagedFinder, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	private FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType, Class<R> resultType, Sort sort,
 			int limit, Collection<String> properties, Function<Sort, AbstractJPAQuery<?, ?>> finder,
 			PredicateScrollDelegate<S> scroll, BiFunction<Sort, Pageable, AbstractJPAQuery<?, ?>> pagedFinder,
 			Function<Predicate, Long> countOperation, Function<Predicate, Boolean> existsOperation,
-			EntityManager entityManager) {
+			EntityManager entityManager, ProjectionFactory projectionFactory) {
 
-		super(resultType, sort, limit, properties, entityType);
+		super(resultType, sort, limit, properties, entityType, projectionFactory);
 		this.predicate = predicate;
 		this.finder = finder;
 		this.scroll = scroll;
@@ -94,7 +96,7 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
 		Assert.notNull(sort, "Sort must not be null");
 
 		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, this.sort.and(sort), limit,
-				properties, finder, scroll, pagedFinder, countOperation, existsOperation, entityManager);
+				properties, finder, scroll, pagedFinder, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
@@ -103,7 +105,7 @@ public FetchableFluentQuery<R> limit(int limit) {
 		Assert.isTrue(limit >= 0, "Limit must not be negative");
 
 		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit, properties, finder,
-				scroll, pagedFinder, countOperation, existsOperation, entityManager);
+				scroll, pagedFinder, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
@@ -116,14 +118,15 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 		}
 
 		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit, properties, finder,
-				scroll, pagedFinder, countOperation, existsOperation, entityManager);
+				scroll, pagedFinder, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
 	public FetchableFluentQuery<R> project(Collection<String> properties) {
 
 		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit,
-				mergeProperties(properties), finder, scroll, pagedFinder, countOperation, existsOperation, entityManager);
+				mergeProperties(properties), finder, scroll, pagedFinder, countOperation, existsOperation, entityManager,
+				projectionFactory);
 	}
 
 	@Override
@@ -230,7 +233,6 @@ private Function<Object, R> getConversionFunction() {
 		return getConversionFunction(entityType, resultType);
 	}
 
-
 	static class PredicateScrollDelegate<T> extends ScrollDelegate<T> {
 
 		private final ScrollQueryFactory scrollFunction;

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

@@ -36,6 +36,7 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.query.ScrollDelegate;
 import org.springframework.data.jpa.support.PageableUtils;
+import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.util.Assert;
@@ -47,6 +48,7 @@
  * @param <S> Domain type
  * @param <R> Result type
  * @author Greg Turnquist
+ * @author Christoph Strobl
  * @since 3.0
  */
 class FetchableFluentQueryBySpecification<S, R> extends FluentQuerySupport<S, R>
@@ -59,20 +61,21 @@ class FetchableFluentQueryBySpecification<S, R> extends FluentQuerySupport<S, R>
 	private final Function<Specification<S>, Boolean> existsOperation;
 	private final EntityManager entityManager;
 
-	public FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType,
-			Function<Sort, TypedQuery<S>> finder, SpecificationScrollDelegate<S> scrollDelegate,
-			Function<Specification<S>, Long> countOperation, Function<Specification<S>, Boolean> existsOperation,
-			EntityManager entityManager) {
+	FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType, Function<Sort, TypedQuery<S>> finder,
+			SpecificationScrollDelegate<S> scrollDelegate, Function<Specification<S>, Long> countOperation,
+			Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager,
+			ProjectionFactory projectionFactory) {
 		this(spec, entityType, (Class<R>) entityType, Sort.unsorted(), 0, Collections.emptySet(), finder, scrollDelegate,
-				countOperation, existsOperation, entityManager);
+				countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	private FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType, Class<R> resultType,
 			Sort sort, int limit, Collection<String> properties, Function<Sort, TypedQuery<S>> finder,
 			SpecificationScrollDelegate<S> scrollDelegate, Function<Specification<S>, Long> countOperation,
-			Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager) {
+			Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager,
+			ProjectionFactory projectionFactory) {
 
-		super(resultType, sort, limit, properties, entityType);
+		super(resultType, sort, limit, properties, entityType, projectionFactory);
 		this.spec = spec;
 		this.finder = finder;
 		this.scroll = scrollDelegate;
@@ -87,7 +90,7 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
 		Assert.notNull(sort, "Sort must not be null");
 
 		return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, this.sort.and(sort), limit,
-				properties, finder, scroll, countOperation, existsOperation, entityManager);
+				properties, finder, scroll, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
@@ -96,7 +99,7 @@ public FetchableFluentQuery<R> limit(int limit) {
 		Assert.isTrue(limit >= 0, "Limit must not be negative");
 
 		return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, this.sort.and(sort), limit,
-				properties, finder, scroll, countOperation, existsOperation, entityManager);
+				properties, finder, scroll, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
@@ -108,14 +111,14 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 		}
 
 		return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, sort, limit, properties, finder,
-				scroll, countOperation, existsOperation, entityManager);
+				scroll, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override
 	public FetchableFluentQuery<R> project(Collection<String> properties) {
 
 		return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, sort, limit, properties, finder,
-				scroll, countOperation, existsOperation, entityManager);
+				scroll, countOperation, existsOperation, entityManager, projectionFactory);
 	}
 
 	@Override

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

@@ -26,7 +26,7 @@
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.lang.Nullable;
 
 /**
@@ -36,6 +36,7 @@
  * @author Greg Turnquist
  * @author Jens Schauder
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 2.6
  */
 abstract class FluentQuerySupport<S, R> {
@@ -45,11 +46,10 @@ abstract class FluentQuerySupport<S, R> {
 	protected final int limit;
 	protected final Set<String> properties;
 	protected final Class<S> entityType;
-
-	private final SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
+	protected final ProjectionFactory projectionFactory;
 
 	FluentQuerySupport(Class<R> resultType, Sort sort, int limit, @Nullable Collection<String> properties,
-			Class<S> entityType) {
+		Class<S> entityType, ProjectionFactory projectionFactory) {
 
 		this.resultType = resultType;
 		this.sort = sort;
@@ -62,6 +62,7 @@ abstract class FluentQuerySupport<S, R> {
 		}
 
 		this.entityType = entityType;
+		this.projectionFactory = projectionFactory;
 	}
 
 	final Collection<String> mergeProperties(Collection<String> additionalProperties) {

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 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.support;
+
+import org.springframework.data.jpa.repository.query.EscapeCharacter;
+import org.springframework.data.projection.ProjectionFactory;
+
+/**
+ * Interface to be implemented by classes that want to be aware of their configuration in a JPA repository context.
+ *
+ * @author Mark Paluch
+ * @since 3.2.6
+ */
+public interface JpaRepositoryConfigurationAware {
+
+	/**
+	 * Configures the {@link EscapeCharacter} to be used with the repository.
+	 *
+	 * @param escapeCharacter must not be {@literal null}.
+	 */
+	default void setEscapeCharacter(EscapeCharacter escapeCharacter) {
+
+	}
+
+	/**
+	 * Configures the {@link ProjectionFactory} to be used with the repository.
+	 *
+	 * @param projectionFactory must not be {@literal null}.
+	 */
+	default void setProjectionFactory(ProjectionFactory projectionFactory) {
+
+	}
+
+	/**
+	 * Configures the {@link CrudMethodMetadata} to be used with the repository.
+	 *
+	 * @param metadata must not be {@literal null}.
+	 */
+	default void setRepositoryMethodMetadata(CrudMethodMetadata metadata) {
+
+	}
+}