From 3abc3ab13b18a26d5862e29685e717367bec8d10 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Dec 2018 09:42:55 +0100 Subject: [PATCH] DATAES-518 - Polishing. Extract variable. Original pull request: #233. --- .../core/ReactiveElasticsearchTemplate.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java index 0e0d0e0cc..3719df22e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java @@ -50,6 +50,7 @@ import org.elasticsearch.search.sort.SortOrder; import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity; @@ -241,7 +242,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(mappedQuery(query, entity)); - searchSourceBuilder.version(entity.hasVersionProperty()); // This has been true by default before + searchSourceBuilder.version(entity.hasVersionProperty()); searchSourceBuilder.trackScores(query.getTrackScores()); QueryBuilder postFilterQuery = mappedFilterQuery(query, entity); @@ -263,15 +264,17 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera request.indicesOptions(query.getIndicesOptions()); } - if (query.getPageable().isPaged()) { + Pageable pageable = query.getPageable(); - long offset = query.getPageable().getOffset(); + if (pageable.isPaged()) { + + long offset = pageable.getOffset(); if (offset > Integer.MAX_VALUE) { throw new IllegalArgumentException(String.format("Offset must not be more than %s", Integer.MAX_VALUE)); } searchSourceBuilder.from((int) offset); - searchSourceBuilder.size(query.getPageable().getPageSize()); + searchSourceBuilder.size(pageable.getPageSize()); request.source(searchSourceBuilder); return doFind(prepareSearchRequest(request));