Minor cleanup, no functional changes

6 files changed, 5 insertions, 30 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
index d757421c23a..42ccf4c436b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toUnmodifiableMap;
 
@@ -134,13 +133,11 @@ public class ApplicationCuratorDatabase {
         curator.set(reindexingDataPath(id), ReindexingStatusSerializer.toBytes(status));
     }
 
-
     /** Sets up a listenable cache with the given listener, over the applications path of this tenant. */
     public Curator.DirectoryCache createApplicationsPathCache(ExecutorService zkCacheExecutor) {
         return curator.createDirectoryCache(applicationsPath.getAbsolute(), false, false, zkCacheExecutor);
     }
 
-
     private Path reindexingLockPath(ApplicationId id) {
         return locksPath.append(id.serializedForm()).append("reindexing");
     }
@@ -153,16 +150,10 @@ public class ApplicationCuratorDatabase {
         return applicationsPath.append(id.serializedForm());
     }
 
-    // Used to determine whether future preparations of this application should use a dedicated CCC.
-    private Path dedicatedClusterControllerClusterPath(ApplicationId id) {
-        return applicationPath(id).append("dedicatedClusterControllerCluster");
-    }
-
     private Path reindexingDataPath(ApplicationId id) {
         return applicationPath(id).append("reindexing");
     }
 
-
     private static class ReindexingStatusSerializer {
 
         private static final String ENABLED = "enabled";
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
index c195e5cc8c4..3fe28c918d0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
@@ -31,7 +31,7 @@ public final class ApplicationMapper {
     }
 
     /**
-     * Register a Application to an application id and specific vespa version
+     * Register an Application to an application id and specific vespa version
      */
     public void register(ApplicationId applicationId, ApplicationSet applicationSet) {
         requestHandlers.put(applicationId, applicationSet);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
index f4e1918e6e3..5ecc7e6c8aa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
@@ -11,10 +11,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toUnmodifiableMap;
-
 /**
  * Pending reindexing: convergence to the stored config generation allows reindexing to start.
  * Ready reindexing: reindexing may start after this timestamp.
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java
index d99d9a7e017..920e1862efa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java
@@ -53,9 +53,8 @@ class ConfigInstanceBuilder {
                     Field innerField = builder.getClass().getDeclaredField(node.getName());
                     innerField.setAccessible(true);
                     Object innerFieldVal = innerField.get(builder);
-                    if (innerFieldVal instanceof List) {
+                    if (innerFieldVal instanceof List<?> innerList) {
                         // inner array? Check that list elems are ConfigBuilder
-                        List<?> innerList = (List<?>) innerFieldVal;
                         for (Object b : innerList) {
                             if (b instanceof ConfigBuilder) {
                                 applyDef((ConfigBuilder) b, (InnerCNode) node);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigNotConvergedException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigNotConvergedException.java
index 88cddb93d9d..4fe8dc0866c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigNotConvergedException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigNotConvergedException.java
@@ -10,8 +10,4 @@ public class ConfigNotConvergedException extends RuntimeException {
         super(t);
     }
 
-    public ConfigNotConvergedException(String message) {
-        super(message);
-    }
-
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
index c80faa2375a..ef34d62cef6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
@@ -100,16 +100,9 @@ public class FileDistributionStatus extends AbstractComponent {
         int countFinished = 0;
         for (HostStatus hostStatus : hostStatuses) {
             switch (hostStatus.status) {
-                case IN_PROGRESS:
-                    countInProgress++;
-                    break;
-                case FINISHED:
-                    countFinished++;
-                    break;
-                case UNKNOWN:
-                    countUnknown++;
-                    break;
-                default:
+                case IN_PROGRESS -> countInProgress++;
+                case FINISHED -> countFinished++;
+                case UNKNOWN -> countUnknown++;
             }
         }