Merged 5.2.N (5.2.2) to HEAD (5.2)

137058 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136805 msuzuki: Search-340, changed range to a collection as it may handle many range facets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:15:56 +00:00
parent 02a518aeea
commit 4ddc581743
8 changed files with 87 additions and 91 deletions

View File

@@ -61,7 +61,7 @@ public class SearchQuery
private final boolean includeRequest;
private final List<Pivot> pivots;
private final List<StatsRequestParameters> stats;
private final RangeParameters ranges;
private final List<RangeParameters> ranges;
private final String timezone;
public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,
@@ -87,7 +87,7 @@ public class SearchQuery
@JsonProperty("facetIntervals")IntervalParameters facetIntervals,
@JsonProperty("pivots") List<Pivot> pivots,
@JsonProperty("stats") List<StatsRequestParameters> stats,
@JsonProperty("ranges") RangeParameters ranges,
@JsonProperty("ranges") List<RangeParameters> ranges,
@JsonProperty("timezone") String timezone)
{
this.query = query;
@@ -201,7 +201,7 @@ public class SearchQuery
return stats;
}
public RangeParameters getFacetRanges()
public List<RangeParameters> getFacetRanges()
{
return ranges;
}