Unify on Map.of

5 files changed, 18 insertions, 19 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
index aacc43d725b..e99f98cb842 100644
--- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
@@ -21,9 +21,9 @@ import com.yahoo.vespa.config.ConfigKey;
 import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -480,7 +480,7 @@ public class ComponentGraphTest {
         ComponentGraph graph = new ComponentGraph();
         graph.add(mockComponentNodeWithId(ExecutorProvider.class, "dummyId"));
         graph.complete();
-        graph.setAvailableConfigs(Collections.emptyMap());
+        graph.setAvailableConfigs(Map.of());
         return graph;
     }
 
@@ -607,7 +607,7 @@ public class ComponentGraphTest {
     }
 
     public static class ExecutorProvider implements Provider<Executor> {
-        private Executor executor = Executors.newSingleThreadExecutor();
+        private final Executor executor = Executors.newSingleThreadExecutor();
 
         public Executor get() {
             return executor;
diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
index 59c939863dd..17ead389c48 100644
--- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
@@ -16,7 +16,7 @@ import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.SimpleCompo
 import com.yahoo.vespa.config.ConfigKey;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -68,12 +68,12 @@ public class ReuseComponentsTest {
         Class<ComponentTakingConfig> componentClass = ComponentTakingConfig.class;
 
         ComponentGraph graph = buildGraph(componentClass);
-        graph.setAvailableConfigs(Collections.singletonMap(new ConfigKey<>(TestConfig.class, "component"),
+        graph.setAvailableConfigs(Map.of(new ConfigKey<>(TestConfig.class, "component"),
                 ConfigGetter.getConfig(TestConfig.class, "raw: stringVal \"oldConfig\"")));
         ComponentTakingConfig instance = getComponent(graph, componentClass);
 
         ComponentGraph newGraph = buildGraph(componentClass);
-        newGraph.setAvailableConfigs(Collections.singletonMap(new ConfigKey<>(TestConfig.class, "component"),
+        newGraph.setAvailableConfigs(Map.of(new ConfigKey<>(TestConfig.class, "component"),
                 ConfigGetter.getConfig(TestConfig.class, "raw: stringVal \"newConfig\"")));
         newGraph.reuseNodes(graph);
         ComponentTakingConfig instance2 = getComponent(newGraph, componentClass);
@@ -98,7 +98,7 @@ public class ReuseComponentsTest {
             graph.add(injectedComponent);
 
             graph.complete();
-            graph.setAvailableConfigs(Collections.singletonMap(new ConfigKey<>(TestConfig.class, configId),
+            graph.setAvailableConfigs(Map.of(new ConfigKey<>(TestConfig.class, configId),
                     ConfigGetter.getConfig(TestConfig.class, "raw: stringVal \"" + config + "\"")));
 
             return graph;
@@ -132,7 +132,7 @@ public class ReuseComponentsTest {
             }
 
             graph.complete();
-            graph.setAvailableConfigs(Collections.emptyMap());
+            graph.setAvailableConfigs(Map.of());
             return graph;
         };
 
@@ -163,7 +163,7 @@ public class ReuseComponentsTest {
             graph.add(injectedComponent);
 
             graph.complete();
-            graph.setAvailableConfigs(Collections.singletonMap(new ConfigKey<>(TestConfig.class, configId),
+            graph.setAvailableConfigs(Map.of(new ConfigKey<>(TestConfig.class, configId),
                     ConfigGetter.getConfig(TestConfig.class, "raw: stringVal \"" + config + "\"")));
 
             return graph;
@@ -188,7 +188,7 @@ public class ReuseComponentsTest {
             ComponentGraph graph = new ComponentGraph();
             graph.add(mockComponentNode(ComponentTakingExecutor.class, "dummyId"));
             graph.complete(ComponentGraphTest.singletonExecutorInjector);
-            graph.setAvailableConfigs(Collections.emptyMap());
+            graph.setAvailableConfigs(Map.of());
             return graph;
         };
 
@@ -224,7 +224,7 @@ public class ReuseComponentsTest {
 
     private void completeNode(ComponentNode node) {
         node.setArguments(new Object[0]);
-        node.setAvailableConfigs(Collections.emptyMap());
+        node.setAvailableConfigs(Map.of());
     }
 
     private ComponentGraph buildGraph(Class<?> componentClass) {
@@ -237,7 +237,7 @@ public class ReuseComponentsTest {
 
     private ComponentGraph buildGraphAndSetNoConfigs(Class<?> componentClass) {
         ComponentGraph g = buildGraph(componentClass);
-        g.setAvailableConfigs(Collections.emptyMap());
+        g.setAvailableConfigs(Map.of());
         return g;
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
index 3217bff4bb3..ccc7b22f348 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
@@ -3,8 +3,8 @@ package com.yahoo.container.jdisc.state;
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -29,8 +29,8 @@ public class MetricSnapshotTest {
 
     @Test
     void testEquality() {
-        assertEquals(Collections.unmodifiableMap(new HashMap(0)).hashCode(), Collections.emptyMap().hashCode());
-        assertEquals(Collections.unmodifiableMap(new HashMap(0)), Collections.emptyMap());
+        assertEquals(new HashMap(0).hashCode(), Map.of().hashCode());
+        assertEquals(new HashMap(0), Map.of());
     }
 
 }
diff --git a/container-core/src/test/java/com/yahoo/metrics/simple/PointTest.java b/container-core/src/test/java/com/yahoo/metrics/simple/PointTest.java
index 0368c925bcc..ad95c87ca8c 100644
--- a/container-core/src/test/java/com/yahoo/metrics/simple/PointTest.java
+++ b/container-core/src/test/java/com/yahoo/metrics/simple/PointTest.java
@@ -3,8 +3,8 @@ package com.yahoo.metrics.simple;
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,7 +15,7 @@ public class PointTest {
 
     @Test
     void testPointEquality() {
-        Point a = new Point(Collections.emptyMap());
+        Point a = new Point(Map.of());
         Point b = new Point(new HashMap<>(0));
         assertEquals(a.hashCode(), b.hashCode());
         assertEquals(a, b);
diff --git a/container-core/src/test/java/com/yahoo/metrics/simple/jdisc/SnapshotConverterTest.java b/container-core/src/test/java/com/yahoo/metrics/simple/jdisc/SnapshotConverterTest.java
index d8743d063fb..40ec5973510 100644
--- a/container-core/src/test/java/com/yahoo/metrics/simple/jdisc/SnapshotConverterTest.java
+++ b/container-core/src/test/java/com/yahoo/metrics/simple/jdisc/SnapshotConverterTest.java
@@ -14,7 +14,6 @@ import com.yahoo.metrics.simple.Point;
 import com.yahoo.metrics.simple.UntypedMetric;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,7 +28,7 @@ public class SnapshotConverterTest {
 
     @Test
     void testPointConversion() {
-        MetricDimensions a = SnapshotConverter.convert(new Point(Collections.emptyMap()));
+        MetricDimensions a = SnapshotConverter.convert(new Point(Map.of()));
         MetricDimensions b = SnapshotConverter.convert(new Point(new HashMap<>(0)));
         MetricDimensions c = SnapshotConverter.convert((Point) null);
         assertEquals(a.hashCode(), b.hashCode());