Arrays.asList => List.of

16 files changed, 28 insertions, 55 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
index 8fe1372ef2f..7242d3de1dd 100644
--- a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
+++ b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
@@ -7,7 +7,6 @@ import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.builder.xml.ConfigModelId;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -58,7 +57,7 @@ public class MapConfigModelRegistry extends ConfigModelRegistry {
     @SafeVarargs
     @SuppressWarnings("varargs")
     public static ConfigModelRegistry createFromList(ConfigModelBuilder<? extends ConfigModel> ... builders) {
-        return new MapConfigModelRegistry(Arrays.asList(builders));
+        return new MapConfigModelRegistry(List.of(builders));
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/TestUtil.java b/config-model/src/main/java/com/yahoo/config/model/test/TestUtil.java
index 94969aa5324..509c10c7fc9 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/TestUtil.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/TestUtil.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.builder.xml.XmlHelper;
 import org.w3c.dom.Element;
 import java.io.StringReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -20,7 +19,7 @@ public class TestUtil {
     public static Element parse(String... xmlLines) {
         List<String> lines = new ArrayList<>();
         lines.add("<?xml version='1.0' encoding='utf-8' ?>");
-        lines.addAll(Arrays.asList(xmlLines));
+        lines.addAll(List.of(xmlLines));
 
         try {
             return XmlHelper.getDocument(new StringReader(CollectionUtil.mkString(lines, "\n").replace("'", "\""))).getDocumentElement();
diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java b/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java
index 0fddcbd4cc7..4deee1dce9f 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java
@@ -4,9 +4,7 @@ package com.yahoo.schema;
 import com.yahoo.schema.document.SDDocumentType;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +25,7 @@ public class RankProfileRegistry {
     private static final String globalRankProfilesKey = "[global]";
 
     /* These rank profiles can be overridden: 'default' rank profile, as that is documented to work. And 'unranked'. */
-    static final Set<String> overridableRankProfileNames = new HashSet<>(Arrays.asList("default", "unranked"));
+    static final Set<String> overridableRankProfileNames = Set.of("default", "unranked");
 
     public static RankProfileRegistry createRankProfileRegistryWithBuiltinRankProfiles(Schema schema) {
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/Processing.java b/config-model/src/main/java/com/yahoo/schema/processing/Processing.java
index c23d87e9eba..52078326aec 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/Processing.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/Processing.java
@@ -9,8 +9,8 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.deploy.TestProperties;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -28,7 +28,7 @@ public class Processing {
     public Processing(ModelContext.Properties properties) { this.properties = properties; }
 
     private Collection<ProcessorFactory> processors() {
-        return Arrays.asList(
+        return List.<ProcessorFactory>of(
                 SearchMustHaveDocument::new,
                 UrlFieldValidator::new,
                 BuiltInFieldSets::new,
@@ -99,7 +99,7 @@ public class Processing {
 
     /** Processors of rank profiles only (those who tolerate and do something useful when the search field is null) */
     private Collection<ProcessorFactory> rankProfileProcessors() {
-        return Arrays.asList(
+        return List.of(
                 RankProfileTypeSettingsProcessor::new,
                 ReservedFunctionNames::new,
                 RankingExpressionTypeResolver::new);
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/UriHack.java b/config-model/src/main/java/com/yahoo/schema/processing/UriHack.java
index e4e2ac9f5be..9a4c4038953 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/UriHack.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/UriHack.java
@@ -12,7 +12,6 @@ import com.yahoo.schema.document.SDField;
 import com.yahoo.schema.document.Stemming;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -21,7 +20,7 @@ import java.util.List;
 public class UriHack extends Processor {
 
     private static final List<String> URL_SUFFIX =
-            Arrays.asList("scheme", "host", "port", "path", "query", "fragment", "hostname");
+            List.of("scheme", "host", "port", "path", "query", "fragment", "hostname");
 
     UriHack(Schema schema,
             DeployLogger deployLogger,
@@ -52,8 +51,7 @@ public class UriHack extends Processor {
         if (uriField.getDataType() instanceof ArrayDataType) {
             generatedType = new ArrayDataType(DataType.STRING);
         }
-        else if (uriField.getDataType() instanceof WeightedSetDataType) {
-            WeightedSetDataType wdt = (WeightedSetDataType) uriField.getDataType();
+        else if (uriField.getDataType() instanceof WeightedSetDataType wdt) {
             generatedType = new WeightedSetDataType(DataType.STRING, wdt.createIfNonExistent(), wdt.removeIfZero());
         }
 
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java
index 111f5384c41..2854824e5b7 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java
@@ -5,8 +5,6 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.schema.document.SDField;
 import com.yahoo.schema.Schema;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -16,17 +14,10 @@ import java.util.logging.Level;
 public class IndexCommandResolver extends MultiFieldResolver {
 
     /** Commands which don't have to be harmonized between fields */
-    private static List<String> ignoredCommands = new ArrayList<>();
+    private static final List<String> ignoredCommands = List.of( "complete-boost", "literal-boost", "highlight");
 
     /** Commands which must be harmonized between fields */
-    private static List<String> harmonizedCommands = new ArrayList<>();
-
-    static {
-        String[] ignore = { "complete-boost", "literal-boost", "highlight" };
-        ignoredCommands.addAll(Arrays.asList(ignore));
-        String[] harmonize = { "stemming", "normalizing" };
-        harmonizedCommands.addAll(Arrays.asList(harmonize));
-    }
+    private static final List<String> harmonizedCommands = List.of("stemming", "normalizing");
 
     public IndexCommandResolver(String indexName, List<SDField> fields, Schema schema, DeployLogger logger) {
         super(indexName, fields, schema, logger);
@@ -53,8 +44,8 @@ public class IndexCommandResolver extends MultiFieldResolver {
                             ", adding to field " + field.getName());
                     field.addQueryCommand(command);
                 } else {
-                    deployLogger.logApplicationPackage(Level.WARNING, "All fields going to the same index should have the same query-commands. Field \'" + field.getName() +
-                            "\' doesn't contain command \'" + command+"\'");
+                    deployLogger.logApplicationPackage(Level.WARNING, "All fields going to the same index should have the same query-commands. Field '" + field.getName() +
+                            "' doesn't contain command '" + command+"'");
                 }
             }
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
index aa476b1ae39..0a933e7d5ed 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
@@ -7,7 +7,6 @@ import ai.vespa.metrics.set.Vespa9VespaMetricSet;
 import ai.vespa.metricsproxy.core.VespaMetrics;
 import ai.vespa.metricsproxy.http.ValuesFetcher;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -71,7 +70,7 @@ public class MetricsConsumer {
     }
 
     public static MetricsConsumer consumer(String id, MetricSet ... metricSets) {
-        return new MetricsConsumer(id, new MetricSet(id + "-consumer-metrics", List.of(), Arrays.asList(metricSets)));
+        return new MetricsConsumer(id, new MetricSet(id + "-consumer-metrics", List.of(), List.of(metricSets)));
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
index 0a23e25e432..4b4cb1530d4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
@@ -5,7 +5,6 @@ import com.yahoo.config.model.deploy.DeployState;
 import org.w3c.dom.Document;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,7 +34,7 @@ public class BundleValidator extends AbstractBundleValidator {
         for (Map.Entry<Object,Object> entry : attributes.entrySet()) {
             mfAttributes.add(entry.getKey().toString());
         }
-        List<String> requiredOSGIHeaders = Arrays.asList(
+        List<String> requiredOSGIHeaders = List.of(
                 "Bundle-ManifestVersion", "Bundle-Name", "Bundle-SymbolicName", "Bundle-Version");
         for (String header : requiredOSGIHeaders) {
             if (!mfAttributes.contains(header)) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/PublicApiBundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/PublicApiBundleValidator.java
index e0a43f0988a..ddffe20f725 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/PublicApiBundleValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/PublicApiBundleValidator.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.model.application.validation;
 
 import org.w3c.dom.Document;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.logging.Level;
@@ -18,7 +18,7 @@ public class PublicApiBundleValidator extends AbstractBundleValidator {
         String nonPublicApiAttribute = mf.getMainAttributes().getValue("X-JDisc-Non-PublicApi-Import-Package");
         if (nonPublicApiAttribute == null) return;
 
-        var nonPublicApisUsed = Arrays.asList(nonPublicApiAttribute.split(","));
+        var nonPublicApisUsed = List.of(nonPublicApiAttribute.split(","));
         if (! nonPublicApisUsed.isEmpty()) {
             log(context.deployState(), Level.WARNING, "Jar file '%s' uses non-public Vespa APIs: %s", filename(jar), nonPublicApisUsed);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomGenericTargetBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomGenericTargetBuilder.java
index 565cdf3a5f5..b8de223c0cb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomGenericTargetBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomGenericTargetBuilder.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.model.container.search.searchchain.GenericTarget;
 import com.yahoo.vespa.model.container.search.searchchain.Searcher;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,7 +20,7 @@ import java.util.Map;
 abstract public class DomGenericTargetBuilder<T extends GenericTarget> extends DomChainBuilderBase<Searcher<?>, T> {
 
     DomGenericTargetBuilder(Map<String, ComponentsBuilder.ComponentType<?>> outerSearcherTypeByComponentName) {
-        super(Arrays.asList(ComponentsBuilder.ComponentType.searcher, ComponentsBuilder.ComponentType.federation),
+        super(List.of(ComponentsBuilder.ComponentType.searcher, ComponentsBuilder.ComponentType.federation),
                 outerSearcherTypeByComponentName);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainBuilder.java
index 2eb1127d75b..4ada9e99e5e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainBuilder.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.model.container.search.searchchain.SearchChain;
 import com.yahoo.vespa.model.container.search.searchchain.Searcher;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,7 +21,7 @@ import java.util.Map;
 public class DomSearchChainBuilder extends DomChainBuilderBase<Searcher<?>, SearchChain> {
 
     public DomSearchChainBuilder(Map<String, ComponentsBuilder.ComponentType<?>> outerSearcherTypeByComponentName) {
-        super(Arrays.asList(ComponentsBuilder.ComponentType.searcher, ComponentsBuilder.ComponentType.federation),
+        super(List.of(ComponentsBuilder.ComponentType.searcher, ComponentsBuilder.ComponentType.federation),
                 outerSearcherTypeByComponentName);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilder.java
index e05d762d7bc..b48df948358 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilder.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import com.yahoo.vespa.model.container.search.searchchain.Searcher;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +22,7 @@ import java.util.Map;
 public class DomSearchChainsBuilder extends DomChainsBuilder<Searcher<?>, SearchChain, SearchChains> {
 
     public DomSearchChainsBuilder() {
-        super(Arrays.asList(ComponentType.searcher, ComponentType.federation));
+        super(List.of(ComponentType.searcher, ComponentType.federation));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Handler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Handler.java
index 099255975b6..0d3d8462376 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Handler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Handler.java
@@ -8,7 +8,6 @@ import com.yahoo.vespa.model.container.ContainerThreadpool;
 import org.w3c.dom.Element;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -51,7 +50,7 @@ public class Handler extends Component<Component<?, ?>, ComponentModel> {
     }
 
     public void addServerBindings(BindingPattern... bindings) {
-        serverBindings.addAll(Arrays.asList(bindings));
+        serverBindings.addAll(List.of(bindings));
     }
 
     public void addServerBindings(Collection<BindingPattern> bps) { serverBindings.addAll(bps); }
@@ -61,7 +60,7 @@ public class Handler extends Component<Component<?, ?>, ComponentModel> {
     }
 
     public void addClientBindings(BindingPattern... bindings) {
-        clientBindings.addAll(Arrays.asList(bindings));
+        clientBindings.addAll(List.of(bindings));
     }
 
     public final Collection<BindingPattern> getServerBindings() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/Source.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/Source.java
index 29e587c6453..f589884cccd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/Source.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/Source.java
@@ -4,9 +4,8 @@ package com.yahoo.vespa.model.container.search.searchchain;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.chain.model.ChainSpecification;
 import com.yahoo.search.searchchain.model.federation.FederationOptions;
-import com.yahoo.config.model.producer.TreeConfigProducer;
 
-import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -51,7 +50,7 @@ public class Source extends GenericTarget {
     @Override
     public ChainSpecification getChainSpecification() {
         return super.getChainSpecification().addInherits(
-                Arrays.asList(getParentProvider().getComponentId().toSpecification()));
+                List.of(getParentProvider().getComponentId().toSpecification()));
     }
 
     public ComponentId getGlobalComponentId() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleInstantiationSpecificationBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleInstantiationSpecificationBuilder.java
index 8a15e61495b..7e14eafc2ee 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleInstantiationSpecificationBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleInstantiationSpecificationBuilder.java
@@ -7,7 +7,6 @@ import com.yahoo.component.ComponentSpecification;
 import com.yahoo.vespa.model.container.PlatformBundles;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static com.yahoo.vespa.model.container.component.chain.ProcessingHandler.PROCESSING_HANDLER_CLASS;
@@ -39,9 +38,7 @@ public class BundleInstantiationSpecificationBuilder {
 
 
     private static void validate(BundleInstantiationSpecification instSpec) {
-        List<String> forbiddenClasses = Arrays.asList(
-                SearchHandler.HANDLER_CLASSNAME,
-                PROCESSING_HANDLER_CLASS);
+        List<String> forbiddenClasses = List.of(SearchHandler.HANDLER_CLASSNAME, PROCESSING_HANDLER_CLASS);
 
         for (String forbiddenClass: forbiddenClasses) {
             if (forbiddenClass.equals(instSpec.getClassName())) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
index 53547a1a15b..6dd7278fde8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
@@ -3,9 +3,6 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.documentmodel.NewDocumentType;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -13,9 +10,8 @@ import java.util.stream.Collectors;
 
 public class ReservedDocumentTypeNameValidator {
 
-    public static final List<String> ORDERED_RESERVED_NAMES = Collections.unmodifiableList(
-            Arrays.asList("and", "false", "id", "not", "null", "or", "true"));
-    public static final Set<String> RESERVED_NAMES = Collections.unmodifiableSet(new HashSet<>(ORDERED_RESERVED_NAMES));
+    public static final List<String> ORDERED_RESERVED_NAMES = List.of("and", "false", "id", "not", "null", "or", "true");
+    public static final Set<String> RESERVED_NAMES = Set.copyOf(ORDERED_RESERVED_NAMES);
 
     public void validate(Map<String, NewDocumentType> documentDefinitions) {
         List<String> conflictingNames = documentDefinitions.keySet().stream()