Unify on List.of

9 files changed, 20 insertions, 28 deletions

diff --git a/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
index 150a2a5d78a..ebe4ccdd2ba 100644
--- a/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
+++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
@@ -8,8 +8,6 @@ import org.osgi.framework.Bundle;
 import java.util.Collection;
 import java.util.List;
 
-import static java.util.Collections.emptyList;
-
 /**
  * @author gjoranv
  */
@@ -22,7 +20,7 @@ public class MockOsgiWrapper implements OsgiWrapper {
 
     @Override
     public List<Bundle> getCurrentBundles() {
-        return emptyList();
+        return List.of();
     }
 
     @Override
@@ -32,7 +30,7 @@ public class MockOsgiWrapper implements OsgiWrapper {
 
     @Override
     public List<Bundle> install(String absolutePath) {
-        return emptyList();
+        return List.of();
     }
 
     @Override
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/IndexedBackendTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/IndexedBackendTestCase.java
index 58427bee30a..3cefeeabdcf 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/IndexedBackendTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/IndexedBackendTestCase.java
@@ -20,7 +20,6 @@ import com.yahoo.search.schema.Schema;
 import com.yahoo.search.schema.SchemaInfo;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -98,7 +97,7 @@ public class IndexedBackendTestCase {
         var backend = new IndexedBackend(new ClusterParams(CLUSTER_PARAMS.getSearcherName(), CLUSTER_PARAMS.getServerId(),
                                                            CLUSTER_PARAMS.getDefaultSummary(), CLUSTER_PARAMS.getDocumentdbInfoConfig(),
                                                            new SchemaInfo(List.of(schema.build()), List.of())),
-                                         MockDispatcher.create(Collections.singletonList(new Node(CLUSTER, 0, "host0", 0))));
+                                         MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0))));
         Query q = new Query("?query=foo");
         Result result = doSearch(backend, q, 0, 10);
         assertFalse(backend.summaryNeedsQuery(q));
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
index 8b6b3c4d13a..3053fe7d730 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -238,7 +237,7 @@ public class LoadBalancerTest {
     }
 
     private GroupStatus newGroupStatus(int id) {
-        Group dummyGroup = new Group(id, Collections.emptyList()) {
+        Group dummyGroup = new Group(id, List.of()) {
             @Override
             public boolean hasSufficientCoverage() {
                 return true;
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
index be8f99a4ef4..6459d67480d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
@@ -14,7 +14,6 @@ import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -66,7 +65,7 @@ public class ProtobufSerializationTest {
         builder.setTimeout(0);
         var hit = new FastHit();
         hit.setGlobalId(new GlobalId(IdString.createIdString("id:ns:type::id")).getRawId());
-        var bytes = ProtobufSerialization.serializeDocsumRequest(builder, Collections.singletonList(hit));
+        var bytes = ProtobufSerialization.serializeDocsumRequest(builder, List.of(hit));
 
         assertEquals(56, bytes.length);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
index 76a1a71f6ed..540ecfa6e12 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
@@ -9,7 +9,6 @@ import com.yahoo.search.searchchain.Execution;
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -22,12 +21,12 @@ public class GroupingQueryParserTestCase {
 
     @Test
     void requireThatNoRequestIsSkipped() {
-        assertEquals(Collections.emptyList(), executeQuery(null, null, null));
+        assertEquals(List.of(), executeQuery(null, null, null));
     }
 
     @Test
     void requireThatEmptyRequestIsSkipped() {
-        assertEquals(Collections.emptyList(), executeQuery("", null, null));
+        assertEquals(List.of(), executeQuery("", null, null));
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
index 97eed95946f..f064180222c 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -121,7 +120,7 @@ public class GroupingRequestTestCase {
     @Test
     void requireThatGetRequestsReturnsAllRequests() {
         Query query = new Query();
-        assertEquals(Collections.emptyList(), query.getSelect().getGrouping());
+        assertEquals(List.of(), query.getSelect().getGrouping());
 
         GroupingRequest foo = GroupingRequest.newInstance(query);
         assertEquals(List.of(foo), query.getSelect().getGrouping());
diff --git a/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java b/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java
index 42dcab41015..793a907b5d1 100644
--- a/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.search.query.properties.test;
 import com.yahoo.processing.request.properties.PropertyMap;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -22,8 +21,8 @@ public class PropertyMapTestCase {
         map.set("nonclonable", new NonClonableObject());
         map.set("clonableArray", new ClonableObject[]{new ClonableObject()});
         map.set("nonclonableArray", new NonClonableObject[]{new NonClonableObject()});
-        map.set("clonableList", Collections.singletonList(new ClonableObject()));
-        map.set("nonclonableList", Collections.singletonList(new NonClonableObject()));
+        map.set("clonableList", List.of(new ClonableObject()));
+        map.set("nonclonableList", List.of(new NonClonableObject()));
         assertNotNull(map.get("clonable"));
         assertNotNull(map.get("nonclonable"));
 
diff --git a/container-search/src/test/java/com/yahoo/search/ranking/GlobalPhaseRerankHitsImplTest.java b/container-search/src/test/java/com/yahoo/search/ranking/GlobalPhaseRerankHitsImplTest.java
index 39b202daf1e..b37e1d5551b 100644
--- a/container-search/src/test/java/com/yahoo/search/ranking/GlobalPhaseRerankHitsImplTest.java
+++ b/container-search/src/test/java/com/yahoo/search/ranking/GlobalPhaseRerankHitsImplTest.java
@@ -35,7 +35,7 @@ public class GlobalPhaseRerankHitsImplTest {
         }
     }
     static FunEvalSpec makeConstSpec(double constValue) {
-        return new FunEvalSpec(() -> new EvalSum(constValue), Collections.emptyList(), Collections.emptyList());
+        return new FunEvalSpec(() -> new EvalSum(constValue), List.of(), List.of());
     }
     static FunEvalSpec makeSumSpec(List<String> fromQuery, List<String> fromMF) {
         List<MatchFeatureInput> mfList = new ArrayList<>();
@@ -175,15 +175,15 @@ public class GlobalPhaseRerankHitsImplTest {
     }
     @Test void partialRerankWithRescaling() {
         var setup = setup().rerank(2).eval(makeConstSpec(3.0)).build();
-        var query = makeQuery(Collections.emptyList());
+        var query = makeQuery(List.of());
         var result = makeResult(query, List.of(hit("a", 3), hit("b", 4), hit("c", 5), hit("d", 6)));
         var expect = Expect.make(List.of(hit("a", 1), hit("b", 2), hit("c", 3), hit("d", 3)));
         GlobalPhaseRanker.rerankHitsImpl(setup, query, result);
         expect.verifyScores(result);
     }
     @Test void matchFeaturesCanBePartiallyHidden() {
-        var setup = setup().eval(makeSumSpec(Collections.emptyList(), List.of("public_value", "private_value"))).hide("private_value").build();
-        var query = makeQuery(Collections.emptyList());
+        var setup = setup().eval(makeSumSpec(List.of(), List.of("public_value", "private_value"))).hide("private_value").build();
+        var query = makeQuery(List.of());
         var factory = new HitFactory(List.of("public_value", "private_value"));
         var result = makeResult(query, List.of(factory.create("a", 1, List.of(value("public_value", 2), value("private_value", 3))),
                 factory.create("b", 2, List.of(value("public_value", 5), value("private_value", 7)))));
@@ -194,8 +194,8 @@ public class GlobalPhaseRerankHitsImplTest {
         verifyDoesNotHaveMF(result, "private_value");
     }
     @Test void matchFeaturesCanBeRemoved() {
-        var setup = setup().eval(makeSumSpec(Collections.emptyList(), List.of("private_value"))).hide("private_value").build();
-        var query = makeQuery(Collections.emptyList());
+        var setup = setup().eval(makeSumSpec(List.of(), List.of("private_value"))).hide("private_value").build();
+        var query = makeQuery(List.of());
         var factory = new HitFactory(List.of("private_value"));
         var result = makeResult(query, List.of(factory.create("a", 1, List.of(value("private_value", 3))),
                 factory.create("b", 2, List.of(value("private_value", 7)))));
@@ -227,7 +227,7 @@ public class GlobalPhaseRerankHitsImplTest {
         verifyHasMF(result, "bar");
     }
     @Test void queryFeaturesCanBeDefaultValues() {
-        var setup = setup().eval(makeSumSpec(List.of("foo", "bar"), Collections.emptyList()))
+        var setup = setup().eval(makeSumSpec(List.of("foo", "bar"), List.of()))
                 .addDefault("query(bar)", Tensor.from(5.0)).build();
         var query = makeQuery(List.of(value("query(foo)", 7)));
         var result = makeResult(query, List.of(hit("a", 1)));
@@ -236,7 +236,7 @@ public class GlobalPhaseRerankHitsImplTest {
         expect.verifyScores(result);
     }
     @Test void withNormalizer() {
-        var setup = setup().eval(makeSumSpec(Collections.emptyList(), List.of("bar")))
+        var setup = setup().eval(makeSumSpec(List.of(), List.of("bar")))
                 .addNormalizer(makeNormalizer("foo", List.of(115.0, 65.0, 55.0, 45.0, 15.0), makeSumSpec(List.of("x"), List.of("bar")))).build();
         var query = makeQuery(List.of(value("query(x)", 5)));
         var factory = new HitFactory(List.of("bar"));
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
index bfcde54d65b..fda7bec9d71 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
@@ -16,7 +16,7 @@ import com.yahoo.search.searchchain.SearchChainRegistry;
 import com.yahoo.search.searchchain.model.federation.FederationOptions;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -82,7 +82,7 @@ public class FutureDataTestCase {
     void testFutureData() throws InterruptedException, ExecutionException, TimeoutException {
         // Set up
         AsyncProviderSearcher futureDataSource = new AsyncProviderSearcher();
-        Chain<Searcher> chain = new Chain<>(Collections.<Searcher>singletonList(futureDataSource));
+        Chain<Searcher> chain = new Chain<>(List.of(futureDataSource));
 
         // Execute
         Query query = new Query();