[brooklyn-server] branch master updated: fix two places order of config keys / fields could be mangled

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new da7e46b  fix two places order of config keys / fields could be mangled
da7e46b is described below

commit da7e46b7ea251a6534cb644970cae9578eb783d9
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Tue Mar 9 02:21:59 2021 +0000

    fix two places order of config keys / fields could be mangled
    
    because (non-linked) HashMap was used; now use LinkedHashMap,
    preserve order of spec on the entity object
---
 .../brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java      | 2 +-
 .../brooklyn/camp/brooklyn/spi/creation/EntitySpecConfiguration.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
index ddfdd93..87355ef 100644
--- 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
+++ 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
@@ -175,7 +175,7 @@ public class BrooklynEntityMatcher implements PdpMatcher {
             if (items instanceof Map) {
                 Map<?, ?> itemMap = (Map<?, ?>) items;
                 if (!itemMap.isEmpty()) {
-                    builder.customAttribute(key, Maps.newHashMap(itemMap));
+                    builder.customAttribute(key, MutableMap.copyOf(itemMap));
                 }
             } else {
                 throw new IllegalArgumentException(key + " must be a map, is: 
" + items.getClass().getName());
diff --git 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/EntitySpecConfiguration.java
 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/EntitySpecConfiguration.java
index 5714523..2f9dea2 100644
--- 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/EntitySpecConfiguration.java
+++ 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/EntitySpecConfiguration.java
@@ -41,7 +41,7 @@ public class EntitySpecConfiguration {
     private Map<String, Object> specConfiguration;
 
     public EntitySpecConfiguration(Map<String, ?> specConfiguration) {
-        this.specConfiguration = 
Maps.newHashMap(checkNotNull(specConfiguration, "specConfiguration"));
+        this.specConfiguration = 
Maps.newLinkedHashMap(checkNotNull(specConfiguration, "specConfiguration"));
     }
 
     public Map<String, Object> getSpecConfiguration() {