Cleanup: No functional changes

9 files changed, 24 insertions, 18 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java
index c8816b8e1d5..7d0d489ac7f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java
@@ -18,4 +18,5 @@ public interface InfraDeployer {
 
     /** Deploys all supported infrastructure applications in this zone. */
     void activateAllSupportedInfraApplications(boolean propagateException);
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
index 1c7716be295..49c7b4d8ff6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
@@ -1,12 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query;
 
-
 import java.nio.ByteBuffer;
 
-
 /**
- * A place holder for null queries to make searchers easier to write.
+ * A placeholder for null queries to make searchers easier to write.
  *
  * @author Steinar Knutsen
  */
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 52a3672e7a2..739058ade71 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -476,7 +476,7 @@ public class SearchHandler extends LoggingRequestHandler {
                                                                + Exceptions.toMessageString(e));
             log.log(Level.FINE, error::getDetailedMessage);
             return new Result(query, error);
-        } catch (IllegalArgumentException e) {
+        } catch (Exception e) {
             log(request, query, e);
             return new Result(query, ErrorMessage.createUnspecifiedError("Failed: " +
                                                                          Exceptions.toMessageString(e), e));
@@ -487,10 +487,6 @@ public class SearchHandler extends LoggingRequestHandler {
                                                                           Exceptions.toMessageString(e), e);
             log(request, query, e);
             return new Result(query, error);
-        } catch (Exception e) {
-            log(request, query, e);
-            return new Result(query, ErrorMessage.createUnspecifiedError("Failed: " +
-                                                                         Exceptions.toMessageString(e), e));
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 9888a8df0ed..83de9b44fcb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -83,7 +83,6 @@ public class CuratorDatabaseClient {
         this.clock = clock;
         this.provisionIndexCounter = new CuratorCounter(curator, root.append("provisionIndexCounter"));
         initZK();
-        curator.delete(containerImagesPath); // TODO(mpolden): Remove after 2021-11-08
     }
 
     public List<String> cluster() {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
index d1913a10b49..41851f6888e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
@@ -21,6 +21,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+/**
+ * @author bratseth
+ */
 public class MetricsV2MetricsFetcherTest {
 
     private static final double delta = 0.00000001;
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java
index e4e5f513ebc..909b86886b8 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java
@@ -4,7 +4,9 @@ package com.yahoo.vespa.service.duper;
 import com.yahoo.config.provision.NodeType;
 
 public class ConfigServerHostApplication extends HostAdminApplication {
+
     public ConfigServerHostApplication() {
         super("configserver-host", NodeType.confighost);
     }
+
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
index 7087995aa2e..67d54091adc 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
@@ -45,11 +45,11 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
     static final ConfigServerApplication configServerApplication = new ConfigServerApplication();
     static final ProxyHostApplication proxyHostApplication = new ProxyHostApplication();
     static final TenantHostApplication tenantHostApplication = new TenantHostApplication();
-    static final DevHostApplication devHostApplicaton = new DevHostApplication();
+    static final DevHostApplication devHostApplication = new DevHostApplication();
 
     private final Map<ApplicationId, InfraApplication> supportedInfraApplications;
 
-    private static CriticalRegionChecker disallowedDuperModeLockAcquisitionRegions =
+    private static final CriticalRegionChecker disallowedDuperModeLockAcquisitionRegions =
             new CriticalRegionChecker("duper model deadlock detection");
 
     private final ReentrantLock lock = new ReentrantLock(true);
@@ -68,13 +68,14 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
     }
 
     /** Non-private for testing */
-    public DuperModelManager(boolean multitenant, boolean isController, SuperModelProvider superModelProvider, DuperModel duperModel, FlagSource flagSource, SystemName system) {
+    public DuperModelManager(boolean multitenant, boolean isController, SuperModelProvider superModelProvider,
+                             DuperModel duperModel, FlagSource flagSource, SystemName system) {
         this.duperModel = duperModel;
 
         if (system == SystemName.dev) {
             // TODO (mortent): Support controllerApplication in dev system
             supportedInfraApplications =
-                    Stream.of(devHostApplicaton, configServerApplication)
+                    Stream.of(devHostApplication, configServerApplication)
                     .collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity()));
         } else if (multitenant) {
             supportedInfraApplications =
@@ -129,9 +130,7 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
         return Optional.ofNullable(supportedInfraApplications.get(applicationId));
     }
 
-    /**
-     * Returns true if application is considered an infrastructure application by the DuperModel.
-     */
+    /** Returns true if application is considered an infrastructure application by the DuperModel. */
     public boolean isSupportedInfraApplication(ApplicationId applicationId) {
         return supportedInfraApplications.containsKey(applicationId);
     }
@@ -234,4 +233,5 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
             lock.unlock();
         }
     }
+
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java
index 2c1b00f93a4..0b90350b7be 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java
@@ -9,10 +9,16 @@ import com.yahoo.vespa.applicationmodel.ServiceType;
  * @author hakonhall
  */
 public abstract class HostAdminApplication extends InfraApplication {
+
     public static final int HOST_ADMIN_HEALT_PORT = 8080;
 
     protected HostAdminApplication(String applicationName, NodeType nodeType) {
-        super(applicationName, nodeType, ClusterSpec.Type.container, ClusterSpec.Id.from(applicationName),
-                ServiceType.HOST_ADMIN, HOST_ADMIN_HEALT_PORT);
+        super(applicationName,
+              nodeType,
+              ClusterSpec.Type.container,
+              ClusterSpec.Id.from(applicationName),
+              ServiceType.HOST_ADMIN,
+              HOST_ADMIN_HEALT_PORT);
     }
+
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
index a3a13bc7b57..8a62db87e7c 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
@@ -170,4 +170,5 @@ public abstract class InfraApplication implements InfraApplicationApi {
                 ", healthPort=" + healthPort +
                 '}';
     }
+
 }