From 519a2a11a4eb3648ea330854bf30f0d461836e7f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 23 Mar 2017 11:36:34 +0100 Subject: [PATCH] DATAES-328 - Adapt to API changes in Spring Data Commons. --- .../data/elasticsearch/core/ElasticsearchTemplate.java | 10 +++++----- .../data/elasticsearch/core/query/CriteriaQuery.java | 2 +- .../core/query/NativeSearchQueryBuilder.java | 2 +- .../repository/cdi/ElasticsearchRepositoryBean.java | 5 +++-- .../cdi/ElasticsearchRepositoryExtension.java | 3 +-- .../repository/query/ElasticsearchPartQuery.java | 4 ++-- .../repository/query/ElasticsearchStringQuery.java | 2 +- .../elasticsearch/core/DefaultResultMapperTests.java | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index d27eea544..8a8872e49 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -418,7 +418,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati SearchResponse response = getSearchResponse( client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); // Save hits and scroll id - currentHits = mapper.mapResults(response, clazz, Pageable.NONE).iterator(); + currentHits = mapper.mapResults(response, clazz, Pageable.unpaged()).iterator(); finished = !currentHits.hasNext(); scrollId = response.getScrollId(); } @@ -774,7 +774,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices())).setSearchType(SCAN) .setTypes(toArray(query.getTypes())).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0); - if(query.getPageable() != Pageable.NONE){ + if(query.getPageable().isPaged()){ requestBuilder.setSize(query.getPageable().getPageSize()); } @@ -826,14 +826,14 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati public Page scroll(String scrollId, long scrollTimeInMillis, Class clazz) { SearchResponse response = getSearchResponse( client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); - return resultsMapper.mapResults(response, clazz, Pageable.NONE); + return resultsMapper.mapResults(response, clazz, Pageable.unpaged()); } @Override public Page scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper) { SearchResponse response = getSearchResponse( client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); - return mapper.mapResults(response, null, Pageable.NONE); + return mapper.mapResults(response, null, Pageable.unpaged()); } @Override @@ -1009,7 +1009,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati searchRequestBuilder.setFetchSource(sourceFilter.getIncludes(), sourceFilter.getExcludes()); } - if (query.getPageable() != null && query.getPageable() != Pageable.NONE) { + if (query.getPageable().isPaged()) { startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize(); searchRequestBuilder.setSize(query.getPageable().getPageSize()); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java index 23e540140..5e9d91760 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java @@ -32,7 +32,7 @@ public class CriteriaQuery extends AbstractQuery { private CriteriaQuery() {} public CriteriaQuery(Criteria criteria) { - this(criteria, Pageable.NONE); + this(criteria, Pageable.unpaged()); } public CriteriaQuery(Criteria criteria, Pageable pageable) { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java index 49ae37ae7..c168ac625 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java @@ -44,7 +44,7 @@ public class NativeSearchQueryBuilder { private List facetRequests = new ArrayList<>(); private List aggregationBuilders = new ArrayList<>(); private HighlightBuilder.Field[] highlightFields; - private Pageable pageable = Pageable.NONE; + private Pageable pageable = Pageable.unpaged(); private String[] indices; private String[] types; private String[] fields; diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java index 15a0b905b..6d69a1967 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java @@ -52,8 +52,9 @@ public class ElasticsearchRepositoryBean extends CdiRepositoryBean { * {@link CustomRepositoryImplementationDetector}, can be {@literal null}. */ public ElasticsearchRepositoryBean(Bean operations, Set qualifiers, - Class repositoryType, BeanManager beanManager, Optional detector) { - super(qualifiers, repositoryType, beanManager, detector); + Class repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) { + + super(qualifiers, repositoryType, beanManager, Optional.of(detector)); Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations."); this.elasticsearchOperationsBean = operations; diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java index 8e730ae93..4c2ac69a5 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java @@ -20,7 +20,6 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import java.util.Optional; import java.util.Set; import javax.enterprise.event.Observes; @@ -79,6 +78,6 @@ public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupp Bean elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers); return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager, - Optional.ofNullable(getCustomImplementationDetector())); + getCustomImplementationDetector()); } } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java index 60e89551a..c4dd52429 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java @@ -60,7 +60,7 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType()); } else if (queryMethod.isStreamQuery()) { Class entityType = queryMethod.getEntityInformation().getJavaType(); - if (query.getPageable() == Pageable.NONE) { + if (query.getPageable().isUnpaged()) { query.setPageable(PageRequest.of(0, 20)); } @@ -85,7 +85,7 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery Object result = null; if (queryMethod.isCollectionQuery()) { - if (accessor.getPageable() == Pageable.NONE) { + if (accessor.getPageable().isUnpaged()) { int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType()); query.setPageable(PageRequest.of(0, Math.max(1, itemCount))); } else { diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java index 8d3add2ed..99500b6c9 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java @@ -67,7 +67,7 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue stringQuery.setPageable(accessor.getPageable()); return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType()); } else if (queryMethod.isCollectionQuery()) { - if (accessor.getPageable() != Pageable.NONE) { + if (accessor.getPageable().isPaged()) { stringQuery.setPageable(accessor.getPageable()); } return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType()); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java index 63f83e3c9..b0ca799b7 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java @@ -84,7 +84,7 @@ public class DefaultResultMapperTests { when(response.getAggregations()).thenReturn(aggregations); //When - AggregatedPage page = (AggregatedPage) resultMapper.mapResults(response, Car.class, Pageable.NONE); + AggregatedPage page = (AggregatedPage) resultMapper.mapResults(response, Car.class, Pageable.unpaged()); //Then page.hasFacets(); @@ -102,7 +102,7 @@ public class DefaultResultMapperTests { when(response.getHits()).thenReturn(searchHits); //When - Page page = resultMapper.mapResults(response, Car.class, Pageable.NONE); + Page page = resultMapper.mapResults(response, Car.class, Pageable.unpaged()); //Then assertThat(page.hasContent(), is(true)); @@ -120,7 +120,7 @@ public class DefaultResultMapperTests { when(response.getHits()).thenReturn(searchHits); //When - Page page = resultMapper.mapResults(response, Car.class, Pageable.NONE); + Page page = resultMapper.mapResults(response, Car.class, Pageable.unpaged()); //Then assertThat(page.hasContent(), is(true));