From 383b977c082678c0b4fac35eba75b8c3a965321d Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 3 Sep 2014 16:18:39 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    80669:
 Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       78166: ACE-1582:
 Enhancements to the facet service to persist only the modified value(s)
 rather than the whole facet's properties. Also fixed facets cache and facets
 reordering NPE.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../solr/facet/solr-facet-config-admin.get.desc.xml          | 1 -
 .../solr/facet/solr-facet-config-admin.get.json.ftl          | 5 ++---
 .../solr/facet/solr-facet-config-admin.post.desc.xml         | 1 -
 .../solr/facet/solr-facet-config-admin.put.desc.xml          | 1 -
 .../solr/facet/AbstractSolrFacetConfigAdminWebScript.java    | 2 --
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml
index a9b549900a..a8f655f3fb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml
@@ -27,7 +27,6 @@
                      "site2",
                      "site1"
               ],
-             "index" : 5,
              "isEnabled" : true,
              "isDefault" : true
           }
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl
index 6d185a82c0..07be33dcb8 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl
@@ -36,10 +36,9 @@
                     "title" : <#if propDetails.title??>"${propDetails.title}"<#else>null</#if>
                 }<#if propDetails_has_next>,</#if>
                 </#list>
-             },   
+             },
              </#if>
-             "index" : ${facet.index?c},
-             "isEnabled" : ${facet.enabled?c},
+             "isEnabled" : ${facet.isEnabled()?c},
              "isDefault" : ${facet.default?c}
 </#escape>
 </#macro>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
index 317b93120b..e1ec41b141 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
@@ -23,7 +23,6 @@
                      "site2",
                      "site1"
               ],
-             "index" : 6, // optional 
              "isEnabled" : true  // optional
    }
    
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
index 65064b2602..080373fb2b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
@@ -25,7 +25,6 @@
                      "site2",
                      "site1"
               ],
-             "index" : 6,  // optional
              "isEnabled" : true  // optional
    }</pre><br/>
    
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
index 6a40a83bb6..e8d51aee8b 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
@@ -112,7 +112,6 @@ public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeW
             final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH);
             final String sortBy = json.getString(PARAM_SORT_BY);
             final String scope = json.getString(PARAM_SCOPE);
-            final int index = getValue(Integer.class, json.opt(PARAM_INDEX), facetService.getNextIndex());
             final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), true);
             JSONArray scopedSitesJsonArray = json.getJSONArray(PARAM_SCOPED_SITES);
             Set<String> scopedSites = null;
@@ -136,7 +135,6 @@ public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeW
                         .minFilterValueLength(minFilterValueLength)
                         .sortBy(sortBy)
                         .scope(scope)
-                        .index(index)
                         .isEnabled(isEnabled)
                         .scopedSites(scopedSites).build();
             return fp;