Use LinkedHashMap to get deterministic config order

5 files changed, 9 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java
index c302ef63cfd..928afdaba13 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.Expression;
 import com.yahoo.vespa.indexinglanguage.expressions.IndexExpression;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -33,7 +33,7 @@ public class MatchConsistency extends Processor {
     public void process(boolean validate, boolean documentsOnly) {
         if ( ! validate) return;
 
-        Map<String, Matching.Type> types = new HashMap<>();
+        Map<String, Matching.Type> types = new LinkedHashMap<>();
         for (SDField field : schema.allConcreteFields()) {
             new MyVisitor(schema, field, types).visit(field.getIndexingScript());
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java
index 2d0afe88281..5d98439f0cd 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.processing;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import com.yahoo.collections.Pair;
@@ -29,7 +29,7 @@ public class SummaryNamesFieldCollisions extends Processor {
     public void process(boolean validate, boolean documentsOnly) {
         if ( ! validate) return;
 
-        Map<String, Pair<String, String>> fieldToClassAndSource = new HashMap<>();
+        Map<String, Pair<String, String>> fieldToClassAndSource = new LinkedHashMap<>();
         for (DocumentSummary summary : schema.getSummaries().values()) {
             if ("default".equals(summary.getName())) continue;
             for (SummaryField summaryField : summary.getSummaryFields().values()) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java
index 68bf2511a4b..fdb8da0715a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -32,7 +32,7 @@ public class ValidateFieldTypes extends Processor {
         if (!validate) return;
 
         String searchName = schema.getName();
-        Map<String, DataType> seenFields = new HashMap<>();
+        Map<String, DataType> seenFields = new LinkedHashMap<>();
         verifySearchAndDocFields(searchName, seenFields);
         verifySummaryFields(searchName, seenFields);
     }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java
index e8b218a80ad..6fcfadca5b6 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java
@@ -7,7 +7,7 @@ import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Schema;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class ValidateFieldTypesDocumentsOnly extends ValidateFieldTypes {
@@ -20,7 +20,7 @@ public class ValidateFieldTypesDocumentsOnly extends ValidateFieldTypes {
         if ( ! validate) return;
 
         String searchName = schema.getName();
-        Map<String, DataType> seenFields = new HashMap<>();
+        Map<String, DataType> seenFields = new LinkedHashMap<>();
         verifySearchAndDocFields(searchName, seenFields);
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java
index d99832e3df6..a8322f83715 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java
@@ -12,7 +12,7 @@ import com.yahoo.document.StructDataType;
 import com.yahoo.searchdefinition.document.SDDocumentType;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.HashSet;
 import java.util.Set;