fixed wrong use of HashMap vs. LinkedHashMap in policy model

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
eclipse-ditto · Sep 14, 2023 · e704ce9 · e704ce9
1 parent 7a6372a
commit e704ce9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java
@@ -17,9 +17,9 @@
 
 import java.text.MessageFormat;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -56,7 +56,7 @@ private ImmutablePolicyImports() {
 
     private ImmutablePolicyImports(final Map<PolicyId, PolicyImport> policyImports) {
         checkNotNull(policyImports, POLICY_IMPORTS);
-        this.policyImports = Collections.unmodifiableMap(new HashMap<>(policyImports));
+        this.policyImports = Collections.unmodifiableMap(new LinkedHashMap<>(policyImports));
     }
 
     /**
@@ -69,7 +69,7 @@ private ImmutablePolicyImports(final Map<PolicyId, PolicyImport> policyImports)
     public static ImmutablePolicyImports of(final Iterable<PolicyImport> policyImports) {
         checkNotNull(policyImports, POLICY_IMPORTS);
 
-        final Map<PolicyId, PolicyImport> resourcesMap = new HashMap<>();
+        final Map<PolicyId, PolicyImport> resourcesMap = new LinkedHashMap<>();
         policyImports.forEach(policyImport -> {
             final PolicyImport existingPolicyImport =
                     resourcesMap.put(policyImport.getImportedPolicyId(), policyImport);
@@ -152,7 +152,7 @@ private PolicyImports createNewPolicyImportsWithNewPolicyImport(final PolicyImpo
     }
 
     private Map<PolicyId, PolicyImport> copyPolicyImports() {
-        return new HashMap<>(policyImports);
+        return new LinkedHashMap<>(policyImports);
     }
 
     @Override

diff --git a/...ies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/ResourceNode.java b/...ies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/ResourceNode.java
@@ -16,8 +16,8 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -47,7 +47,7 @@ final class ResourceNode implements PolicyTreeNode {
     private ResourceNode(final PolicyTreeNode parent, final String name, final EffectedPermissions permissions) {
         this.parent = parent;
         this.name = name;
-        children = new HashMap<>();
+        children = new LinkedHashMap<>();
         this.permissions = permissions;
         absolutePointer = null;
     }

diff --git a/...cies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/SubjectNode.java b/...cies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/SubjectNode.java
@@ -14,7 +14,7 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -27,7 +27,7 @@
 final class SubjectNode implements PolicyTreeNode {
 
     private final String name;
-    private final Map<String, PolicyTreeNode> children = new HashMap<>();
+    private final Map<String, PolicyTreeNode> children = new LinkedHashMap<>();
 
     private SubjectNode(final String name) {
         this.name = name;