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

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

Browse Source
This commit is contained in:
Mark Paluch 2017-03-23 11:36:34 +01:00
parent 5f3bacf950
commit 519a2a11a4
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
View File

@ -418,7 +418,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
SearchResponse response = getSearchResponse( SearchResponse response = getSearchResponse(
client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
// Save hits and scroll id // Save hits and scroll id
currentHits = mapper.mapResults(response, clazz, Pageable.NONE).iterator(); currentHits = mapper.mapResults(response, clazz, Pageable.unpaged()).iterator();
finished = !currentHits.hasNext(); finished = !currentHits.hasNext();
scrollId = response.getScrollId(); scrollId = response.getScrollId();
} }
@ -774,7 +774,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices())).setSearchType(SCAN) SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices())).setSearchType(SCAN)
.setTypes(toArray(query.getTypes())).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0); .setTypes(toArray(query.getTypes())).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0);
if(query.getPageable() != Pageable.NONE){ if(query.getPageable().isPaged()){
requestBuilder.setSize(query.getPageable().getPageSize()); requestBuilder.setSize(query.getPageable().getPageSize());
} }
@ -826,14 +826,14 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> clazz) { public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> clazz) {
SearchResponse response = getSearchResponse( SearchResponse response = getSearchResponse(
client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
return resultsMapper.mapResults(response, clazz, Pageable.NONE); return resultsMapper.mapResults(response, clazz, Pageable.unpaged());
} }
@Override @Override
public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper) { public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper) {
SearchResponse response = getSearchResponse( SearchResponse response = getSearchResponse(
client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute()); client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
return mapper.mapResults(response, null, Pageable.NONE); return mapper.mapResults(response, null, Pageable.unpaged());
} }
@Override @Override
@ -1009,7 +1009,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
searchRequestBuilder.setFetchSource(sourceFilter.getIncludes(), sourceFilter.getExcludes()); 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(); startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
searchRequestBuilder.setSize(query.getPageable().getPageSize()); searchRequestBuilder.setSize(query.getPageable().getPageSize());
} }

2
src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java
View File

@ -32,7 +32,7 @@ public class CriteriaQuery extends AbstractQuery {
private CriteriaQuery() {} private CriteriaQuery() {}
public CriteriaQuery(Criteria criteria) { public CriteriaQuery(Criteria criteria) {
this(criteria, Pageable.NONE); this(criteria, Pageable.unpaged());
} }
public CriteriaQuery(Criteria criteria, Pageable pageable) { public CriteriaQuery(Criteria criteria, Pageable pageable) {

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

@ -44,7 +44,7 @@ public class NativeSearchQueryBuilder {
private List<FacetRequest> facetRequests = new ArrayList<>(); private List<FacetRequest> facetRequests = new ArrayList<>();
private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<>(); private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<>();
private HighlightBuilder.Field[] highlightFields; private HighlightBuilder.Field[] highlightFields;
private Pageable pageable = Pageable.NONE; private Pageable pageable = Pageable.unpaged();
private String[] indices; private String[] indices;
private String[] types; private String[] types;
private String[] fields; private String[] fields;

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

@ -52,8 +52,9 @@ public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
* {@link CustomRepositoryImplementationDetector}, can be {@literal null}. * {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
*/ */
public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers, public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
Class<T> repositoryType, BeanManager beanManager, Optional<CustomRepositoryImplementationDetector> detector) { Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
super(qualifiers, repositoryType, beanManager, detector);
super(qualifiers, repositoryType, beanManager, Optional.of(detector));
Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations."); Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
this.elasticsearchOperationsBean = operations; this.elasticsearchOperationsBean = operations;

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

@ -20,7 +20,6 @@ import java.lang.reflect.Type;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import javax.enterprise.event.Observes; import javax.enterprise.event.Observes;
@ -79,6 +78,6 @@ public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupp
Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers); Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager, return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
Optional.ofNullable(getCustomImplementationDetector())); getCustomImplementationDetector());
} }
} }

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

@ -60,7 +60,7 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType()); return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType());
} else if (queryMethod.isStreamQuery()) { } else if (queryMethod.isStreamQuery()) {
Class<?> entityType = queryMethod.getEntityInformation().getJavaType(); Class<?> entityType = queryMethod.getEntityInformation().getJavaType();
if (query.getPageable() == Pageable.NONE) { if (query.getPageable().isUnpaged()) {
query.setPageable(PageRequest.of(0, 20)); query.setPageable(PageRequest.of(0, 20));
} }
@ -85,7 +85,7 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
Object result = null; Object result = null;
if (queryMethod.isCollectionQuery()) { if (queryMethod.isCollectionQuery()) {
if (accessor.getPageable() == Pageable.NONE) { if (accessor.getPageable().isUnpaged()) {
int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType()); int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
query.setPageable(PageRequest.of(0, Math.max(1, itemCount))); query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
} else { } else {

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

@ -67,7 +67,7 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
stringQuery.setPageable(accessor.getPageable()); stringQuery.setPageable(accessor.getPageable());
return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType()); return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType());
} else if (queryMethod.isCollectionQuery()) { } else if (queryMethod.isCollectionQuery()) {
if (accessor.getPageable() != Pageable.NONE) { if (accessor.getPageable().isPaged()) {
stringQuery.setPageable(accessor.getPageable()); stringQuery.setPageable(accessor.getPageable());
} }
return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType()); return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType());

6
src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java
View File

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