Skip to content

Commit 0af9c62

Browse files
christophstroblmp911de
christophstrobl
authored and
mp911de
committed
Fluent query API should use ProjectionFactory provided by the RepositoryFactory.
This commit makes sure to push the ProjectionFactory down to the fluent query to make use of beans registered in the context. Prior to this change the fluent query variant would host its own factory not being aware of its surroundings. Original pull request: #3432 Closes: #3410
1 parent 4d72031 commit 0af9c62

15 files changed

+162
-36
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Optional;
2222

2323
import org.springframework.data.jpa.repository.EntityGraph;
24+
import org.springframework.data.projection.ProjectionFactory;
2425
import org.springframework.lang.Nullable;
2526

2627
/**
@@ -85,4 +86,11 @@ public interface CrudMethodMetadata {
8586
* @since 1.9
8687
*/
8788
Method getMethod();
89+
90+
/**
91+
* @return the {@link ProjectionFactory} to use or {@literal null} if not present.
92+
* @since ??
93+
*/
94+
@Nullable
95+
ProjectionFactory getProjectionFactory();
8896
}

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.concurrent.ConcurrentHashMap;
2626
import java.util.concurrent.ConcurrentMap;
2727
import java.util.function.Predicate;
28+
import java.util.function.Supplier;
2829

