From a41389abcb21aef0df146f7bb06b8f5728255e03 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Fri, 24 Mar 2017 13:15:16 +0000
Subject: [PATCH] Merged searchbcr (5.2.1) to 5.2.N (5.2.1)    135772 gjames:
 SEARCH-419: Correct handling of fieldfacet label and exclusion filters

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/rest/api/search/impl/SearchMapper.java |  7 ++-----
 .../alfresco/rest/api/search/SearchMapperTests.java | 13 -------------
 2 files changed, 2 insertions(+), 18 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 334f64e252..b0af410c63 100644
--- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -357,11 +357,6 @@ public class SearchMapper
                 {
                     ParameterCheck.mandatoryString("facetFields facet field", facet.getField());
                     String field = facet.getField();
-                    if (facet.getExcludeFilters() != null && !facet.getExcludeFilters().isEmpty())
-                    {
-                        int startIndex = field.startsWith("{!afts")?7:0;
-                        field = "{!afts ex="+String.join(",", facet.getExcludeFilters())+"}"+field.substring(startIndex);
-                    }
 
                     FieldFacet ff = new FieldFacet(field);
 
@@ -390,6 +385,8 @@ public class SearchMapper
                     }
 
                     ff.setPrefix(facet.getPrefix());
+                    ff.setLabel(facet.getLabel());
+                    ff.setExcludeFilters(facet.getExcludeFilters());
                     ff.setCountDocsMissingFacetField(facet.getMissing());
                     ff.setLimitOrNull(facet.getLimit());
                     ff.setOffset(facet.getOffset());
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 956e4fd363..7d4349b9d2 100644
--- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -520,19 +520,6 @@ public class SearchMapperTests
         assertEquals("ENUM" ,ff.getMethod().toString());
     }
 
-    @Test
-    public void fromMultiSelectFacetFields() throws Exception
-    {
-        SearchParameters searchParameters = new SearchParameters();
-        searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null,"INDEX","ENUM",null,null,null,null,Arrays.asList("tag1"),null))));
-        FieldFacet ff = searchParameters.getFieldFacets().get(0);
-        assertEquals("{!afts ex=tag1}myfield" , ff.getField());
-        searchParameters = new SearchParameters();
-        searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("{!afts}thefield",null,null,null,null,null,null,null,null,Arrays.asList("tag5"),null))));
-        ff = searchParameters.getFieldFacets().get(0);
-        assertEquals("{!afts ex=tag5}thefield" , ff.getField());
-    }
-
     @Test
     public void fromLimits() throws Exception
     {