diff options
Diffstat (limited to 'config-proxy/src')
5 files changed, 7 insertions, 7 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java index 2034a537b7c..3ec968e545a 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java @@ -21,6 +21,7 @@ import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; import java.util.Arrays; import java.util.Iterator; +import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -180,7 +181,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher { String ret; System.out.println(proxyServer.getMode()); if (proxyServer.getMode().requiresConfigSource()) { - proxyServer.updateSourceConnections(Arrays.asList(sources.split(","))); + proxyServer.updateSourceConnections(List.of(sources.split(","))); ret = "Updated config sources to: " + sources; } else { ret = "Cannot update sources when in '" + proxyServer.getMode().name() + "' mode"; diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java index e69d76ec124..a34ad69d22c 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClient.java @@ -6,7 +6,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.logging.Level; @@ -56,7 +55,7 @@ class MemoryCacheConfigClient implements ConfigSourceClient { @Override public List<String> getSourceConnections() { - return Collections.singletonList("N/A"); + return List.of("N/A"); } @Override diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java index 8074c1bd702..bf84e02ec9d 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java @@ -16,6 +16,7 @@ import net.jpountz.xxhash.XXHashFactory; import java.io.File; import java.nio.ByteBuffer; import java.nio.file.Files; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; @@ -94,6 +95,7 @@ class UrlDownloadRpcServer { } private static Downloader downloader(String url) { + Objects.requireNonNull(url, "url cannot be null"); URI uri = new URI(url); return switch (uri.getScheme()) { case "http", "https" -> new UrlDownloader(); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java index aa063b1ea54..656187ea8e5 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java @@ -17,7 +17,6 @@ import com.yahoo.vespa.config.protocol.Payload; import com.yahoo.vespa.config.protocol.Trace; import com.yahoo.vespa.config.util.ConfigUtils; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -30,7 +29,7 @@ import static com.yahoo.vespa.config.PayloadChecksum.Type.XXHASH64; public class ConfigTester { private static final long defaultTimeout = 10000; - private static final List<String> defContent = Collections.singletonList("bar string"); + private static final List<String> defContent = List.of("bar string"); static RawConfig fooConfig; static RawConfig barConfig; diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java index baafe2ae2dd..69f6e0e8dae 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -51,7 +50,7 @@ public class MockConfigSourceClient implements ConfigSourceClient{ @Override public List<String> getSourceConnections() { - return Collections.singletonList("N/A"); + return List.of("N/A"); } @Override |