From 22e9af3abc8fce92cb1c2ed96f980d284bf782a9 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Sat, 20 Sep 2014 09:11:04 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    84922:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       83457:
 Refactoring the facetable properties.get response and some of the service
 API. Part of ACE-2639.       This checkin changes the JSON structure slightly
 (array, not map), adds a displayName.       The localised title and
 displayName are still in the server locale. I'll fix that to client locale
 next. Also need to add paging.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../facet/facetable-properties.get.json.ftl   | 24 +++++++++++--------
 .../scripts/facet/FacetablePropertiesGet.java |  5 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
index 5beb91fa53..a370d03f08 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
@@ -1,15 +1,19 @@
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-    "properties" : {
-        <#list properties as property>
-        "${property.second.name.prefixString}" : {
-             <#if property.first??>
-             "title" : "${property.first}",
-             </#if>
-             "dataType" : "${property.second.dataType.name.prefixString}",
-             "modelQName" : "${property.second.model.name.prefixString}"
-        }<#if property_has_next>,</#if>
-        </#list>
+    "data" : {
+        "properties" : [
+            <#list properties as property>
+            {
+                "name" : "${property.propertyDefinition.name.prefixString}",
+                <#if property.localisedTitle??>
+                "title" : "${property.localisedTitle}",
+                </#if>
+                "displayName" : "${property.displayName}",
+                "dataType" : "${property.propertyDefinition.dataType.name.prefixString}",
+                "modelQName" : "${property.propertyDefinition.model.name.prefixString}"
+            }<#if property_has_next>,</#if>
+            </#list>
+        ]
     }
 }
 </#escape>
diff --git a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
index 1d693e65c8..2a370c046e 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
@@ -23,11 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetService.FacetablePropertyData;
 import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.Cache;
@@ -73,7 +72,7 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
         
         final Map<String, Object> model = new HashMap<>();
         
-        final Set<Pair<String, PropertyDefinition>> facetableProperties;
+        final Set<FacetablePropertyData> facetableProperties;
         if (contentClassQName == null)
         {
             facetableProperties = facetService.getFacetableProperties();