From 890eb3b044c0aa7bdacb7f686844c51f7e3e41b7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 1 Dec 2022 22:55:09 +0100 Subject: Avoid Map.copyOf when you ahve a Map with well defined ordering that you want to preserve --- .../src/main/java/com/yahoo/vespa/model/AbstractService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'config-model') 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 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(" ")); } /** -- cgit v1.2.3