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

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
           }

config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl

@@ -38,8 +38,7 @@
                 </#list>
              },
              </#if>
-             "index" : ${facet.index?c},
-             "isEnabled" : ${facet.enabled?c},
+             "isEnabled" : ${facet.isEnabled()?c},
              "isDefault" : ${facet.default?c}
 </#escape>
 </#macro>

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
    }
    

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/>
    

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;