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

DATAES-216 - cleanup

Browse Source
This commit is contained in:
Mohsin Husen 2016-01-26 15:04:00 +00:00
parent ba1fb9fc6f
commit 428cac3642
4 changed files with 7 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/ElasticsearchTemplate.java
View File

@ -864,7 +864,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
} }
} }
if (searchQuery.getIndicesBoost() != null) { if (CollectionUtils.isNotEmpty(searchQuery.getIndicesBoost())) {
for (IndexBoost indexBoost : searchQuery.getIndicesBoost()) { for (IndexBoost indexBoost : searchQuery.getIndicesBoost()) {
searchRequest.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost()); searchRequest.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
} }

6
src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java
View File

@ -45,7 +45,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
private List<FacetRequest> facets; private List<FacetRequest> facets;
private List<AbstractAggregationBuilder> aggregations; private List<AbstractAggregationBuilder> aggregations;
private HighlightBuilder.Field[] highlightFields; private HighlightBuilder.Field[] highlightFields;
private IndexBoost[] indicesBoost; private List<IndexBoost> indicesBoost;
public NativeSearchQuery(QueryBuilder query) { public NativeSearchQuery(QueryBuilder query) {
@ -132,11 +132,11 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
} }
@Override @Override
public IndexBoost[] getIndicesBoost() { public List<IndexBoost> getIndicesBoost() {
return indicesBoost; return indicesBoost;
} }
public void setIndicesBoost(IndexBoost... indicesBoost) { public void setIndicesBoost(List<IndexBoost> indicesBoost) {
this.indicesBoost = indicesBoost; this.indicesBoost = indicesBoost;
} }

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

@ -50,7 +50,7 @@ public class NativeSearchQueryBuilder {
private String[] indices; private String[] indices;
private String[] types; private String[] types;
private String[] fields; private String[] fields;
private IndexBoost[] indicesBoost; private List<IndexBoost> indicesBoost;
private float minScore; private float minScore;
private Collection<String> ids; private Collection<String> ids;
private String route; private String route;
@ -91,7 +91,7 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
public NativeSearchQueryBuilder withIndicesBoost(IndexBoost... indicesBoost) { public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
this.indicesBoost = indicesBoost; this.indicesBoost = indicesBoost;
return this; return this;
} }

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

@ -45,7 +45,7 @@ public interface SearchQuery extends Query {
HighlightBuilder.Field[] getHighlightFields(); HighlightBuilder.Field[] getHighlightFields();
IndexBoost[] getIndicesBoost(); List<IndexBoost> getIndicesBoost();
List<ScriptField> getScriptFields(); List<ScriptField> getScriptFields();