Skip to content

Commit 7219d96

Browse files
mp911demp911de
committed
Polishing.
Add SpecificationFluentQuery to include specification-related overloads. Also, add slice(…) terminal method to obtain a slice only without running a count query. See #3727
1 parent b0b1e5e commit 7219d96

File tree

5 files changed

+159
-14
lines changed

5 files changed

+159
-14
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ package-lock.json
1313
node
1414
build/
1515
.mvn/.develocity
16+
spring-data-jpa/gen

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

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
*/
1616
package org.springframework.data.jpa.repository;
1717

18+
import java.util.Arrays;
19+
import java.util.Collection;
1820
import java.util.List;
1921
import java.util.Optional;
2022
import java.util.function.Function;
2123

2224
import org.springframework.dao.InvalidDataAccessApiUsageException;
2325
import org.springframework.data.domain.Page;
2426
import org.springframework.data.domain.Pageable;
27+
import org.springframework.data.domain.Slice;
2528
import org.springframework.data.domain.Sort;
2629
import org.springframework.data.jpa.domain.DeleteSpecification;
2730
import org.springframework.data.jpa.domain.PredicateSpecification;
@@ -110,6 +113,7 @@ default List<T> findAll(PredicateSpecification<T> spec) {
110113
* be counted.
111114
* @param pageable must not be {@literal null}.
112115
* @return never {@literal null}.
116+
* @since 3.5
113117
*/
114118
Page<T> findAll(@Nullable Specification<T> spec, @Nullable Specification<T> countSpec, Pageable pageable);
115119

@@ -219,7 +223,7 @@ default long delete(PredicateSpecification<T> spec) {
219223
* @since 4.0
220224
*/
221225
default <S extends T, R> R findBy(PredicateSpecification<T> spec,
222-
Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
226+
Function<? super SpecificationFluentQuery<S>, R> queryFunction) {
223227
return findBy(Specification.where(spec), queryFunction);
224228
}
225229

@@ -237,6 +241,72 @@ default <S extends T, R> R findBy(PredicateSpecification<T> spec,
237241
* @since 3.0
238242
* @throws InvalidDataAccessApiUsageException if the query function returns the {@link FluentQuery} instance.
239243
*/
240-
<S extends T, R> R findBy(Specification<T> spec, Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction);
244+
<S extends T, R> R findBy(Specification<T> spec, Function<? super SpecificationFluentQuery<S>, R> queryFunction);
245+
246+
/**
247+
* Extension to {@link FetchableFluentQuery} allowing slice results and pagination with a custom count
248+
* {@link Specification}.
249+
*
250+
* @param <T>
251+
* @since 3.5
252+
*/
253+
interface SpecificationFluentQuery<T> extends FluentQuery.FetchableFluentQuery<T> {
254+
255+
@Override
256+
SpecificationFluentQuery<T> sortBy(Sort sort);
257+
258+
@Override
259+
SpecificationFluentQuery<T> limit(int limit);
260+
261+
@Override
262+
<R> SpecificationFluentQuery<R> as(Class<R> resultType);
263+
264+
@Override
265+
default SpecificationFluentQuery<T> project(String... properties) {
266+
return this.project(Arrays.asList(properties));
267+
}
268+
269+
@Override
270+
SpecificationFluentQuery<T> project(Collection<String> properties);
271+
272+
/**
273+
* Get a slice of matching elements for {@link Pageable} by requesting {@code Pageable#getPageSize() + 1} elements.
274+
*
275+
* @param pageable the pageable to request a paged result, can be {@link Pageable#unpaged()}, must not be
276+
* {@literal null}. The given {@link Pageable} will override any previously specified {@link Sort sort} if
277+
* the {@link Sort} object is not {@link Sort#isUnsorted()}. Any potentially specified {@link #limit(int)}
278+
* will be overridden by {@link Pageable#getPageSize()}.
279+
* @return
280+
*/
281+
Slice<T> slice(Pageable pageable);
282+
283+
/**
284+
* Get a page of matching elements for {@link Pageable} and provide a custom {@link Specification count
285+
* specification}.
286+
*
287+
* @param pageable the pageable to request a paged result, can be {@link Pageable#unpaged()}, must not be
288+
* {@literal null}. The given {@link Pageable} will override any previously specified {@link Sort sort} if
289+
* the {@link Sort} object is not {@link Sort#isUnsorted()}. Any potentially specified {@link #limit(int)}
290+
* will be overridden by {@link Pageable#getPageSize()}.
291+
* @param countSpec specification used to count results.
292+
* @return
293+
*/
294+
default Page<T> page(Pageable pageable, PredicateSpecification<?> countSpec) {
295+
return page(pageable, Specification.where(countSpec));
296+
}
297+
298+
/**
299+
* Get a page of matching elements for {@link Pageable} and provide a custom {@link Specification count
300+
* specification}.
301+
*
302+
* @param pageable the pageable to request a paged result, can be {@link Pageable#unpaged()}, must not be
303+
* {@literal null}. The given {@link Pageable} will override any previously specified {@link Sort sort} if
304+
* the {@link Sort} object is not {@link Sort#isUnsorted()}. Any potentially specified {@link #limit(int)}
305+
* will be overridden by {@link Pageable#getPageSize()}.
306+
* @param countSpec specification used to count results.
307+
* @return
308+
*/
309+
Page<T> page(Pageable pageable, Specification<?> countSpec);
310+
}
241311

242312
}

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

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,18 @@
3131
import org.springframework.data.domain.PageImpl;
3232
import org.springframework.data.domain.Pageable;
3333
import org.springframework.data.domain.ScrollPosition;
34+
import org.springframework.data.domain.Slice;
35+
import org.springframework.data.domain.SliceImpl;
3436
import org.springframework.data.domain.Sort;
3537
import org.springframework.data.domain.Window;
3638
import org.springframework.data.jpa.domain.Specification;
39+
import org.springframework.data.jpa.repository.JpaSpecificationExecutor.SpecificationFluentQuery;
3740
import org.springframework.data.jpa.repository.query.ScrollDelegate;
3841
import org.springframework.data.jpa.support.PageableUtils;
3942
import org.springframework.data.projection.ProjectionFactory;
4043
import org.springframework.data.repository.query.FluentQuery;
4144
import org.springframework.data.support.PageableExecutionUtils;
45+
import org.springframework.lang.Nullable;
4246
import org.springframework.util.Assert;
4347

4448
/**
@@ -52,7 +56,7 @@
5256
* @since 3.0
5357
*/
5458
class FetchableFluentQueryBySpecification<S, R> extends FluentQuerySupport<S, R>
55-
implements FluentQuery.FetchableFluentQuery<R> {
59+
implements FluentQuery.FetchableFluentQuery<R>, SpecificationFluentQuery<R> {
5660

5761
private final Specification<S> spec;
5862
private final Function<FluentQuerySupport<?, ?>, TypedQuery<S>> finder;
@@ -85,7 +89,7 @@ private FetchableFluentQueryBySpecification(Specification<S> spec, Class<S> enti
8589
}
8690

8791
@Override
88-
public FetchableFluentQuery<R> sortBy(Sort sort) {
92+
public SpecificationFluentQuery<R> sortBy(Sort sort) {
8993

9094
Assert.notNull(sort, "Sort must not be null");
9195

@@ -94,7 +98,7 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
9498
}
9599

96100
@Override
97-
public FetchableFluentQuery<R> limit(int limit) {
101+
public SpecificationFluentQuery<R> limit(int limit) {
98102

99103
Assert.isTrue(limit >= 0, "Limit must not be negative");
100104

@@ -103,7 +107,7 @@ public FetchableFluentQuery<R> limit(int limit) {
103107
}
104108

105109
@Override
106-
public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
110+
public <NR> SpecificationFluentQuery<NR> as(Class<NR> resultType) {
107111

108112
Assert.notNull(resultType, "Projection target type must not be null");
109113

@@ -112,7 +116,7 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
112116
}
113117

114118
@Override
115-
public FetchableFluentQuery<R> project(Collection<String> properties) {
119+
public SpecificationFluentQuery<R> project(Collection<String> properties) {
116120

117121
return new FetchableFluentQueryBySpecification<>(spec, entityType, resultType, sort, limit, properties, finder,
118122
scroll, countOperation, existsOperation, entityManager, projectionFactory);
@@ -155,9 +159,20 @@ public Window<R> scroll(ScrollPosition scrollPosition) {
155159
return scroll.scroll(this, scrollPosition).map(getConversionFunction());
156160
}
157161

162+
@Override
163+
public Slice<R> slice(Pageable pageable) {
164+
return pageable.isUnpaged() ? new PageImpl<>(all()) : readSlice(pageable);
165+
}
166+
158167
@Override
159168
public Page<R> page(Pageable pageable) {
160-
return pageable.isUnpaged() ? new PageImpl<>(all()) : readPage(pageable);
169+
return pageable.isUnpaged() ? new PageImpl<>(all()) : readPage(pageable, spec);
170+
}
171+
172+
@Override
173+
@SuppressWarnings({ "rawtypes", "unchecked" })
174+
public Page<R> page(Pageable pageable, Specification<?> countSpec) {
175+
return pageable.isUnpaged() ? new PageImpl<>(all()) : readPage(pageable, (Specification) countSpec);
161176
}
162177

163178
@Override
@@ -193,7 +208,27 @@ private TypedQuery<S> createSortedAndProjectedQuery() {
193208
return query;
194209
}
195210

196-
private Page<R> readPage(Pageable pageable) {
211+
private Slice<R> readSlice(Pageable pageable) {
212+
213+
TypedQuery<S> pagedQuery = createSortedAndProjectedQuery();
214+
215+
if (pageable.isPaged()) {
216+
pagedQuery.setFirstResult(PageableUtils.getOffsetAsInteger(pageable));
217+
pagedQuery.setMaxResults(pageable.getPageSize() + 1);
218+
}
219+
220+
List<S> resultList = pagedQuery.getResultList();
221+
boolean hasNext = resultList.size() > pageable.getPageSize();
222+
if (hasNext) {
223+
resultList = resultList.subList(0, pageable.getPageSize());
224+
}
225+
226+
List<R> slice = convert(resultList);
227+
228+
return new SliceImpl<>(slice, pageable, hasNext);
229+
}
230+
231+
private Page<R> readPage(Pageable pageable, @Nullable Specification<S> countSpec) {
197232

198233
TypedQuery<S> pagedQuery = createSortedAndProjectedQuery();
199234

@@ -204,7 +239,7 @@ private Page<R> readPage(Pageable pageable) {
204239

205240
List<R> paginatedResults = convert(pagedQuery.getResultList());
206241

207-
return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(spec));
242+
return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(countSpec));
208243
}
209244

210245
private List<R> convert(List<S> resultList) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,8 @@ public long delete(DeleteSpecification<T> spec) {
505505
}
506506

507507
@Override
508-
public <S extends T, R> R findBy(Specification<T> spec, Function<FetchableFluentQuery<S>, R> queryFunction) {
508+
public <S extends T, R> R findBy(Specification<T> spec,
509+
Function<? super SpecificationFluentQuery<S>, R> queryFunction) {
509510

510511
Assert.notNull(spec, SPECIFICATION_MUST_NOT_BE_NULL);
511512
Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
@@ -515,7 +516,7 @@ public <S extends T, R> R findBy(Specification<T> spec, Function<FetchableFluent
515516

516517
@SuppressWarnings("unchecked")
517518
private <S extends T, R> R doFindBy(Specification<T> spec, Class<T> domainClass,
518-
Function<FetchableFluentQuery<S>, R> queryFunction) {
519+
Function<? super SpecificationFluentQuery<S>, R> queryFunction) {
519520

520521
Assert.notNull(spec, SPECIFICATION_MUST_NOT_BE_NULL);
521522
Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
@@ -550,7 +551,7 @@ private <S extends T, R> R doFindBy(Specification<T> spec, Class<T> domainClass,
550551
FetchableFluentQueryBySpecification<?, T> fluentQuery = new FetchableFluentQueryBySpecification<>(spec, domainClass,
551552
finder, scrollDelegate, this::count, this::exists, this.entityManager, getProjectionFactory());
552553

553-
R result = queryFunction.apply((FetchableFluentQuery<S>) fluentQuery);
554+
R result = queryFunction.apply((SpecificationFluentQuery<S>) fluentQuery);
554555

555556
if (result instanceof FluentQuery<?>) {
556557
throw new InvalidDataAccessApiUsageException(
@@ -716,7 +717,7 @@ protected Page<T> readPage(TypedQuery<T> query, Pageable pageable, Specification
716717
* @param spec must not be {@literal null}.
717718
* @param pageable can be {@literal null}.
718719
*/
719-
protected <S extends T> Page<S> readPage(TypedQuery<S> query, final Class<S> domainClass, Pageable pageable,
720+
protected <S extends T> Page<S> readPage(TypedQuery<S> query, Class<S> domainClass, Pageable pageable,
720721
Specification<S> spec) {
721722

722723
Assert.notNull(spec, "Specification must not be null");

‎spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2727,6 +2727,44 @@ void findByFluentSpecificationPage() {
27272727
assertThat(page1.getContent()).containsExactly(fourthUser);
27282728
}
27292729

2730+
@Test // GH-2274
2731+
void findByFluentSpecificationSlice() {
2732+
2733+
flushTestUsers();
2734+
2735+
Slice<User> slice = repository.findBy(userHasFirstnameLike("v"),
2736+
q -> q.sortBy(Sort.by("firstname")).slice(PageRequest.of(0, 2)));
2737+
2738+
assertThat(slice).isNotInstanceOf(Page.class);
2739+
assertThat(slice.getContent()).containsExactly(thirdUser, firstUser);
2740+
assertThat(slice.hasNext()).isTrue();
2741+
2742+
slice = repository.findBy(userHasFirstnameLike("v"),
2743+
q -> q.sortBy(Sort.by("firstname")).slice(PageRequest.of(0, 3)));
2744+
2745+
assertThat(slice).isNotInstanceOf(Page.class);
2746+
assertThat(slice).hasSize(3);
2747+
assertThat(slice.hasNext()).isFalse();
2748+
}
2749+
2750+
@Test // GH-3727
2751+
void findByFluentSpecificationPageCustomCountSpec() {
2752+
2753+
flushTestUsers();
2754+
2755+
Page<User> page0 = repository.findBy(userHasFirstnameLike("v"),
2756+
q -> q.sortBy(Sort.by("firstname")).page(PageRequest.of(0, 2), (root, query, criteriaBuilder) -> null));
2757+
2758+
assertThat(page0.getContent()).containsExactly(thirdUser, firstUser);
2759+
assertThat(page0.getTotalElements()).isEqualTo(4L);
2760+
2761+
page0 = repository.findBy(userHasFirstnameLike("v"),
2762+
q -> q.sortBy(Sort.by("firstname")).page(PageRequest.of(0, 2)));
2763+
2764+
assertThat(page0.getContent()).containsExactly(thirdUser, firstUser);
2765+
assertThat(page0.getTotalElements()).isEqualTo(3L);
2766+
}
2767+
27302768
@Test // GH-2274, GH-3716
27312769
void findByFluentSpecificationWithInterfaceBasedProjection() {
27322770

0 commit comments

Comments
 (0)