From 2a2fe5c59e66d1ac153c862203467c1efa082cc6 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 1 Jun 2017 11:23:07 +0000
Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1)    137016 gjames:
 SEARCH-340: Changing range tags to label

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/rest/api/search/impl/SearchMapper.java | 2 +-
 .../org/alfresco/rest/api/search/SearchMapperTests.java         | 2 +-
 2 files changed, 2 insertions(+), 2 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 3da76c3d49..d423ddbd19 100644
--- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -638,7 +638,7 @@ public class SearchMapper
             {
                 for (RangeParameters aRange:ranges)
                 {
-                    if (aRange.getTags().contains(aPivot.getKey()))
+                    if (aPivot.getKey().equals(aRange.getLabel()))
                     {
                         pivotKey = aPivot.getKey();
                         if (pivotKeys.isEmpty())
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 9acfb887ae..5ace2dae64 100644
--- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -947,7 +947,7 @@ public class SearchMapperTests
         facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
         facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null));
         ff = new FacetFields(facets);
-        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,Arrays.asList("hope"),null));
+        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,"hope",null));
         searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, rangeParams,
                     Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", Arrays.asList(new Pivot("hope", null)))), searchRequestContext);
         assertEquals(2 ,searchParameters.getPivots().size());