Fix test clusters to respect user-provided ordering of settings.

This is necessary when configuring dependent settings, such as loggers.

Author: mosche

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

@@ -50,6 +50,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -408,7 +409,7 @@ private void writeConfiguration() {
 
             try {
                 // Write settings to elasticsearch.yml
-                Map<String, String> finalSettings = new HashMap<>();
+                Map<String, String> finalSettings = new LinkedHashMap<>();
                 finalSettings.put("cluster.name", spec.getCluster().getName());
                 if (name != null) {
                     finalSettings.put("node.name", name);

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalSpecBuilder.java

@@ -21,7 +21,8 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -32,7 +33,7 @@
 public abstract class AbstractLocalSpecBuilder<T extends LocalSpecBuilder<?>> implements LocalSpecBuilder<T> {
     private final AbstractLocalSpecBuilder<?> parent;
     private final List<SettingsProvider> settingsProviders = new ArrayList<>();
-    private final Map<String, String> settings = new HashMap<>();
+    private final Map<String, String> settings = new LinkedHashMap<>();
     private final List<EnvironmentProvider> environmentProviders = new ArrayList<>();
     private final Map<String, String> environment = new HashMap<>();
     private final Map<String, DefaultPluginInstallSpec> modules = new HashMap<>();
@@ -321,7 +322,7 @@ private <T> List<T> inherit(Supplier<List<T>> parent, List<T> child) {
     }
 
     private <T> Set<T> inherit(Supplier<Set<T>> parent, Set<T> child) {
-        Set<T> combinedSet = new HashSet<>();
+        Set<T> combinedSet = new LinkedHashSet<>();
         if (this.parent != null) {
             combinedSet.addAll(parent.get());
         }
@@ -330,7 +331,7 @@ private <T> Set<T> inherit(Supplier<Set<T>> parent, Set<T> child) {
     }
 
     private <K, V> Map<K, V> inherit(Supplier<Map<K, V>> parent, Map<K, V> child) {
-        Map<K, V> combinedMap = new HashMap<>();
+        Map<K, V> combinedMap = new LinkedHashMap<>();
         if (this.parent != null) {
             combinedMap.putAll(parent.get());
         }

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java

@@ -21,6 +21,7 @@
 
 import java.nio.file.Path;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -236,7 +237,7 @@ public boolean hasRole(String role) {
          * @return the configured setting value or provided default
          */
         public String getSetting(String setting, String defaultValue) {
-            Map<String, String> allSettings = new HashMap<>();
+            Map<String, String> allSettings = new LinkedHashMap<>();
             allSettings.putAll(resolveSettings());
             allSettings.putAll(resolveKeystore());
 
@@ -255,7 +256,7 @@ public String getSetting(String setting, String defaultValue) {
          * @return resolved settings for node
          */
         public Map<String, String> resolveSettings() {
-            Map<String, String> resolvedSettings = new HashMap<>();
+            Map<String, String> resolvedSettings = new LinkedHashMap<>();
             settingsProviders.forEach(p -> resolvedSettings.putAll(p.get(getFilteredSpec(p, null))));
             resolvedSettings.putAll(settings);
             return resolvedSettings;