diff options
Diffstat (limited to 'container-core/src')
9 files changed, 28 insertions, 35 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java b/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java index da5b040e296..29a45c10af3 100644 --- a/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java +++ b/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java @@ -157,7 +157,7 @@ public class MockBundle implements Bundle, BundleWiring { @Override public Map<X509Certificate, List<X509Certificate>> getSignerCertificates(int signersType) { - return Collections.emptyMap(); + return Map.of(); } @SuppressWarnings("unchecked") diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index 1c325654f2e..71449d6edae 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -412,7 +412,7 @@ public class HttpRequest { Map<String, String> mask; Map<String, String> view; - mask = Objects.requireNonNullElse(parameterMask, Collections.emptyMap()); + mask = Objects.requireNonNullElse(parameterMask, Map.of()); view = new HashMap<>(parameters.size() + mask.size()); for (Map.Entry<String, List<String>> parameter : parameters.entrySet()) { if (existsAsOriginalParameter(parameter.getValue())) { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java index 4cb19653848..6d6635ecc94 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java @@ -3,10 +3,11 @@ package com.yahoo.container.jdisc.state; import com.yahoo.jdisc.Metric; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Objects; + +import static java.util.stream.Collectors.toUnmodifiableMap; /** * A context implementation whose identity is the key and values such that this can be used as @@ -41,16 +42,10 @@ public final class StateMetricContext implements MetricDimensions, Metric.Contex } public static StateMetricContext newInstance(Map<String, ?> properties) { - Map<String, String> data; - if (properties != null) { - data = new HashMap<>(properties.size()); - for (Map.Entry<String, ?> entry : properties.entrySet()) { - data.put(entry.getKey(), entry.getValue() != null ? entry.getValue().toString() : null); - } - data = Collections.unmodifiableMap(data); - } else { - data = Collections.emptyMap(); - } + Map<String, String> data = (properties != null) + ? properties.entrySet().stream().collect( + toUnmodifiableMap(Map.Entry::getKey, e -> Objects.requireNonNullElse(e.getValue(), "").toString())) + : Map.of(); return new StateMetricContext(data); } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java index b43281c524a..7e6b9b822ac 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java @@ -20,7 +20,6 @@ import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -134,7 +133,7 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh */ private static Map<String, List<String>> parseFormParameters(String formContent) { if (formContent.isEmpty()) { - return Collections.emptyMap(); + return Map.of(); } Map<String, List<String>> parameterMap = new HashMap<>(); 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()); |