2930
import org.aopalliance.intercept.MethodInterceptor;
3031
import org.aopalliance.intercept.MethodInvocation;
@@ -38,6 +39,7 @@
3839
import org.springframework.data.jpa.repository.Lock;
3940
import org.springframework.data.jpa.repository.Meta;
4041
import org.springframework.data.jpa.repository.QueryHints;
42+
import org.springframework.data.projection.ProjectionFactory;
4143
import org.springframework.data.repository.core.RepositoryInformation;
4244
import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
4345
import org.springframework.lang.Nullable;
@@ -61,6 +63,11 @@
6163
class CrudMethodMetadataPostProcessor implements RepositoryProxyPostProcessor, BeanClassLoaderAware {
6264

6365
private @Nullable ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
66+
private final Supplier<ProjectionFactory> projectionFactorySupplier;
67+
68+
CrudMethodMetadataPostProcessor(Supplier<ProjectionFactory> projectionFactorySupplier) {
69+
this.projectionFactorySupplier = projectionFactorySupplier;
70+
}
6471

6572
@Override
6673
public void setBeanClassLoader(ClassLoader classLoader) {
@@ -69,7 +76,8 @@ public void setBeanClassLoader(ClassLoader classLoader) {
6976

7077
@Override
7178
public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) {
72-
factory.addAdvice(new CrudMethodMetadataPopulatingMethodInterceptor(repositoryInformation));
79+
factory
80+
.addAdvice(new CrudMethodMetadataPopulatingMethodInterceptor(repositoryInformation, projectionFactorySupplier));
7381
}
7482

7583
/**
@@ -101,11 +109,14 @@ static class CrudMethodMetadataPopulatingMethodInterceptor implements MethodInte
101109

102110
private final ConcurrentMap<Method, CrudMethodMetadata> metadataCache = new ConcurrentHashMap<>();
103111
private final Set<Method> implementations = new HashSet<>();
112+
private final Supplier<ProjectionFactory> projectionFactory;
104113

105-
CrudMethodMetadataPopulatingMethodInterceptor(RepositoryInformation repositoryInformation) {
114+
CrudMethodMetadataPopulatingMethodInterceptor(RepositoryInformation repositoryInformation,
115+
Supplier<ProjectionFactory> projectionFactory) {
106116

107117
ReflectionUtils.doWithMethods(repositoryInformation.getRepositoryInterface(), implementations::add,
108118
method -> !repositoryInformation.isQueryMethod(method));
119+
this.projectionFactory = projectionFactory;
109120
}
110121

111122
/**
@@ -150,7 +161,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
150161

151162
if (methodMetadata == null) {
152163

153-
methodMetadata = new DefaultCrudMethodMetadata(method);
164+
methodMetadata = new DefaultCrudMethodMetadata(method, projectionFactory.get());
154165
CrudMethodMetadata tmp = metadataCache.putIfAbsent(method, methodMetadata);
155166

156167
if (tmp != null) {
@@ -185,15 +196,17 @@ private static class DefaultCrudMethodMetadata implements CrudMethodMetadata {
185196
private final @Nullable String comment;
186197
private final Optional<EntityGraph> entityGraph;
187198
private final Method method;
199+
private ProjectionFactory projectionFactory;
188200

189201
/**
190202
* Creates a new {@link DefaultCrudMethodMetadata} for the given {@link Method}.
191203
*
192204
* @param method must not be {@literal null}.
193205
*/
194-
DefaultCrudMethodMetadata(Method method) {
206+
DefaultCrudMethodMetadata(Method method, ProjectionFactory projectionFactory) {
195207

196208
Assert.notNull(method, "Method must not be null");
209+
this.projectionFactory = projectionFactory;
197210

198211
this.lockModeType = findLockModeType(method);
199212
this.queryHints = findQueryHints(method, it -> true);
@@ -274,6 +287,11 @@ public Optional<EntityGraph> getEntityGraph() {
274287
public Method getMethod() {
275288
return method;
276289
}
290+
291+
@Override
292+
public ProjectionFactory getProjectionFactory() {
293+
return projectionFactory;
294+
}
277295
}
278296

279297
private static class ThreadBoundTargetSource implements TargetSource {

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.data.domain.Sort;
3535
import org.springframework.data.domain.Window;
3636
import org.springframework.data.jpa.repository.query.ScrollDelegate;
37+
import org.springframework.data.projection.ProjectionFactory;
3738
import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
3839
import org.springframework.data.support.PageableExecutionUtils;
3940
import org.springframework.util.Assert;
@@ -51,6 +52,7 @@
5152
* @author Mark Paluch
5253
* @author Jens Schauder
5354
* @author J.R. Onyschak
55+
* @author Christoph Strobl
5456
* @since 2.6
5557
*/
5658
class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<S, R> implements FetchableFluentQuery<R> {
@@ -64,21 +66,21 @@ class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<S, R> imp
6466
private final Function<Predicate, Boolean> existsOperation;
6567
private final EntityManager entityManager;
6668

67-
public FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType,
69+
FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType,
6870
Function<Sort, AbstractJPAQuery<?, ?>> finder, PredicateScrollDelegate<S> scroll,
6971
BiFunction<Sort, Pageable, AbstractJPAQuery<?, ?>> pagedFinder, Function<Predicate, Long> countOperation,
70-
Function<Predicate, Boolean> existsOperation, EntityManager entityManager) {
72+
Function<Predicate, Boolean> existsOperation, EntityManager entityManager, ProjectionFactory projectionFactory) {
7173
this(predicate, entityType, (Class<R>) entityType, Sort.unsorted(), 0, Collections.emptySet(), finder, scroll,
72-
pagedFinder, countOperation, existsOperation, entityManager);
74+
pagedFinder, countOperation, existsOperation, entityManager, projectionFactory);
7375
}
7476

7577
private FetchableFluentQueryByPredicate(Predicate predicate, Class<S> entityType, Class<R> resultType, Sort sort,
7678
int limit, Collection<String> properties, Function<Sort, AbstractJPAQuery<?, ?>> finder,
7779
PredicateScrollDelegate<S> scroll, BiFunction<Sort, Pageable, AbstractJPAQuery<?, ?>> pagedFinder,
7880
Function<Predicate, Long> countOperation, Function<Predicate, Boolean> existsOperation,
79-
EntityManager entityManager) {
81+
EntityManager entityManager, ProjectionFactory projectionFactory) {
8082

81-
super(resultType, sort, limit, properties, entityType);
83+
super(resultType, sort, limit, properties, entityType, projectionFactory);
8284
this.predicate = predicate;
8385
this.finder = finder;
8486
this.scroll = scroll;
@@ -94,7 +96,8 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
9496
Assert.notNull(sort, "Sort must not be null");
9597

9698
return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, this.sort.and(sort), limit,
97-
properties, finder, scroll, pagedFinder, countOperation, existsOperation, entityManager);
99+
properties, finder, scroll, pagedFinder, countOperation, existsOperation, entityManager,
100+
getProjectionFactory());
98101
}
99102

100103
@Override
@@ -103,7 +106,7 @@ public FetchableFluentQuery<R> limit(int limit) {
103106
Assert.isTrue(limit >= 0, "Limit must not be negative");
104107

105108
return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit, properties, finder,
106-
scroll, pagedFinder, countOperation, existsOperation, entityManager);
109+
scroll, pagedFinder, countOperation, existsOperation, entityManager, getProjectionFactory());
107110
}
108111

109112
@Override
@@ -116,14 +119,15 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
116119
}
117120

118121
return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit, properties, finder,
119-
scroll, pagedFinder, countOperation, existsOperation, entityManager);
122+
scroll, pagedFinder, countOperation, existsOperation, entityManager, getProjectionFactory());
120123
}
121124

