Merge pull request #25084 from vespa-engine/balder/make-sentinel-config-generation-well-defined

Avoid Map.copyOf when you ahve a Map with well defined ordering that …

2 files changed, 4 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index ed751ef246e..d50f0336baf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -8,6 +8,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.defaults.Defaults;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -410,11 +411,12 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
 
     @Override
     public Map<String, Object> getEnvVars() {
-        return Map.copyOf(environmentVariables);
+        return Collections.unmodifiableMap(environmentVariables);
     }
 
     public String getEnvStringForTesting() {
-        return environmentVariables.entrySet().stream().map(e -> e.getKey() + '=' + toEnvValue(e.getValue())).collect(Collectors.joining(" "));
+        return environmentVariables.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .map(e -> e.getKey() + '=' + toEnvValue(e.getValue())).collect(Collectors.joining(" "));
     }
 
     /**
diff --git a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
index c42e632cc88..8c915567905 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
@@ -2,11 +2,8 @@
 package com.yahoo.document.select.rule;
 
 import com.yahoo.document.BucketIdFactory;
-import com.yahoo.document.DocumentGet;
 import com.yahoo.document.DocumentOperation;
 import com.yahoo.document.DocumentPut;
-import com.yahoo.document.DocumentRemove;
-import com.yahoo.document.DocumentType;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.select.BucketSet;
 import com.yahoo.document.select.Context;