Unify on List.of

3 files changed, 4 insertions, 7 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 29a45c10af3..b00455b1e2a 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
@@ -239,7 +239,7 @@ public class MockBundle implements Bundle, BundleWiring {
 
     @Override
     public Collection<String> listResources(String p1, String p2, int p3) {
-        return Collections.emptyList();
+        return List.of();
     }
 
     @Override
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index f8fa0756cb3..6364eab6d42 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -6,13 +6,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.BLACK;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.GRAY;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.WHITE;
 import static java.util.logging.Level.FINE;
-import static java.util.Collections.singletonList;
 
 
 /**
@@ -55,7 +53,7 @@ public class CycleFinder<T> {
         resetState();
         for (T vertex : graph.getVertices()) {
             if (colors.get(vertex) == WHITE) {
-                if (visitDepthFirst(vertex, new ArrayList<>(singletonList(vertex)))) {
+                if (visitDepthFirst(vertex, new ArrayList<>(List.of(vertex)))) {
                     if (cycle == null) throw new IllegalStateException("Null cycle - this should never happen");
                     if (cycle.isEmpty()) throw new IllegalStateException("Empty cycle - this should never happen");
                     log.log(FINE, () -> "Cycle detected: " + cycle);
diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
index 020022dc9fd..10f8400fa37 100644
--- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
+++ b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
@@ -22,12 +22,11 @@ import com.yahoo.jdisc.http.filter.chain.ResponseFilterChain;
 import com.yahoo.processing.execution.chain.ChainRegistry;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import static java.util.Collections.emptyList;
+import static java.util.List.of;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -158,7 +157,7 @@ public class FilterChainRepository extends AbstractComponent {
     }
 
     private static Object wrapIfSecurityFilter(Object filter) {
-        if (isSecurityFilter(filter)) return createSecurityChain(Collections.singletonList(filter));
+        if (isSecurityFilter(filter)) return createSecurityChain(List.of(filter));
         return filter;
     }