Make fields final

9 files changed, 18 insertions, 18 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
index 6099ecbb253..321eb783dab 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.certificate;
 
 public class EndpointCertificateException extends RuntimeException {
 
-    private Type type;
+    private final Type type;
 
     public EndpointCertificateException(Type type, String message) {
         super(message);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 9d093835aca..e696cb2d033 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -82,7 +82,7 @@ public class JobController {
     private final Badges badges;
     private final JobMetrics metric;
 
-    private AtomicReference<Consumer<Run>> runner = new AtomicReference<>(__ -> { });
+    private final AtomicReference<Consumer<Run>> runner = new AtomicReference<>(__ -> { });
 
     public JobController(Controller controller) {
         this.controller = controller;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
index 611ea4327ed..af0e3d5807d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
@@ -66,7 +66,7 @@ public class ZoneApiMock implements ZoneApi {
     }
 
     public static class Builder {
-        private SystemName systemName = SystemName.defaultSystem();
+        private final SystemName systemName = SystemName.defaultSystem();
         private ZoneId id = ZoneId.defaultId();
         private CloudName cloudName = CloudName.defaultName();
         private String cloudNativeRegionName = id.region().value();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
index cd2a4fd8453..1c66a01db8e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
@@ -27,10 +27,10 @@ import static org.junit.Assert.*;
  */
 public class CloudEventReporterTest {
 
-    private ControllerTester tester = new ControllerTester();
-    private ZoneApiMock nonAwsZone = createZone("prod.zone3", "region-1", "other");
-    private ZoneApiMock awsZone1 = createZone("prod.zone1", "region-1", "aws");
-    private ZoneApiMock awsZone2 = createZone("prod.zone2", "region-2", "aws");
+    private final ControllerTester tester = new ControllerTester();
+    private final ZoneApiMock nonAwsZone = createZone("prod.zone3", "region-1", "other");
+    private final ZoneApiMock awsZone1 = createZone("prod.zone1", "region-1", "aws");
+    private final ZoneApiMock awsZone2 = createZone("prod.zone2", "region-2", "aws");
 
 
     /**
@@ -153,4 +153,4 @@ public class CloudEventReporterTest {
                 .build();
     }
 
-}
\ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
index 32626e8ea8e..d2946651619 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
@@ -414,7 +414,7 @@ public class JobRunnerTest {
 
     public static ExecutorService inThreadExecutor() {
         return new AbstractExecutorService() {
-            AtomicBoolean shutDown = new AtomicBoolean(false);
+            final AtomicBoolean shutDown = new AtomicBoolean(false);
             @Override public void shutdown() { shutDown.set(true); }
             @Override public List<Runnable> shutdownNow() { shutDown.set(true); return Collections.emptyList(); }
             @Override public boolean isShutdown() { return shutDown.get(); }
@@ -426,7 +426,7 @@ public class JobRunnerTest {
 
     private static ExecutorService phasedExecutor(Phaser phaser) {
         return new AbstractExecutorService() {
-            ExecutorService delegate = Executors.newFixedThreadPool(32);
+            final ExecutorService delegate = Executors.newFixedThreadPool(32);
             @Override public void shutdown() { delegate.shutdown(); }
             @Override public List<Runnable> shutdownNow() { return delegate.shutdownNow(); }
             @Override public boolean isShutdown() { return delegate.isShutdown(); }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
index a28ef41c908..e0a97d32597 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEquals;
 public class ResourceMeterMaintainerTest {
 
     private final ControllerTester tester = new ControllerTester();
-    private MockMeteringClient snapshotConsumer = new MockMeteringClient();
-    private MetricsMock metrics = new MetricsMock();
+    private final MockMeteringClient snapshotConsumer = new MockMeteringClient();
+    private final MetricsMock metrics = new MetricsMock();
 
     @Test
     public void testMaintainer() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
index 0a0aa7c9ded..653a4c5394b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.*;
  */
 public class ResourceTagMaintainerTest {
 
-    ControllerTester tester = new ControllerTester();
+    final ControllerTester tester = new ControllerTester();
 
     @Test
     public void maintain() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializerTest.java
index 58957e50d2d..3c80245c025 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializerTest.java
@@ -10,9 +10,9 @@ import static org.junit.Assert.*;
 
 public class EndpointCertificateMetadataSerializerTest {
 
-    private EndpointCertificateMetadata sample =
+    private final EndpointCertificateMetadata sample =
             new EndpointCertificateMetadata("keyName", "certName", 1);
-    private EndpointCertificateMetadata sampleWithRequestMetadata =
+    private final EndpointCertificateMetadata sampleWithRequestMetadata =
             new EndpointCertificateMetadata("keyName", "certName", 1, Optional.of("requestId"), Optional.of(List.of("SAN1", "SAN2")), Optional.of("issuer"));
 
     @Test
@@ -44,4 +44,4 @@ public class EndpointCertificateMetadataSerializerTest {
                 EndpointCertificateMetadataSerializer.fromJsonString(
                         "{\"keyName\":\"keyName\",\"certName\":\"certName\",\"version\":1,\"requestId\":\"requestId\",\"requestedDnsSans\":[\"SAN1\",\"SAN2\"],\"issuer\":\"issuer\"}"));
     }
-}
\ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 2f42823dc53..b488c0f9d0a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -1654,8 +1654,8 @@ public class ApplicationApiTest extends ControllerContainerTest {
         private OktaIdentityToken oktaIdentityToken;
         private OktaAccessToken oktaAccessToken;
         private String contentType = "application/json";
-        private Map<String, List<String>> headers = new HashMap<>();
-        private Map<String, String> properties = new HashMap<>();
+        private final Map<String, List<String>> headers = new HashMap<>();
+        private final Map<String, String> properties = new HashMap<>();
 
         private RequestBuilder(String path, Request.Method method) {
             this.path = path;