Merged searchrep (5.2.1) to 5.2.N (5.2.1)

136673 msuzuki: SEARCH-340, adding facet range search


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:07:54 +00:00
parent 6981d5bf57
commit be9d0cc1f7
7 changed files with 121 additions and 17 deletions

View File

@@ -29,6 +29,7 @@ package org.alfresco.rest.api.search.model;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.service.cmr.search.GeneralHighlightParameters;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.alfresco.service.cmr.search.RangeParameters;
import org.alfresco.service.cmr.search.StatsRequestParameters;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -60,9 +61,10 @@ public class SearchQuery
private final boolean includeRequest;
private final List<Pivot> pivots;
private final List<StatsRequestParameters> stats;
private final RangeParameters facetRange;
public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,
null,null, null, null, null,null, null, null, null, null, null, null);
null,null, null, null, null,null, null, null, null, null, null, null,null);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@@ -82,7 +84,8 @@ public class SearchQuery
@JsonProperty("highlight")GeneralHighlightParameters highlight,
@JsonProperty("facetIntervals")IntervalParameters facetIntervals,
@JsonProperty("pivots") List<Pivot> pivots,
@JsonProperty("stats") List<StatsRequestParameters> stats)
@JsonProperty("stats") List<StatsRequestParameters> stats,
@JsonProperty("facetRange") RangeParameters facetRange)
{
this.query = query;
this.includeRequest = includeRequest==null?false:includeRequest;
@@ -102,6 +105,7 @@ public class SearchQuery
this.facetIntervals = facetIntervals;
this.pivots = pivots;
this.stats = stats;
this.facetRange = facetRange;
}
public Query getQuery()
@@ -192,4 +196,10 @@ public class SearchQuery
{
return stats;
}
public RangeParameters getFacetRange()
{
return facetRange;
}
}