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

137048 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136744 msuzuki: Search-340, amend naming to match json param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/search/impl/SearchMapper.java

@@ -76,7 +76,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Optional;
-import java.util.TimeZone;
 import java.util.regex.Matcher;
 
 /**
@@ -122,7 +121,7 @@ public class SearchMapper
         fromSpellCheck(sp, searchQuery.getSpellcheck());
         fromHighlight(sp, searchQuery.getHighlight());
         fromFacetIntervals(sp, searchQuery.getFacetIntervals());
-        fromFacetRange(sp, searchQuery.getFacetRange());
+        fromRange(sp, searchQuery.getFacetRange());
         fromScope(sp, searchQuery.getScope(), searchRequestContext);
         fromLimits(sp, searchQuery.getLimits());
         fromTimezone(sp, searchQuery.getTimezone());
@@ -529,11 +528,11 @@ public class SearchMapper
      * @param sp SearchParameters
      * @param rangeParams RangeParameters
      */
-    public void fromFacetRange(SearchParameters sp, RangeParameters rangeParams)
+    public void fromRange(SearchParameters sp, RangeParameters rangeParams)
     {
         if(rangeParams != null)
         {
-            ParameterCheck.mandatory("facetRange", rangeParams);
+            ParameterCheck.mandatory("range", rangeParams);
             ParameterCheck.mandatory("field ", rangeParams.getField());
             ParameterCheck.mandatory("facet range start ", rangeParams.getStart());
             ParameterCheck.mandatory("facet range end ", rangeParams.getEnd());

source/java/org/alfresco/rest/api/search/model/SearchQuery.java

@@ -61,7 +61,7 @@ public class SearchQuery
     private final boolean includeRequest;
     private final List<Pivot> pivots;
     private final List<StatsRequestParameters> stats;
-    private final RangeParameters facetRange;
+    private final RangeParameters range;
     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("facetRange") RangeParameters facetRange,
+                @JsonProperty("range") RangeParameters range,
                 @JsonProperty("timezone") String timezone)
     {
         this.query = query;
@@ -108,7 +108,7 @@ public class SearchQuery
         this.facetIntervals = facetIntervals;
         this.pivots = pivots;
         this.stats = stats;
-        this.facetRange = facetRange;
+        this.range = range;
         this.timezone = timezone;
     }
 
@@ -203,7 +203,7 @@ public class SearchQuery
 
     public RangeParameters getFacetRange()
     {
-        return facetRange;
+        return range;
     }
 
     public String getTimezone()

source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java

@@ -890,7 +890,7 @@ public class SearchMapperTests
         RangeParameters rangeParams = new RangeParameters(null, null, null, null,false,null,null,null,null);
         try
         {
-            searchMapper.fromFacetRange(searchParameters, rangeParams);
+            searchMapper.fromRange(searchParameters, rangeParams);
             fail();
         }
         catch (IllegalArgumentException iae)
@@ -898,11 +898,11 @@ public class SearchMapperTests
             assertNotNull(iae);
         }
         rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null);
-        searchMapper.fromFacetRange(searchParameters, rangeParams);
+        searchMapper.fromRange(searchParameters, rangeParams);
         assertEquals(searchParameters.getRange(), rangeParams);
         
         rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null);
-        searchMapper.fromFacetRange(searchParameters, rangeParams);
+        searchMapper.fromRange(searchParameters, rangeParams);
         assertEquals(searchParameters.getRange(), rangeParams);
         
     }

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\"}],"
-                + "\"facetRange\": {\"field\": \"content.size\",\"facet.range.start\": \"0\",\"facet.range.end\": \"300\",\"facet.range.gap\": \"100\"},"
+                + "\"range\": {\"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}]"