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

5 files changed, 10 insertions, 15 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java
index 71956691623..3485c07c74e 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java
@@ -6,7 +6,6 @@ import com.yahoo.jdisc.service.CurrentContainer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -67,7 +66,7 @@ public abstract class AbstractApplication implements Application {
     }
 
     public final List<Bundle> installAndStartBundle(String... locations) throws BundleException {
-        return installAndStartBundle(Arrays.asList(locations));
+        return installAndStartBundle(List.of(locations));
     }
 
     public final List<Bundle> installAndStartBundle(Iterable<String> locations) throws BundleException {
@@ -75,7 +74,7 @@ public abstract class AbstractApplication implements Application {
     }
 
     public final void stopAndUninstallBundle(Bundle... bundles) throws BundleException {
-        stopAndUninstallBundle(Arrays.asList(bundles));
+        stopAndUninstallBundle(List.of(bundles));
     }
 
     public final void stopAndUninstallBundle(Iterable<Bundle> bundles) throws BundleException {
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
index fb3965108d8..5fc3b42055f 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
@@ -13,7 +13,6 @@ import com.google.inject.spi.Elements;
 import com.yahoo.jdisc.Container;
 import org.osgi.framework.Bundle;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -38,7 +37,7 @@ public class GuiceRepository implements Iterable<Module> {
     private Injector injector;
 
     public GuiceRepository(Module... modules) {
-        installAll(Arrays.asList(modules));
+        installAll(List.of(modules));
     }
 
     public Injector activate() {
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java b/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java
index 8a5c8de92b9..beba03d7d84 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java
@@ -10,7 +10,6 @@ import com.yahoo.jdisc.core.FelixFramework;
 import com.yahoo.jdisc.core.FelixParams;
 import com.yahoo.jdisc.test.NonWorkingOsgiFramework;
 
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -94,7 +93,7 @@ public abstract class ClientDriver {
     }
 
     private static List<Module> newModuleList(final ClientApplication appInstance, Module... guiceModules) {
-        List<Module> lst = new LinkedList<>(Arrays.asList(guiceModules));
+        List<Module> lst = new LinkedList<>(List.of(guiceModules));
         lst.add(new AbstractModule() {
 
             @Override
@@ -108,7 +107,7 @@ public abstract class ClientDriver {
     private static List<Module> newModuleList(final Class<? extends ClientApplication> appClass,
                                               Module... guiceModules)
     {
-        List<Module> lst = new LinkedList<>(Arrays.asList(guiceModules));
+        List<Module> lst = new LinkedList<>(List.of(guiceModules));
         lst.add(new AbstractModule() {
 
             @Override
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
index 80e531c90af..2bf3e05baed 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
@@ -14,7 +14,6 @@ import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.wiring.FrameworkWiring;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -150,14 +149,14 @@ public class FelixFramework implements OsgiFramework {
 
     @Override
     public List<Bundle> bundles() {
-        return Arrays.asList(felix.getBundleContext().getBundles());
+        return List.of(felix.getBundleContext().getBundles());
     }
 
     @Override
     public List<Bundle> getBundles(Bundle requestingBundle) {
         log.fine(() -> "All bundles: " + bundles());
         log.fine(() -> "Getting visible bundles for bundle " + requestingBundle);
-        List<Bundle> visibleBundles = Arrays.asList(requestingBundle.getBundleContext().getBundles());
+        List<Bundle> visibleBundles = List.of(requestingBundle.getBundleContext().getBundles());
         log.fine(() -> "Visible bundles: " + visibleBundles);
         return visibleBundles;
     }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java
index 18449f207ee..64c690e89d4 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java
@@ -26,7 +26,6 @@ import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.service.CurrentContainer;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -311,7 +310,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer {
      */
     public static TestDriver newApplicationBundleInstance(String bundleLocation, boolean privileged,
                                                           Module... guiceModules) {
-        return newInstance(newOsgiFramework(), bundleLocation, privileged, Arrays.asList(guiceModules));
+        return newInstance(newOsgiFramework(), bundleLocation, privileged, List.of(guiceModules));
     }
 
     /**
@@ -326,7 +325,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer {
      */
     public static TestDriver newInstance(OsgiFramework osgiFramework, String bundleLocation, boolean privileged,
                                          Module... guiceModules) {
-        return newInstance(osgiFramework, bundleLocation, privileged, Arrays.asList(guiceModules));
+        return newInstance(osgiFramework, bundleLocation, privileged, List.of(guiceModules));
     }
 
     /**
@@ -381,7 +380,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer {
     private static List<Module> newModuleList(final Application app, final Class<? extends Application> appClass,
                                               Module... guiceModules) {
         List<Module> lst = new LinkedList<>();
-        lst.addAll(Arrays.asList(guiceModules));
+        lst.addAll(List.of(guiceModules));
         lst.add(new AbstractModule() {
 
             @Override