Merge pull request #30882 from vespa-engine/balder/set-dot-of

Balder/set dot of

8 files changed, 26 insertions, 37 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java
index fcccc02d143..5a04bd8eae1 100644
--- a/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java
+++ b/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java
@@ -8,7 +8,6 @@ import com.yahoo.container.di.config.Subscriber;
 import com.yahoo.container.di.config.SubscriberFactory;
 import com.yahoo.vespa.config.ConfigKey;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
@@ -135,7 +134,7 @@ public final class ConfigRetriever {
 
     private void resetComponentSubscriberIfBootstrap(ConfigSnapshot configSnapshot) {
         if (configSnapshot instanceof BootstrapConfigs) {
-            setupComponentSubscriber(Collections.emptySet());
+            setupComponentSubscriber(Set.of());
         }
     }
 
diff --git a/container-core/src/main/java/com/yahoo/container/di/Osgi.java b/container-core/src/main/java/com/yahoo/container/di/Osgi.java
index 0ff640031fc..7bab8605a3e 100644
--- a/container-core/src/main/java/com/yahoo/container/di/Osgi.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Osgi.java
@@ -10,8 +10,6 @@ import org.osgi.framework.Bundle;
 import java.util.Collection;
 import java.util.Set;
 
-import static java.util.Collections.emptySet;
-
 /**
  * This interface has default implementations of all methods, to allow using it
  * for testing, instead of mocking or a test implementation.
@@ -49,7 +47,7 @@ public interface Osgi {
      * @return The set of bundles that are no longer needed by the new or latest good generation.
      */
     default Set<Bundle> completeBundleGeneration(GenerationStatus status) {
-        return emptySet();
+        return Set.of();
     }
 
     default Class<?> resolveClass(BundleInstantiationSpecification spec) {
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
index ca10072c6c9..8b5fb128e2b 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
@@ -8,10 +8,8 @@ import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.vespa.config.ConfigKey;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @author Tony Vaagenes
@@ -20,7 +18,7 @@ import java.util.stream.Collectors;
  */
 public class ComponentRegistryNode extends Node {
 
-    private static ComponentId componentRegistryNamespace = ComponentId.fromString("ComponentRegistry");
+    private static final ComponentId componentRegistryNamespace = ComponentId.fromString("ComponentRegistry");
 
     private final Class<?> componentClass;
 
@@ -63,7 +61,7 @@ public class ComponentRegistryNode extends Node {
 
     @Override
     public Set<ConfigKey<ConfigInstance>> configKeys() {
-        return Collections.emptySet();
+        return Set.of();
     }
 
     @Override
@@ -76,8 +74,7 @@ public class ComponentRegistryNode extends Node {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof ComponentRegistryNode) {
-            ComponentRegistryNode that = (ComponentRegistryNode) other;
+        if (other instanceof ComponentRegistryNode that) {
             return this.componentId().equals(that.componentId()) && this.instanceType().equals(that.instanceType())
                     && equalNodeEdges(this.usedComponents(), that.usedComponents());
         } else {
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
index 936eadb0b3c..8e6a39a4921 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
@@ -7,7 +7,6 @@ import com.yahoo.config.ConfigInstance;
 import com.yahoo.vespa.config.ConfigKey;
 
 import java.lang.annotation.Annotation;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -24,8 +23,7 @@ public final class GuiceNode extends Node {
     private final Object myInstance;
     private final Annotation annotation;
 
-    public GuiceNode(Object myInstance,
-                     Annotation annotation) {
+    public GuiceNode(Object myInstance, Annotation annotation) {
         super(componentId(myInstance));
         this.myInstance = myInstance;
         this.annotation = annotation;
@@ -33,7 +31,7 @@ public final class GuiceNode extends Node {
 
     @Override
     public Set<ConfigKey<ConfigInstance>> configKeys() {
-        return Collections.emptySet();
+        return Set.of();
     }
 
     @Override
@@ -54,7 +52,7 @@ public final class GuiceNode extends Node {
 
     @Override
     public List<Node> usedComponents() {
-        return Collections.emptyList();
+        return List.of();
     }
 
     @Override
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index 165330662a9..894a231f9be 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,7 +90,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
 
             @Override
             protected Iterable<ByteBuffer> responseContent() {
-                return Collections.singleton(ByteBuffer.wrap(buildMetricOutput(request.getUri().getQuery())));
+                return Set.of(ByteBuffer.wrap(buildMetricOutput(request.getUri().getQuery())));
             }
         }.dispatch(handler);
 
@@ -160,7 +159,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
     }
 
     private List<JsonNode> getPacketsForSnapshot(MetricSnapshot metricSnapshot, String application, long timestamp) {
-        if (metricSnapshot == null) return Collections.emptyList();
+        if (metricSnapshot == null) return List.of();
 
         List<JsonNode> packets = new ArrayList<>();
 
@@ -178,9 +177,9 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
     }
 
     private List<JsonNode> getPacketsForSnapshot(MetricSnapshot metricSnapshot, String metricSetId, String application, long timestamp) {
-        if (metricSnapshot == null) return Collections.emptyList();
+        if (metricSnapshot == null) return List.of();
         if (metricSetId == null) return getPacketsForSnapshot(metricSnapshot, application, timestamp);
-        Set<String> configuredMetrics = metricSets.getOrDefault(metricSetId, Collections.emptySet());
+        Set<String> configuredMetrics = metricSets.getOrDefault(metricSetId, Set.of());
         List<JsonNode> packets = new ArrayList<>();
 
         for (Map.Entry<MetricDimensions, MetricSet> snapshotEntry : metricSnapshot) {
diff --git a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
index 8c94b5f9a93..7e5cc5187ba 100644
--- a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -90,9 +89,9 @@ public class ChainBuilderTest {
     @Test
     void testPhaseAndSearcher() {
         ChainBuilder depHandler = newChainBuilder();
-        depHandler.addPhase(new Phase("phase1", set("phase2"), Collections.<String>emptySet()));
+        depHandler.addPhase(new Phase("phase1", set("phase2"), Set.of()));
         depHandler.addPhase(new Phase("phase2", set("phase3"), set("phase1")));
-        depHandler.addPhase(new Phase("phase3", Collections.<String>emptySet(), set("phase2", "phase1")));
+        depHandler.addPhase(new Phase("phase3", Set.of(), set("phase2", "phase1")));
         ChainedComponent first = new First();
         ChainedComponent second = new Second();
 
@@ -172,9 +171,9 @@ public class ChainBuilderTest {
 
     private ChainBuilder createDependencyHandler() {
         ChainBuilder chainBuilder = newChainBuilder();
-        chainBuilder.addPhase(new Phase("phase1", Collections.<String>emptySet(), Collections.<String>emptySet()));
-        chainBuilder.addPhase(new Phase("phase2", Collections.<String>emptySet(), Collections.<String>emptySet()));
-        chainBuilder.addPhase(new Phase("phase3", Collections.<String>emptySet(), Collections.<String>emptySet()));
+        chainBuilder.addPhase(new Phase("phase1", Set.of(), Set.of()));
+        chainBuilder.addPhase(new Phase("phase2", Set.of(), Set.of()));
+        chainBuilder.addPhase(new Phase("phase3", Set.of(), Set.of()));
         return chainBuilder;
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java b/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
index 14349d4cd51..7240b6510c5 100644
--- a/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
@@ -15,7 +15,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -45,7 +44,7 @@ public class ConfigRetrieverTest {
     void require_that_bootstrap_configs_come_first() {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, true);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Set.of(), 0, true);
 
         assertTrue(bootstrapConfigs instanceof BootstrapConfigs);
         retriever.shutdown();
@@ -56,10 +55,10 @@ public class ConfigRetrieverTest {
     void require_that_components_comes_after_bootstrap() {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, true);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Set.of(), 0, true);
 
         ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId());
-        ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0, true);
+        ConfigSnapshot componentsConfigs = retriever.getConfigs(Set.of(testConfigKey), 0, true);
 
         if (componentsConfigs instanceof ComponentsConfigs) {
             assertEquals(3, componentsConfigs.size());
@@ -75,8 +74,8 @@ public class ConfigRetrieverTest {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
         ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId());
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, true);
-        ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0, true);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Set.of(), 0, true);
+        ConfigSnapshot componentsConfigs = retriever.getConfigs(Set.of(testConfigKey), 0, true);
         Set<ConfigKey<? extends ConfigInstance>> keys = new HashSet<>();
         keys.add(testConfigKey);
         keys.add(new ConfigKey<>(TestConfig.class, ""));
@@ -92,8 +91,8 @@ public class ConfigRetrieverTest {
     void require_that_empty_components_keys_after_bootstrap_returns_components_configs() {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
-        assertTrue(retriever.getConfigs(Collections.emptySet(), 0, true) instanceof BootstrapConfigs);
-        assertTrue(retriever.getConfigs(Collections.emptySet(), 0, true) instanceof ComponentsConfigs);
+        assertTrue(retriever.getConfigs(Set.of(), 0, true) instanceof BootstrapConfigs);
+        assertTrue(retriever.getConfigs(Set.of(), 0, true) instanceof ComponentsConfigs);
         retriever.shutdown();
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java
index 3d5375a9740..11de808a415 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java
@@ -116,7 +116,7 @@ public class ContainerThreadPoolImplTest {
         assertEquals(CPUS * 4 * 100, executor.getQueue().remainingCapacity());
     }
 
-    private class FlipIt implements Runnable {
+    private static class FlipIt implements Runnable {
         public final Receiver<Boolean> didItRun = new Receiver<>();
 
         @Override
@@ -176,7 +176,7 @@ public class ContainerThreadPoolImplTest {
         }
     }
 
-    private class Hang implements Runnable {
+    private static class Hang implements Runnable {
 
         private final long hangMillis;