From 16a9bda8593cef6eaa89606fa03fe966287219d1 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:15:27 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 137054 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1) 136777 msuzuki: Search-340, renamed range to ranges git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/search/impl/SearchMapper.java | 2 +- .../org/alfresco/rest/api/search/SearchMapperTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 bc8164fa71..a1c46bf024 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -539,7 +539,7 @@ public class SearchMapper ParameterCheck.mandatory("start", rangeParams.getStart()); ParameterCheck.mandatory("end", rangeParams.getEnd()); ParameterCheck.mandatory("gap", rangeParams.getGap()); - sp.setRange(rangeParams); + sp.setRanges(rangeParams); } } diff --git a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java index fc5fd7dc4c..c085b60001 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java @@ -901,11 +901,11 @@ public class SearchMapperTests } rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null); searchMapper.fromRange(searchParameters, rangeParams); - assertEquals(searchParameters.getRange(), rangeParams); + assertEquals(searchParameters.getRanges(), rangeParams); rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null); searchMapper.fromRange(searchParameters, rangeParams); - assertEquals(searchParameters.getRange(), rangeParams); + assertEquals(searchParameters.getRanges(), rangeParams); }