122125
@Override
123126
public FetchableFluentQuery<R> project(Collection<String> properties) {
124127

125128
return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, limit,
126-
mergeProperties(properties), finder, scroll, pagedFinder, countOperation, existsOperation, entityManager);
129+
mergeProperties(properties), finder, scroll, pagedFinder, countOperation, existsOperation, entityManager,
130+
getProjectionFactory());
127131
}
128132

129133
@Override
@@ -230,7 +234,6 @@ private Function<Object, R> getConversionFunction() {
230234
return getConversionFunction(entityType, resultType);
231235
}
232236

233-
234237
static class PredicateScrollDelegate<T> extends ScrollDelegate<T> {
235238

236239
private final ScrollQueryFactory scrollFunction;

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.springframework.data.jpa.domain.Specification;
3737
import org.springframework.data.jpa.repository.query.ScrollDelegate;
3838
import org.springframework.data.jpa.support.PageableUtils;
39+
import org.springframework.data.projection.ProjectionFactory;
3940
import org.springframework.data.repository.query.FluentQuery;
4041
import org.springframework.data.support.PageableExecutionUtils;
4142
import org.springframework.util.Assert;
@@ -47,6 +48,7 @@
4748
* @param <S> Domain type
4849
* @param <R> Result type
4950
* @author Greg Turnquist
51+
* @author Christoph Strobl
5052
* @since 3.0
5153
*/
5254
class FetchableFluentQueryBySpecification<S, R> extends FluentQuerySupport<S, R>
@@ -59,20 +61,21 @@ class FetchableFluentQueryBySpecification<S, R> extends FluentQuerySupport<S, R>
5961
private final Function<Specification<S>, Boolean> existsOperation;
6062
private final EntityManager entityManager;
6163

62-
public FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType,
63-
Function<Sort, TypedQuery<S>> finder, SpecificationScrollDelegate<S> scrollDelegate,
64-
Function<Specification<S>, Long> countOperation, Function<Specification<S>, Boolean> existsOperation,
65-
EntityManager entityManager) {
64+
FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType, Function<Sort, TypedQuery<S>> finder,
65+
SpecificationScrollDelegate<S> scrollDelegate, Function<Specification<S>, Long> countOperation,
66+
Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager,
67+
ProjectionFactory projectionFactory) {
6668
this(spec, entityType, (Class<R>) entityType, Sort.unsorted(), 0, Collections.emptySet(), finder, scrollDelegate,
67-
countOperation, existsOperation, entityManager);
69+
countOperation, existsOperation, entityManager, projectionFactory);
6870
}
6971

7072
private FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> entityType, Class<R> resultType,
7173
Sort sort, int limit, Collection<String> properties, Function<Sort, TypedQuery<S>> finder,
7274
SpecificationScrollDelegate<S> scrollDelegate, Function<Specification<S>, Long> countOperation,
73-
Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager) {
75+
Function<Specification<S>, Boolean> existsOperation, EntityManager entityManager,
76+
ProjectionFactory projectionFactory) {
7477

75-
super(resultType, sort, limit, properties, entityType);
78+
super(resultType, sort, limit, properties, entityType, projectionFactory);
7679
this.spec = spec;
7780
this.finder = finder;
7881
this.scroll = scrollDelegate;
@@ -87,7 +90,7 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
8790
Assert.notNull(sort, "Sort must not be null");
8891

8992
return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, this.sort.and(sort), limit,
90-
properties, finder, scroll, countOperation, existsOperation, entityManager);
93+
properties, finder, scroll, countOperation, existsOperation, entityManager, getProjectionFactory());
9194
}
9295

9396
@Override
@@ -96,7 +99,7 @@ public FetchableFluentQuery<R> limit(int limit) {
9699
Assert.isTrue(limit >= 0, "Limit must not be negative");
97100

98101
return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, this.sort.and(sort), limit,
99-
properties, finder, scroll, countOperation, existsOperation, entityManager);
102+
properties, finder, scroll, countOperation, existsOperation, entityManager, getProjectionFactory());
100103
}
101104

102105
@Override
@@ -108,14 +111,14 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
108111
}
109112

110113
return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, sort, limit, properties, finder,
111-
scroll, countOperation, existsOperation, entityManager);
114+
scroll, countOperation, existsOperation, entityManager, getProjectionFactory());
112115
}
113116

114117
@Override
115118
public FetchableFluentQuery<R> project(Collection<String> properties) {
116119

117120
return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, sort, limit, properties, finder,
118-
scroll, countOperation, existsOperation, entityManager);
121+
scroll, countOperation, existsOperation, entityManager, getProjectionFactory());
119122
}
120123

