You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/07 20:59:13 UTC

svn commit: r1773146 - /sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java

Author: sseifert
Date: Wed Dec  7 20:59:13 2016
New Revision: 1773146

URL: http://svn.apache.org/viewvc?rev=1773146&view=rev
Log:
SLING-6338 keep property order

Modified:
    sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java

Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1773146&r1=1773145&r2=1773146&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java Wed Dec  7 20:59:13 2016
@@ -21,11 +21,12 @@ package org.apache.sling.caconfig.manage
 import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.lang3.ClassUtils;
@@ -117,12 +118,12 @@ final class ConfigurationDataImpl implem
     @Override
     public Set<String> getPropertyNames() {
         if (propertyNamesCache == null) {
-            propertyNamesCache = new HashSet<>();
+            propertyNamesCache = new LinkedHashSet<>();
             if (configMetadata != null) {
                 propertyNamesCache.addAll(configMetadata.getPropertyMetadata().keySet());
             }
             if (resolvedConfigurationResource != null) {
-                propertyNamesCache.addAll(ResourceUtil.getValueMap(resolvedConfigurationResource).keySet());
+                propertyNamesCache.addAll(new TreeSet<>(ResourceUtil.getValueMap(resolvedConfigurationResource).keySet()));
             }
             PropertiesFilter.removeIgnoredProperties(propertyNamesCache);
         }