diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java index b889179750e..a046ed87a05 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java @@ -22,7 +22,7 @@ import java.util.Map; */ public class ClusterUtilizationMaintainer extends Maintainer { - Controller controller; + private final Controller controller; public ClusterUtilizationMaintainer(Controller controller, Duration duration, JobControl jobControl) { super(controller, duration, jobControl); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/TestIdentities.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/TestIdentities.java index a2fec7cfdbf..18d3e92620d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/TestIdentities.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/TestIdentities.java @@ -12,14 +12,14 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.RegionId; */ public class TestIdentities { - public static EnvironmentId environment = new EnvironmentId("dev"); + public static final EnvironmentId environment = new EnvironmentId("dev"); - public static RegionId region = new RegionId("us-east-1"); + public static final RegionId region = new RegionId("us-east-1"); - public static InstanceId instance = new InstanceId("default"); + public static final InstanceId instance = new InstanceId("default"); - public static Property property = new Property("property"); + public static final Property property = new Property("property"); - public static NToken userNToken = new NToken("dummy"); + public static final NToken userNToken = new NToken("dummy"); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index e6c4721117d..354f736202a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -46,8 +46,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer private final Map<URI, Version> versions = new HashMap<>(); private final NodeRepositoryMock nodeRepository = new NodeRepositoryMock(); private final Map<DeploymentId, ServiceConvergence> serviceStatus = new HashMap<>(); + private final Version initialVersion = new Version(6, 1, 0); - private Version initialVersion = new Version(6, 1, 0); private Version lastPrepareVersion = null; private RuntimeException prepareException = null; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java index a1aef28bd63..2b76d386fdd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java @@ -168,8 +168,8 @@ public class DeploymentIssueReporterTest { class MockDeploymentIssues extends LoggingDeploymentIssues { - Map<ApplicationId, IssueId> applicationIssues = new HashMap<>(); - Map<IssueId, Integer> issueLevels = new HashMap<>(); + private final Map<ApplicationId, IssueId> applicationIssues = new HashMap<>(); + private final Map<IssueId, Integer> issueLevels = new HashMap<>(); MockDeploymentIssues() { super(tester.clock()); |