121124
@Override

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.core.convert.support.DefaultConversionService;
2727
import org.springframework.data.domain.ScrollPosition;
2828
import org.springframework.data.domain.Sort;
29+
import org.springframework.data.projection.ProjectionFactory;
2930
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
3031
import org.springframework.lang.Nullable;
3132

@@ -36,6 +37,7 @@
3637
* @author Greg Turnquist
3738
* @author Jens Schauder
3839
* @author Mark Paluch
40+
* @author Christoph Strobl
3941
* @since 2.6
4042
*/
4143
abstract class FluentQuerySupport<S, R> {
@@ -46,10 +48,10 @@ abstract class FluentQuerySupport<S, R> {
4648
protected final Set<String> properties;
4749
protected final Class<S> entityType;
4850

49-
private final SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
51+
private final ProjectionFactory projectionFactory;
5052

5153
FluentQuerySupport(Class<R> resultType, Sort sort, int limit, @Nullable Collection<String> properties,
52-
Class<S> entityType) {
54+
Class<S> entityType, ProjectionFactory projectionFactory) {
5355

5456
this.resultType = resultType;
5557
this.sort = sort;
@@ -62,6 +64,11 @@ abstract class FluentQuerySupport<S, R> {
6264
}
6365

6466
this.entityType = entityType;
67+
this.projectionFactory = projectionFactory;
68+
}
69+
70+
ProjectionFactory getProjectionFactory() {
71+
return projectionFactory;
6572
}
6673

6774
final Collection<String> mergeProperties(Collection<String> additionalProperties) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public JpaRepositoryFactory(EntityManager entityManager) {
100100

101101
this.entityManager = entityManager;
102102
this.extractor = PersistenceProvider.fromEntityManager(entityManager);
103-
this.crudMethodMetadataPostProcessor = new CrudMethodMetadataPostProcessor();
103+
this.crudMethodMetadataPostProcessor = new CrudMethodMetadataPostProcessor(() -> getProjectionFactory());
104104
this.entityPathResolver = SimpleEntityPathResolver.INSTANCE;
105105
this.queryMethodFactory = new DefaultJpaQueryMethodFactory(extractor);
106106
this.queryRewriterProvider = QueryRewriterProvider.simple();

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@
3636
import org.springframework.data.jpa.repository.query.KeysetScrollSpecification;
3737
import org.springframework.data.jpa.repository.support.FetchableFluentQueryByPredicate.PredicateScrollDelegate;
3838
import org.springframework.data.jpa.repository.support.FluentQuerySupport.ScrollQueryFactory;
39+
import org.springframework.data.projection.ProjectionFactory;
40+
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
3941
import org.springframework.data.querydsl.EntityPathResolver;
4042
import org.springframework.data.querydsl.QSort;
4143
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
44+
import org.springframework.data.repository.core.RepositoryMetadata;
4245
import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
4346
import org.springframework.data.support.PageableExecutionUtils;
4447
import org.springframework.lang.Nullable;
@@ -223,7 +226,8 @@ public <S extends T, R> R findBy(Predicate predicate, Function<FetchableFluentQu
223226
pagedFinder, //
224227
this::count, //
225228
this::exists, //
226-
entityManager //
229+
entityManager, //
230+
getProjectionFactory()
227231
);
228232

229233
return queryFunction.apply((FetchableFluentQuery<S>) fluentQuery);
@@ -251,7 +255,6 @@ public boolean exists(Predicate predicate) {
251255

252256
AbstractJPAQuery<?, ?> query = doCreateQuery(getQueryHints().withFetchGraphs(entityManager), predicate);
253257
CrudMethodMetadata metadata = getRepositoryMethodMetadata();
254-
255258
if (metadata == null) {
256259
return query;
257260
}
@@ -331,6 +334,16 @@ private List<T> executeSorted(JPQLQuery<T> query, Sort sort) {
331334
return querydsl.applySorting(sort, query).fetch();
332335
}
333336

337+
private ProjectionFactory getProjectionFactory() {
338+
339+
CrudMethodMetadata metadata = getRepositoryMethodMetadata();
340+
if(metadata == null || metadata.getProjectionFactory() == null) {
341+
return new SpelAwareProxyProjectionFactory();
342+
}
343+
344+
return metadata.getProjectionFactory();
345+
}
346+
334347
class QuerydslQueryStrategy implements QueryStrategy<Expression<?>, BooleanExpression> {
335348

336349
@Override

0 commit comments

Comments
 (0)