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

136623 gjames: SEARCH-409: Initial solr stats api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:06:54 +00:00
parent 6f2fc20e18
commit 3445581377
7 changed files with 213 additions and 33 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.StatsRequestParameters;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -58,8 +59,10 @@ public class SearchQuery
private final IntervalParameters facetIntervals;
private final boolean includeRequest;
private final List<Pivot> pivots;
private final List<StatsRequestParameters> stats;
public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,null, null, null, null,null, null, null, null, null, null, null);
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);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@@ -78,7 +81,8 @@ public class SearchQuery
@JsonProperty("limits")Limits limits,
@JsonProperty("highlight")GeneralHighlightParameters highlight,
@JsonProperty("facetIntervals")IntervalParameters facetIntervals,
@JsonProperty("pivots") List<Pivot> pivots)
@JsonProperty("pivots") List<Pivot> pivots,
@JsonProperty("stats") List<StatsRequestParameters> stats)
{
this.query = query;
this.includeRequest = includeRequest==null?false:includeRequest;
@@ -97,6 +101,7 @@ public class SearchQuery
this.highlight = highlight;
this.facetIntervals = facetIntervals;
this.pivots = pivots;
this.stats = stats;
}
public Query getQuery()
@@ -182,4 +187,9 @@ public class SearchQuery
{
return pivots;
}
public List<StatsRequestParameters> getStats()
{
return stats;
}
}