diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-02-02 21:50:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-02 21:50:59 +0100 |
commit | 19b00b8a3506a1158d9807238f2f3c0168e56a86 (patch) | |
tree | 737ff01dd86dc1844afcd6de59c02071cd8ca40c /config-model/src/main/java/com/yahoo/config | |
parent | 7b56c57270e651bb7ad0dbe0a3a761c656b919f1 (diff) |
Revert "Use LinkedHashMap to get deterministic config order"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java index bbff0c26614..e22897903db 100644 --- a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java +++ b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java @@ -14,7 +14,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +33,7 @@ public class ModelNode<MODEL extends ConfigModel> implements ConfigModelInstance final Class<MODEL> clazz; final Constructor<MODEL> constructor; final List<MODEL> instances = new ArrayList<>(); - private final Map<ComponentId, ModelNode> dependencies = new LinkedHashMap<>(); + private final Map<ComponentId, ModelNode> dependencies = new HashMap<>(); public ModelNode(ConfigModelBuilder<MODEL> builder) { this.id = builder.getId(); diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index f12b7697ef1..8bf6dc7f1d9 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; @@ -56,7 +56,7 @@ public class InMemoryProvisioner implements HostProvisioner { private final Map<ClusterSpec, List<HostSpec>> allocations = new LinkedHashMap<>(); /** Indexes must be unique across all groups in a cluster */ - private final Map<Pair<ClusterSpec.Type, ClusterSpec.Id>, Integer> nextIndexInCluster = new LinkedHashMap<>(); + private final Map<Pair<ClusterSpec.Type, ClusterSpec.Id>, Integer> nextIndexInCluster = new HashMap<>(); /** Use this index as start index for all clusters */ private final int startIndexForClusters; |