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

refactored, created searchQuery interface based, NativeSearchQueryBuilder support

Browse Source
This commit is contained in:
Mohsin Husen
2013-04-21 12:38:09 +01:00
parent f2325a94bd
commit 807b194e80
13 changed files with 252 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,13 +143,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(),query.getElasticsearchSort());
SearchResponse response = doSearch(prepareSearch(query,clazz), query.getQuery(), query.getFilter(), query.getElasticsearchSort());
return mapResults(response, clazz, query.getPageable());
}
@Override
public <T> Page<T> queryForPage(SearchQuery query, ResultsMapper<T> resultsMapper) {
SearchResponse response = doSearch(prepareSearch(query), query.getElasticsearchQuery(), query.getElasticsearchFilter(),query.getElasticsearchSort());
SearchResponse response = doSearch(prepareSearch(query), query.getQuery(), query.getFilter(), query.getElasticsearchSort());
return resultsMapper.mapResults(response);
}
@@ -166,22 +166,22 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
@Override
public <T> List<String> queryForIds(SearchQuery query) {
SearchRequestBuilder request = prepareSearch(query).setQuery(query.getElasticsearchQuery())
SearchRequestBuilder request = prepareSearch(query).setQuery(query.getQuery())
.setNoFields();
if(query.getElasticsearchFilter() != null){
request.setFilter(query.getElasticsearchFilter());
if(query.getFilter() != null){
request.setFilter(query.getFilter());
}
SearchResponse response = request.execute().actionGet();
return extractIds(response);
}
@Override
public <T> Page<T> queryForPage(CriteriaQuery query, Class<T> clazz) {
QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(query.getCriteria());
SearchResponse response = prepareSearch(query,clazz)
.setQuery(elasticsearchQuery)
public <T> Page<T> queryForPage(CriteriaQuery criteriaQuery, Class<T> clazz) {
QueryBuilder query = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
SearchResponse response = prepareSearch(criteriaQuery,clazz)
.setQuery(query)
.execute().actionGet();
return mapResults(response, clazz, query.getPageable());
return mapResults(response, clazz, criteriaQuery.getPageable());
}
@Override
@@ -197,8 +197,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
ElasticsearchPersistentEntity<T> persistentEntity = getPersistentEntityFor(clazz);
CountRequestBuilder countRequestBuilder = client.prepareCount(persistentEntity.getIndexName())
.setTypes(persistentEntity.getIndexType());
if(query.getElasticsearchQuery() != null){
countRequestBuilder.setQuery(query.getElasticsearchQuery());
if(query.getQuery() != null){
countRequestBuilder.setQuery(query.getQuery());
}
return countRequestBuilder.execute().actionGet().count();
}
@@ -254,30 +254,30 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
}
@Override
public <T> void delete(DeleteQuery query, Class<T> clazz) {
public <T> void delete(DeleteQuery deleteQuery, Class<T> clazz) {
ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
client.prepareDeleteByQuery(persistentEntity.getIndexName())
.setTypes(persistentEntity.getIndexType())
.setQuery(query.getElasticsearchQuery())
.setQuery(deleteQuery.getQuery())
.execute().actionGet();
}
@Override
public String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields) {
Assert.notNull(query.getIndices(), "No index defined for Query");
Assert.notNull(query.getTypes(), "No type define for Query");
Assert.notNull(query.getPageable(), "Query.pageable is required for scan & scroll");
public String scan(SearchQuery searchQuery, long scrollTimeInMillis, boolean noFields) {
Assert.notNull(searchQuery.getIndices(), "No index defined for Query");
Assert.notNull(searchQuery.getTypes(), "No type define for Query");
Assert.notNull(searchQuery.getPageable(), "Query.pageable is required for scan & scroll");
SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices()))
SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(searchQuery.getIndices()))
.setSearchType(SCAN)
.setQuery(query.getElasticsearchQuery())
.setTypes(toArray(query.getTypes()))
.setQuery(searchQuery.getQuery())
.setTypes(toArray(searchQuery.getTypes()))
.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis))
.setFrom(0)
.setSize(query.getPageable().getPageSize());
.setSize(searchQuery.getPageable().getPageSize());
if(query.getElasticsearchFilter() != null){
requestBuilder.setFilter(query.getElasticsearchFilter());
if(searchQuery.getFilter() != null){
requestBuilder.setFilter(searchQuery.getFilter());
}
if(noFields){

1
src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.elasticsearch.core.query;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.util.Assert;

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

@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
* @author Rizwan Idrees
* @author Mohsin Husen
*/
public class CriteriaQuery extends AbstractQuery implements Query {
public class CriteriaQuery extends AbstractQuery{
private Criteria criteria;
private CriteriaQuery() {

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

@@ -25,13 +25,13 @@ import org.elasticsearch.index.query.QueryBuilder;
*/
public class DeleteQuery{
private QueryBuilder elasticsearchQuery;
private QueryBuilder query;
public QueryBuilder getElasticsearchQuery() {
return elasticsearchQuery;
public QueryBuilder getQuery() {
return query;
}
public void setElasticsearchQuery(QueryBuilder elasticsearchQuery) {
this.elasticsearchQuery = elasticsearchQuery;
public void setQuery(QueryBuilder query) {
this.query = query;
}
}

53
src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright 2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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;
/**
* NativeSearchQuery
*
* @author Rizwan Idrees
* @author Mohsin Husen
*/
public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
private QueryBuilder query;
private FilterBuilder filter;
private SortBuilder sort;
public NativeSearchQuery(QueryBuilder query, FilterBuilder filter, SortBuilder sort) {
this.query = query;
this.filter = filter;
this.sort = sort;
}
public QueryBuilder getQuery() {
return query;
}
public FilterBuilder getFilter() {
return filter;
}
public SortBuilder getElasticsearchSort() {
return sort;
}
}

91
src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java Normal file
View File

@@ -0,0 +1,91 @@
/*
* Copyright 2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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;
import org.springframework.data.domain.Pageable;
/**
* NativeSearchQuery
*
* @author Rizwan Idrees
* @author Mohsin Husen
*/
public class NativeSearchQueryBuilder {
private QueryBuilder queryBuilder;
private FilterBuilder filterBuilder;
private SortBuilder sortBuilder;
private Pageable pageable;
private String[] indices;
private String[] types;
private String[] fields;
public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder){
this.queryBuilder = queryBuilder;
return this;
}
public NativeSearchQueryBuilder withFilter(FilterBuilder filterBuilder){
this.filterBuilder = filterBuilder;
return this;
}
public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder){
this.sortBuilder = sortBuilder;
return this;
}
public NativeSearchQueryBuilder withPageable(Pageable pageable){
this.pageable = pageable;
return this;
}
public NativeSearchQueryBuilder withIndices(String... indices){
this.indices = indices;
return this;
}
public NativeSearchQueryBuilder withTypes(String... types){
this.types = types;
return this;
}
public NativeSearchQueryBuilder withFields(String... fields){
this.fields = fields;
return this;
}
public NativeSearchQuery build(){
NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder,filterBuilder,sortBuilder);
if(pageable != null){
nativeSearchQuery.setPageable(pageable);
}
if(indices != null) {
nativeSearchQuery.addIndices(indices);
}
if(types != null) {
nativeSearchQuery.addTypes(types);
}
if(fields != null) {
nativeSearchQuery.addFields(fields);
}
return nativeSearchQuery;
}
}

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

@@ -1,58 +1,11 @@
/*
* Copyright 2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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;
/**
* SearchQuery
*
* @author Rizwan Idrees
* @author Mohsin Husen
*/
public class SearchQuery extends AbstractQuery{
private QueryBuilder elasticsearchQuery;
private FilterBuilder elasticsearchFilter;
private SortBuilder elasticsearchSort;
public QueryBuilder getElasticsearchQuery() {
return elasticsearchQuery;
}
public void setElasticsearchQuery(QueryBuilder elasticsearchQuery) {
this.elasticsearchQuery = elasticsearchQuery;
}
public FilterBuilder getElasticsearchFilter() {
return elasticsearchFilter;
}
public void setElasticsearchFilter(FilterBuilder elasticsearchFilter) {
this.elasticsearchFilter = elasticsearchFilter;
}
public SortBuilder getElasticsearchSort() {
return elasticsearchSort;
}
public void setElasticsearchSort(SortBuilder elasticsearchSort) {
this.elasticsearchSort = elasticsearchSort;
}
public interface SearchQuery extends Query {
QueryBuilder getQuery();
FilterBuilder getFilter();
SortBuilder getElasticsearchSort();
}

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

@@ -35,9 +35,9 @@ public interface ElasticsearchRepository<T, ID extends Serializable> extends Ela
<S extends T> S index(S entity);
Iterable<T> search(QueryBuilder elasticsearchQuery);
Iterable<T> search(QueryBuilder query);
Page<T> search(QueryBuilder elasticsearchQuery, Pageable pageable);
Page<T> search(QueryBuilder query, Pageable pageable);
Page<T> search(SearchQuery searchQuery);

51
src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
View File

@@ -92,9 +92,10 @@ public class SimpleElasticsearchRepository<T> implements ElasticsearchRepository
@Override
public Page<T> findAll(Pageable pageable) {
SearchQuery query = new SearchQuery();
query.setElasticsearchQuery(matchAllQuery());
query.setPageable(pageable);
SearchQuery query = new NativeSearchQueryBuilder()
.withQuery(matchAllQuery())
.withPageable(pageable)
.build();
return elasticsearchOperations.queryForPage(query, getEntityClass());
}
@@ -104,22 +105,25 @@ public class SimpleElasticsearchRepository<T> implements ElasticsearchRepository
if (itemCount == 0) {
return new PageImpl<T>(Collections.<T> emptyList());
}
SearchQuery query = new SearchQuery();
query.setElasticsearchQuery(matchAllQuery());
query.setPageable(new PageRequest(0,itemCount, sort));
SearchQuery query = new NativeSearchQueryBuilder()
.withQuery(matchAllQuery())
.withPageable(new PageRequest(0,itemCount, sort))
.build();
return elasticsearchOperations.queryForPage(query, getEntityClass());
}
@Override
public Iterable<T> findAll(Iterable<String> ids) {
SearchQuery query = new SearchQuery();
query.setElasticsearchQuery(inQuery(entityInformation.getIdAttribute(), ids));
SearchQuery query = new NativeSearchQueryBuilder()
.withQuery(inQuery(entityInformation.getIdAttribute(), ids))
.build();
return elasticsearchOperations.queryForPage(query, getEntityClass());
}
@Override
public long count() {
SearchQuery query = new SearchQuery();
SearchQuery query = new NativeSearchQueryBuilder()
.withQuery(matchAllQuery()).build();
return elasticsearchOperations.count(query,getEntityClass());
}
@@ -169,23 +173,24 @@ public class SimpleElasticsearchRepository<T> implements ElasticsearchRepository
}
@Override
public Iterable<T> search(QueryBuilder elasticsearchQuery) {
SearchQuery query = new SearchQuery();
int count = (int) elasticsearchOperations.count(query, getEntityClass());
public Iterable<T> search(QueryBuilder query) {
SearchQuery searchQuery = new NativeSearchQueryBuilder()
.withQuery(query).build();
int count = (int) elasticsearchOperations.count(searchQuery, getEntityClass());
if(count == 0){
return new PageImpl<T>(Collections.<T>emptyList());
}
query.setPageable(new PageRequest(0,count));
query.setElasticsearchQuery(elasticsearchQuery);
return elasticsearchOperations.queryForPage(query, getEntityClass());
searchQuery.setPageable(new PageRequest(0, count));
return elasticsearchOperations.queryForPage(searchQuery, getEntityClass());
}
@Override
public Page<T> search(QueryBuilder elasticsearchQuery, Pageable pageable) {
SearchQuery query = new SearchQuery();
query.setElasticsearchQuery(elasticsearchQuery);
query.setPageable(pageable);
return elasticsearchOperations.queryForPage(query, getEntityClass());
public Page<T> search(QueryBuilder query, Pageable pageable) {
SearchQuery searchQuery = new NativeSearchQueryBuilder()
.withQuery(query)
.withPageable(pageable)
.build();
return elasticsearchOperations.queryForPage(searchQuery, getEntityClass());
}
@Override
@@ -233,9 +238,9 @@ public class SimpleElasticsearchRepository<T> implements ElasticsearchRepository
@Override
public void deleteAll() {
DeleteQuery query = new DeleteQuery();
query.setElasticsearchQuery(matchAllQuery());
elasticsearchOperations.delete(query, getEntityClass());
DeleteQuery deleteQuery = new DeleteQuery();
deleteQuery.setQuery(matchAllQuery());
elasticsearchOperations.delete(deleteQuery, getEntityClass());
elasticsearchOperations.refresh(entityInformation.getIndexName(),true);
}