DATAES-328 - Adapt to API changes in Spring Data Commons.

Author: mp911de

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

@@ -418,7 +418,7 @@ public boolean hasNext() {
 					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 @@ private SearchRequestBuilder prepareScan(Query query, long scrollTimeInMillis, b
 		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 @@ private String doScan(SearchRequestBuilder requestBuilder, SearchQuery searchQue
 	public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> 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 <T> Page<T> 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 @@ private SearchRequestBuilder prepareSearch(Query query) {
 			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());
 		}

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) {

src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java

@@ -44,7 +44,7 @@ public class NativeSearchQueryBuilder {
 	private List<FacetRequest> facetRequests = new ArrayList<>();
 	private List<AbstractAggregationBuilder> 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;

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java

@@ -52,8 +52,9 @@ public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
 	 *          {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
 	 */
 	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
-			Class<T> repositoryType, BeanManager beanManager, Optional<CustomRepositoryImplementationDetector> detector) {
-		super(qualifiers, repositoryType, beanManager, detector);
+			Class<T> 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;

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java

@@ -20,7 +20,6 @@
 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 @@ private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, S
 		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
 
 		return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
-				Optional.ofNullable(getCustomImplementationDetector()));
+				getCustomImplementationDetector());
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java

@@ -60,7 +60,7 @@ public Object execute(Object[] parameters) {
 			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 @@ private Object countOrGetDocumentsForDelete(CriteriaQuery query, ParametersParam
 		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 {

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java

@@ -67,7 +67,7 @@ public Object execute(Object[] parameters) {
 			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());

src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java

@@ -84,7 +84,7 @@ public void shouldMapAggregationsToPage() {
 		when(response.getAggregations()).thenReturn(aggregations);
 
 		//When
-		AggregatedPage<Car> page = (AggregatedPage<Car>) resultMapper.mapResults(response, Car.class, Pageable.NONE);
+		AggregatedPage<Car> page = (AggregatedPage<Car>) resultMapper.mapResults(response, Car.class, Pageable.unpaged());
 
 		//Then
 		page.hasFacets();
@@ -102,7 +102,7 @@ public void shouldMapSearchRequestToPage() {
 		when(response.getHits()).thenReturn(searchHits);
 
 		//When
-		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.NONE);
+		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.unpaged());
 
 		//Then
 		assertThat(page.hasContent(), is(true));
@@ -120,7 +120,7 @@ public void shouldMapPartialSearchRequestToObject() {
 		when(response.getHits()).thenReturn(searchHits);
 
 		//When
-		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.NONE);
+		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.unpaged());
 
 		//Then
 		assertThat(page.hasContent(), is(true));