diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java index a1c46bf024..1b0ec4944d 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -123,7 +123,7 @@ public class SearchMapper fromSpellCheck(sp, searchQuery.getSpellcheck()); fromHighlight(sp, searchQuery.getHighlight()); fromFacetIntervals(sp, searchQuery.getFacetIntervals()); - fromRange(sp, searchQuery.getFacetRange()); + fromRange(sp, searchQuery.getFacetRanges()); fromScope(sp, searchQuery.getScope(), searchRequestContext); fromLimits(sp, searchQuery.getLimits()); fromTimezone(sp, searchQuery.getTimezone()); @@ -534,7 +534,7 @@ public class SearchMapper { if(rangeParams != null) { - ParameterCheck.mandatory("range", rangeParams); + ParameterCheck.mandatory("ranges", rangeParams); ParameterCheck.mandatory("field", rangeParams.getField()); ParameterCheck.mandatory("start", rangeParams.getStart()); ParameterCheck.mandatory("end", rangeParams.getEnd()); diff --git a/source/java/org/alfresco/rest/api/search/model/SearchQuery.java b/source/java/org/alfresco/rest/api/search/model/SearchQuery.java index 1e8cf9ce60..a680966493 100644 --- a/source/java/org/alfresco/rest/api/search/model/SearchQuery.java +++ b/source/java/org/alfresco/rest/api/search/model/SearchQuery.java @@ -61,7 +61,7 @@ public class SearchQuery private final boolean includeRequest; private final List pivots; private final List stats; - private final RangeParameters range; + private final 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 pivots, @JsonProperty("stats") List stats, - @JsonProperty("range") RangeParameters range, + @JsonProperty("ranges") RangeParameters ranges, @JsonProperty("timezone") String timezone) { this.query = query; @@ -108,7 +108,7 @@ public class SearchQuery this.facetIntervals = facetIntervals; this.pivots = pivots; this.stats = stats; - this.range = range; + this.ranges = ranges; this.timezone = timezone; } @@ -201,9 +201,9 @@ public class SearchQuery return stats; } - public RangeParameters getFacetRange() + public RangeParameters getFacetRanges() { - return range; + return ranges; } public String getTimezone() diff --git a/source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java b/source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java index fc020968a0..8f4e5f7699 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java @@ -164,7 +164,7 @@ public class SearchQuerySerializerTests assertEquals("cm:creator",searchQuery.getStats().get(0).getField()); assertEquals("mylabel",searchQuery.getStats().get(0).getLabel()); //Range Facet - RangeParameters range = searchQuery.getFacetRange(); + RangeParameters range = searchQuery.getFacetRanges(); assertNotNull(range); } diff --git a/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java b/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java index 4fec1f7173..10ed2d8c94 100644 --- a/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java +++ b/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java @@ -64,7 +64,7 @@ public class SerializerTestHelper implements RequestReader + "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}, {\"field\": \"owner\",\"label\": \"ownerLabel\"}]}," + "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}]," + "\"pivots\": [{\"key\": \"mylabel\"}]," - + "\"range\": {\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\"}," + + "\"ranges\": {\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\"}," + "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]" + ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\"," + "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"