Replace all usages of Arrays.asList with List.of where possible.

4 files changed, 10 insertions, 11 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java
index 74780cdaa25..e8c0e7a4800 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java
@@ -7,7 +7,6 @@ import com.yahoo.container.plugin.util.JarFiles;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -56,7 +55,7 @@ public class AnalyzeBundle {
         var manifest = getOsgiManifest(jarFile);
         if (manifest == null) return List.of();
         return getMainAttributeValue(manifest, "X-JDisc-Non-PublicApi-Export-Package")
-                .map(s -> Arrays.asList(s.split(",")))
+                .map(s -> List.of(s.split(",")))
                 .orElseGet(ArrayList::new);
     }
 
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
index 6b8f3f6ba12..5546d3c4f32 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
@@ -14,8 +14,8 @@ import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
-import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -55,9 +55,9 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
     @Override
     public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
         Analyze.getClassName(Type.getReturnType(desc)).ifPresent(imports::add);
-        Arrays.asList(Type.getArgumentTypes(desc)).forEach(argType -> Analyze.getClassName(argType).ifPresent(imports::add));
+        List.of(Type.getArgumentTypes(desc)).forEach(argType -> Analyze.getClassName(argType).ifPresent(imports::add));
         if (exceptions != null) {
-            Arrays.asList(exceptions).forEach(ex -> Analyze.internalNameToClassName(ex).ifPresent(imports::add));
+            List.of(exceptions).forEach(ex -> Analyze.internalNameToClassName(ex).ifPresent(imports::add));
         }
 
         AnalyzeSignatureVisitor.analyzeMethod(signature, this);
@@ -83,7 +83,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
         }
 
         addImportWithInternalName(superName);
-        Arrays.asList(interfaces).forEach(this::addImportWithInternalName);
+        List.of(interfaces).forEach(this::addImportWithInternalName);
 
         AnalyzeSignatureVisitor.analyzeClass(signature, this);
     }
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
index 788fa346a37..d7991810024 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
@@ -9,8 +9,8 @@ import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
-import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -70,7 +70,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector {
     @Override
     public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
         addImportWithInternalName(owner);
-        Arrays.asList(Type.getArgumentTypes(desc)).forEach(this::addImport);
+        List.of(Type.getArgumentTypes(desc)).forEach(this::addImport);
         addImport(Type.getReturnType(desc));
     }
 
@@ -112,7 +112,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector {
                 addImport((Type) arg);
             } else if (arg instanceof Handle) {
                 addImportWithInternalName(((Handle) arg).getOwner());
-                Arrays.asList(Type.getArgumentTypes(desc)).forEach(this::addImport);
+                List.of(Type.getArgumentTypes(desc)).forEach(this::addImport);
             } else if ( ! (arg instanceof Number) && ! (arg instanceof String)) {
                 throw new AssertionError("Unexpected type " + arg.getClass() + " with value '" + arg + "'");
             }
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
index adcbdb68553..74acf3dffa1 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
@@ -16,9 +16,9 @@ import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
@@ -145,7 +145,7 @@ public class GenerateSourcesMojo extends AbstractMojo {
             if (parts.length <= 3) {
                 return mavenVersion;
             } else {
-                return stringJoin(Arrays.asList(parts).subList(0, 3), ".");
+                return stringJoin(List.of(parts).subList(0, 3), ".");
             }
         }
     }