Nonfunctional changes

9 files changed, 14 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
index 542f50247a7..61a5db04ca7 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java
@@ -77,7 +77,7 @@ public class Hosts {
             if ("localhost".equals(name)) {
                 name = HostName.getLocalhost();
             }
-            final List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes());
+            List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes());
             if (hostAliases.isEmpty()) {
                 throw new IllegalArgumentException("No host aliases defined for host '" + name + "'");
             }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index 72309d4c266..0f7c040bf02 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -105,7 +105,7 @@ public class HostResource implements Comparable<HostResource> {
         if (wantedPort > 0) {
             if (service.getPortCount() < 1) {
                 throw new RuntimeException(service + " wants baseport " + wantedPort +
-                        ", but it has not reserved any ports, so it cannot name a desired baseport.");
+                                           ", but it has not reserved any ports, so it cannot name a desired baseport.");
             }
             if (service.requiresWantedPort() || canUseWantedPort(service, wantedPort, serviceBasePort))
                 serviceBasePort = wantedPort;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 8cdf9ba4977..cdd90ae1a36 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -22,8 +22,7 @@ import java.util.Optional;
 /**
  * Represents a config server cluster.
  *
- * @author lulf
- * @since 5.15
+ * @author Ulf Lilleengen
  */
 public class ConfigserverCluster extends AbstractConfigProducer
         implements
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
index 30b5f6f737d..149e013687f 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
@@ -34,6 +34,7 @@ import java.util.stream.Stream;
  * @author freva
  */
 public class NodeRetirer extends Maintainer {
+
     public static final FlavorSpareChecker.SpareNodesPolicy SPARE_NODES_POLICY = flavorSpareCount ->
             flavorSpareCount.getNumReadyAmongReplacees() > 2;
 
@@ -226,4 +227,5 @@ public class NodeRetirer extends Maintainer {
                         Node::flavor,
                         Collectors.groupingBy(Node::state, Collectors.counting())));
     }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
index b06b5934713..7bc7d3ee732 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
@@ -87,7 +87,7 @@ public class RetiredExpirer extends Maintainer {
     /**
      * Checks if the node can be removed:
      * if the node is a docker host, it will only be removed if it has no children,
-     * or all its children are parked or failed
+     * or all its children are parked or failed.
      * Otherwise, a removal is allowed if either of these are true:
      * - The node has been in state {@link History.Event.Type#retired} for longer than {@link #retiredExpiry}
      * - Orchestrator allows it
@@ -101,8 +101,8 @@ public class RetiredExpirer extends Maintainer {
 
         Optional<Instant> timeOfRetiredEvent = node.history().event(History.Event.Type.retired).map(History.Event::at);
         Optional<Instant> retireAfter = timeOfRetiredEvent.map(retiredEvent -> retiredEvent.plus(retiredExpiry));
-        boolean shouldRetireNowBecauseExpried = retireAfter.map(time -> time.isBefore(clock.instant())).orElse(false);
-        if (shouldRetireNowBecauseExpried) {
+        boolean shouldRetireNowBecauseExpired = retireAfter.map(time -> time.isBefore(clock.instant())).orElse(false);
+        if (shouldRetireNowBecauseExpired) {
             return true;
         }
 
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
index dbc526bdf03..095a7da8322 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
  * @author smorgrav
  */
 public class OrchestratorImpl implements Orchestrator {
+
     private static final Logger log = Logger.getLogger(OrchestratorImpl.class.getName());
 
     private final Policy policy;
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java
index 1e9efa2e700..8e02f940127 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicy.java
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
  */
 
 public class HostedVespaPolicy implements Policy {
+
     public static final String APPLICATION_SUSPENDED_CONSTRAINT = "application-suspended";
     public static final String ENOUGH_SERVICES_UP_CONSTRAINT = "enough-services-up";
     public static final String SET_NODE_STATE_CONSTRAINT = "controller-set-node-state";
@@ -125,4 +126,5 @@ public class HostedVespaPolicy implements Policy {
         ApplicationApi applicationApi = new ApplicationApiImpl(nodeGroup, hostStatusService, clusterControllerClientFactory);
         releaseSuspensionGrant(applicationApi);
     }
+
 }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java
index ad057e2c6e1..399ffd3128f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.objects.Serializer;
 /**
  * This class represents a single hit from the fastserver4 backend
  *
- * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
+ * @author havardpe
  */
 public class FS4Hit extends Hit {
 
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java
index 59cdb85311f..1d0d0ed5fee 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java
@@ -8,5 +8,7 @@ package com.yahoo.searchlib.aggregation.hll;
  * @author bjorncs
  */
 public interface UniqueCountEstimator<T> {
+
     long estimateCount(T sketch);
+
 }