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

DATAES-645 - Polishing.

Browse Source
This commit is contained in:
P.J. Meisch 2019-09-04 22:23:46 +02:00
parent 48d2cd1461
commit 2ce1bddce9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -951,7 +951,7 @@ public class ElasticsearchRestTemplate
} }
if (query instanceof SearchQuery) { if (query instanceof SearchQuery) {
SearchQuery searchQuery = (SearchQuery) query; SearchQuery searchQuery = (SearchQuery) query;
if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) { if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder(); HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();

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

@ -810,7 +810,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
} }
if (query instanceof SearchQuery) { if (query instanceof SearchQuery) {
SearchQuery searchQuery = (SearchQuery) query; SearchQuery searchQuery = (SearchQuery) query;
if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) { if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder(); HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
@ -1090,7 +1090,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
private <T> SearchRequestBuilder prepareSearch(Query query, Class<T> clazz) { private <T> SearchRequestBuilder prepareSearch(Query query, Class<T> clazz) {
setPersistentEntityIndexAndType(query, clazz); setPersistentEntityIndexAndType(query, clazz);
return prepareSearch(query, getPersistentEntity(clazz)); return prepareSearch(query, getPersistentEntity(clazz));
} }
private SearchRequestBuilder prepareSearch(Query query, @Nullable ElasticsearchPersistentEntity<?> entity) { private SearchRequestBuilder prepareSearch(Query query, @Nullable ElasticsearchPersistentEntity<?> entity) {

9
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@ -1615,8 +1615,7 @@ public class ElasticsearchTemplateTests {
SearchQuery searchQuery = new NativeSearchQueryBuilder() SearchQuery searchQuery = new NativeSearchQueryBuilder()
.withQuery(boolQuery().must(termQuery("type", "test")).must(termQuery("message", "test"))) .withQuery(boolQuery().must(termQuery("type", "test")).must(termQuery("message", "test")))
.withPageable(PageRequest.of(0, 10)) .withPageable(PageRequest.of(0, 10)).withHighlightBuilder(highlightBuilder).build();
.withHighlightBuilder(highlightBuilder).build();
SearchResultMapper searchResultMapper = new SearchResultMapper() { SearchResultMapper searchResultMapper = new SearchResultMapper() {
@Override @Override
@ -1653,9 +1652,11 @@ public class ElasticsearchTemplateTests {
}; };
// when // when
ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(scrollTimeInMillis, searchQuery, SampleEntity.class, searchResultMapper); ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(scrollTimeInMillis, searchQuery,
SampleEntity.class, searchResultMapper);
while (scroll.hasContent()) { while (scroll.hasContent()) {
scroll = elasticsearchTemplate.continueScroll(scroll.getScrollId(), scrollTimeInMillis, SampleEntity.class, searchResultMapper); scroll = elasticsearchTemplate.continueScroll(scroll.getScrollId(), scrollTimeInMillis, SampleEntity.class,
searchResultMapper);
} }
elasticsearchTemplate.clearScroll(scroll.getScrollId()); elasticsearchTemplate.clearScroll(scroll.getScrollId());