Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Basic SortBuilder Support with SearchQuery

Browse Source
This commit is contained in:
Mohsin Husen
2013-03-05 15:13:08 +00:00
parent c689470cac
commit b2272dc8d6
3 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.FilterBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortOrder;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
@@ -100,13 +101,13 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
@Override
public <T> Page<T> queryForPage(SearchQuery query, Class<T> clazz) {
SearchResponse response = doSearch(prepareSearch(query,clazz), query.getElasticsearchQuery(), query.getElasticsearchFilter());
SearchResponse response = doSearch(prepareSearch(query,clazz), query.getElasticsearchQuery(), query.getElasticsearchFilter(),query.getElasticsearchSort());
return mapResults(response, clazz, query.getPageable());
}
public <T> Page<T> queryForPage(SearchQuery query, ResultsMapper<T> resultsMapper) {
SearchResponse response = doSearch(prepareSearch(query), query.getElasticsearchQuery(), query.getElasticsearchFilter());
SearchResponse response = doSearch(prepareSearch(query), query.getElasticsearchQuery(), query.getElasticsearchFilter(),query.getElasticsearchSort());
return resultsMapper.mapResults(response);
}
@@ -121,10 +122,15 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
return extractIds(response);
}
private SearchResponse doSearch(SearchRequestBuilder searchRequest, QueryBuilder query, FilterBuilder filter ){
private SearchResponse doSearch(SearchRequestBuilder searchRequest, QueryBuilder query, FilterBuilder filter, SortBuilder sortBuilder){
if(filter != null){
searchRequest.setFilter(filter);
}
if(sortBuilder != null){
searchRequest.addSort(sortBuilder);
}
return searchRequest.setQuery(query).execute().actionGet();
}

9
src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java
View File

@@ -3,11 +3,13 @@ package org.springframework.data.elasticsearch.core.query;
import org.elasticsearch.index.query.FilterBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.sort.SortBuilder;
public class SearchQuery extends AbstractQuery{
private QueryBuilder elasticsearchQuery;
private FilterBuilder elasticsearchFilter;
private SortBuilder elasticsearchSort;
public QueryBuilder getElasticsearchQuery() {
return elasticsearchQuery;
@@ -25,4 +27,11 @@ public class SearchQuery extends AbstractQuery{
this.elasticsearchFilter = elasticsearchFilter;
}
public SortBuilder getElasticsearchSort() {
return elasticsearchSort;
}
public void setElasticsearchSort(SortBuilder elasticsearchSort) {
this.elasticsearchSort = elasticsearchSort;
}
}