Non-functional cleanup

10 files changed, 17 insertions, 26 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
index 1811fc0c8f0..d515f0d0353 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.node.admin.component;
 
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
-import com.yahoo.vespa.athenz.api.AthenzService;
 
 import java.net.URI;
 import java.util.Collections;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index d8d6b4781c8..f67c243f34d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -42,8 +42,8 @@ public class DockerOperationsImpl implements DockerOperations {
 
     private static final String MANAGER_NAME = "node-admin";
 
-    private static final String IPV6_NPT_PREFIX = "fd00::";
-    private static final String IPV4_NPT_PREFIX = "172.17.0.0";
+    private static final InetAddress IPV6_NPT_PREFIX = InetAddresses.forString("fd00::");
+    private static final InetAddress IPV4_NPT_PREFIX = InetAddresses.forString("172.17.0.0");
 
     private final Docker docker;
     private final ProcessExecuter processExecuter;
@@ -96,16 +96,12 @@ public class DockerOperationsImpl implements DockerOperations {
         command.withNetworkMode(networking.getDockerNetworkMode());
 
         if (networking == DockerNetworking.NPT) {
-            InetAddress ipV6Prefix = InetAddresses.forString(IPV6_NPT_PREFIX);
-            InetAddress ipV6Local = IPAddresses.prefixTranslate(ipV6Address, ipV6Prefix, 8);
+            InetAddress ipV6Local = IPAddresses.prefixTranslate(ipV6Address, IPV6_NPT_PREFIX, 8);
             command.withIpAddress(ipV6Local);
 
             // IPv4 - Only present for some containers
             Optional<InetAddress> ipV4Local = ipAddresses.getIPv4Address(context.node().hostname())
-                    .map(ipV4Address -> {
-                        InetAddress ipV4Prefix = InetAddresses.forString(IPV4_NPT_PREFIX);
-                        return IPAddresses.prefixTranslate(ipV4Address, ipV4Prefix, 2);
-                    });
+                    .map(ipV4Address -> IPAddresses.prefixTranslate(ipV4Address, IPV4_NPT_PREFIX, 2));
             ipV4Local.ifPresent(command::withIpAddress);
 
             addEtcHosts(containerData, context.node().hostname(), ipV4Local, ipV6Local);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
index 550d6e7021e..ce7a99fd841 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
@@ -9,7 +9,6 @@ import com.yahoo.security.Pkcs10Csr;
 import com.yahoo.security.SslContextBuilder;
 import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
-import com.yahoo.vespa.athenz.api.AthenzService;
 import com.yahoo.vespa.athenz.client.zts.DefaultZtsClient;
 import com.yahoo.vespa.athenz.client.zts.InstanceIdentity;
 import com.yahoo.vespa.athenz.client.zts.ZtsClient;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index cb10eac9e6c..5d021d329f4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -149,7 +149,7 @@ public class NodeAdminImpl implements NodeAdmin {
     @Override
     public Duration subsystemFreezeDuration() {
         if (startOfFreezeConvergence == null) {
-            return Duration.ofSeconds(0);
+            return Duration.ZERO;
         } else {
             return Duration.between(startOfFreezeConvergence, clock.instant());
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
index cc31374669c..5bd3d7800e6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
@@ -19,7 +19,6 @@ import java.util.stream.Collectors;
  */
 @ThreadSafe
 public class DebugHandlerHelper implements NodeAdminDebugHandler {
-    private Object monitor = new Object();
     private final ConcurrentMap<String, Supplier<Object>> suppliers = new ConcurrentHashMap<>();
 
     public void addThreadSafeSupplier(String name, Supplier<Object> threadSafeSupplier) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredBoolean.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredBoolean.java
index 5400c19d63e..3bcd806bc85 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredBoolean.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredBoolean.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
  * @author hakonhall
  */
 public class StoredBoolean {
-    private static Logger logger = Logger.getLogger(StoredBoolean.class.getName());
+    private static final Logger logger = Logger.getLogger(StoredBoolean.class.getName());
 
     private final UnixPath path;
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Templar.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Templar.java
index 113af76972b..e8c22184406 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Templar.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Templar.java
@@ -14,8 +14,8 @@ import java.util.Map;
 public class Templar {
     private final String template;
 
-    private String prefix = "<%=";
-    private String suffix = "%>";
+    private static final String prefix = "<%=";
+    private static final String suffix = "%>";
 
     private final Map<String, String> settings = new HashMap<>();
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java
index 376fda1d2dc..cf6c6c432f4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java
@@ -60,7 +60,7 @@ public class UnixPath {
 
     public Optional<String> readUtf8FileIfExists() {
         try {
-            return Optional.of(new String(Files.readAllBytes(path), StandardCharsets.UTF_8));
+            return Optional.of(Files.readString(path));
         } catch (NoSuchFileException ignored) {
             return Optional.empty();
         } catch (IOException e) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
index ba1952545a0..85a7c065a86 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
@@ -7,7 +7,6 @@ import com.yahoo.vespa.hosted.node.admin.task.util.process.CommandResult;
 import com.yahoo.vespa.hosted.node.admin.task.util.process.Terminal;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -37,7 +36,7 @@ public class Yum {
             .map(formatter -> "%{" + formatter + "}")
             .collect(Collectors.joining("\\n"));
     private static final Function<YumPackageName.Builder, List<Function<String, YumPackageName.Builder>>>
-            PACKAGE_NAME_BUILDERS_GENERATOR = builder -> Arrays.asList(
+            PACKAGE_NAME_BUILDERS_GENERATOR = builder -> List.of(
                 builder::setName, builder::setEpoch, builder::setVersion, builder::setRelease, builder::setArchitecture);
 
 
@@ -183,7 +182,7 @@ public class Yum {
         return new GenericYumCommand(
                 terminal,
                 yumCommand,
-                Arrays.asList(packages),
+                List.of(packages),
                 noopPattern);
     }
 
@@ -209,9 +208,8 @@ public class Yum {
             }
         }
 
-        @SuppressWarnings("unchecked")
         public GenericYumCommand enableRepos(String... repos) {
-            enabledRepo.addAll(Arrays.asList(repos));
+            enabledRepo.addAll(List.of(repos));
             return this;
         }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
index 333cb81f9d4..e66b3a7aed2 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
@@ -11,7 +11,7 @@ import java.nio.file.Path;
 import java.nio.file.attribute.FileAttribute;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -31,7 +31,7 @@ public class ProcessFactoryImplTest {
     @Test
     public void testSpawn() {
         CommandLine commandLine = mock(CommandLine.class);
-        when(commandLine.getArguments()).thenReturn(Arrays.asList("program"));
+        when(commandLine.getArguments()).thenReturn(List.of("program"));
         when(commandLine.getRedirectStderrToStdoutInsteadOfDiscard()).thenReturn(true);
         when(commandLine.programName()).thenReturn("program");
         Path outputPath;
@@ -56,8 +56,8 @@ public class ProcessFactoryImplTest {
     public void testSpawnWithPersistentOutputFile() {
 
         class TemporaryFile implements AutoCloseable {
-            Path path;
-            TemporaryFile() {
+            private final Path path;
+            private TemporaryFile() {
                 String outputFileName = ProcessFactoryImplTest.class.getSimpleName() + "-temporary-test-file.out";
                 FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(
                         PosixFilePermissions.fromString("rw-------"));
@@ -68,7 +68,7 @@ public class ProcessFactoryImplTest {
 
         try (TemporaryFile outputPath = new TemporaryFile()) {
             CommandLine commandLine = mock(CommandLine.class);
-            when(commandLine.getArguments()).thenReturn(Arrays.asList("program"));
+            when(commandLine.getArguments()).thenReturn(List.of("program"));
             when(commandLine.programName()).thenReturn("program");
             when(commandLine.getOutputFile()).thenReturn(Optional.of(outputPath.path));
             try (ChildProcess2Impl child = processFactory.spawn(commandLine)) {