Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-21 19:42:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-518 - Polishing.

Browse Source 
Extract variable.

Original pull request: #233.
This commit is contained in:
Mark Paluch 2018-12-14 09:42:55 +01:00
parent a1c139445f
commit 3abc3ab13b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
View File

@ -50,6 +50,7 @@ import org.elasticsearch.search.sort.SortOrder;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity; import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity;
@ -241,7 +242,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchSourceBuilder.query(mappedQuery(query, entity)); searchSourceBuilder.query(mappedQuery(query, entity));
searchSourceBuilder.version(entity.hasVersionProperty()); // This has been true by default before searchSourceBuilder.version(entity.hasVersionProperty());
searchSourceBuilder.trackScores(query.getTrackScores()); searchSourceBuilder.trackScores(query.getTrackScores());
QueryBuilder postFilterQuery = mappedFilterQuery(query, entity); QueryBuilder postFilterQuery = mappedFilterQuery(query, entity);
@ -263,15 +264,17 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
request.indicesOptions(query.getIndicesOptions()); 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) { if (offset > Integer.MAX_VALUE) {
throw new IllegalArgumentException(String.format("Offset must not be more than %s", Integer.MAX_VALUE)); throw new IllegalArgumentException(String.format("Offset must not be more than %s", Integer.MAX_VALUE));
} }
searchSourceBuilder.from((int) offset); searchSourceBuilder.from((int) offset);
searchSourceBuilder.size(query.getPageable().getPageSize()); searchSourceBuilder.size(pageable.getPageSize());
request.source(searchSourceBuilder); request.source(searchSourceBuilder);
return doFind(prepareSearchRequest(request)); return doFind(prepareSearchRequest(request));