Remove unnecessary getters

6 files changed, 13 insertions, 21 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
index 60a8da80f2b..34506bb3143 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
@@ -31,7 +31,7 @@ public class DockerFailTest {
             dockerTester.addContainerNodeSpec(containerNodeSpec);
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.getNodeAdmin().getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
                 Thread.sleep(10);
             }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index 1ca368198d0..61658d4b03d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -30,14 +30,14 @@ import static org.mockito.Mockito.when;
 /**
  * @author musum
  */
-// Need to deconstruct updater
+// Need to deconstruct nodeAdminStateUpdater
 public class DockerTester implements AutoCloseable {
     final CallOrderVerifier callOrderVerifier = new CallOrderVerifier();
     final Docker dockerMock = new DockerMock(callOrderVerifier);
     final NodeRepoMock nodeRepositoryMock = new NodeRepoMock(callOrderVerifier);
+    final NodeAdminStateUpdater nodeAdminStateUpdater;
+    final NodeAdmin nodeAdmin;
     private final OrchestratorMock orchestratorMock = new OrchestratorMock(callOrderVerifier);
-    private final NodeAdminStateUpdater updater;
-    private final NodeAdmin nodeAdmin;
 
 
     public DockerTester() {
@@ -61,25 +61,17 @@ public class DockerTester implements AutoCloseable {
         Function<String, NodeAgent> nodeAgentFactory = (hostName) -> new NodeAgentImpl(hostName, nodeRepositoryMock,
                 orchestratorMock, dockerOperations, storageMaintainer, aclMaintainer, environment, clock);
         nodeAdmin = new NodeAdminImpl(dockerOperations, nodeAgentFactory, storageMaintainer, aclMaintainer, 100, mr, Clock.systemUTC());
-        updater = new NodeAdminStateUpdater(nodeRepositoryMock, nodeAdmin, storageMaintainer,
+        nodeAdminStateUpdater = new NodeAdminStateUpdater(nodeRepositoryMock, nodeAdmin, storageMaintainer,
                 clock, orchestratorMock, "basehostname");
-        updater.start(5);
+        nodeAdminStateUpdater.start(5);
     }
 
     public void addContainerNodeSpec(ContainerNodeSpec containerNodeSpec) {
         nodeRepositoryMock.updateContainerNodeSpec(containerNodeSpec);
     }
 
-    public NodeAdmin getNodeAdmin() {
-        return nodeAdmin;
-    }
-
-    public NodeAdminStateUpdater getNodeAdminStateUpdater() {
-        return updater;
-    }
-
     @Override
     public void close() {
-        updater.deconstruct();
+        nodeAdminStateUpdater.deconstruct();
     }
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
index a6bc8a9b4e2..75a0727cb04 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
@@ -82,7 +82,7 @@ public class MultiDockerTest {
         tester.addContainerNodeSpec(containerNodeSpec);
 
         // Wait for node admin to be notified with node repo state and the docker container has been started
-        while (tester.getNodeAdmin().getListOfHosts().size() != tester.nodeRepositoryMock.getNumberOfContainerSpecs()) {
+        while (tester.nodeAdmin.getListOfHosts().size() != tester.nodeRepositoryMock.getNumberOfContainerSpecs()) {
             Thread.sleep(10);
         }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
index 26194ace7cf..669556f07ba 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
@@ -32,7 +32,7 @@ public class NodeStateTest {
         tester.addContainerNodeSpec(initialContainerNodeSpec);
 
         // Wait for node admin to be notified with node repo state and the docker container has been started
-        while (tester.getNodeAdmin().getListOfHosts().size() == 0) {
+        while (tester.nodeAdmin.getListOfHosts().size() == 0) {
             Thread.sleep(10);
         }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
index b7561180264..0b5d67dd13c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
@@ -32,7 +32,7 @@ public class RebootTest {
             dockerTester.addContainerNodeSpec(createContainerNodeSpec());
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.getNodeAdmin().getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
                 Thread.sleep(10);
             }
 
@@ -41,13 +41,13 @@ public class RebootTest {
                     "createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
                     "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=null,  dockerImage=dockerImage, vespaVersion='null'}");
 
-            NodeAdminStateUpdater updater = dockerTester.getNodeAdminStateUpdater();
+            NodeAdminStateUpdater updater = dockerTester.nodeAdminStateUpdater;
             assertThat(updater.setResumeStateAndCheckIfResumed(NodeAdminStateUpdater.State.SUSPENDED),
                        is(Optional.of("Not all node agents are frozen.")));
 
             updater.setResumeStateAndCheckIfResumed(NodeAdminStateUpdater.State.SUSPENDED);
 
-            NodeAdmin nodeAdmin = dockerTester.getNodeAdmin();
+            NodeAdmin nodeAdmin = dockerTester.nodeAdmin;
             // Wait for node admin to be frozen
             while ( ! nodeAdmin.isFrozen()) {
                 System.out.println("Node admin not frozen yet");
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
index 6922aa6cfe2..24821e3b75d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
@@ -25,7 +25,7 @@ public class RestartTest {
             dockerTester.addContainerNodeSpec(createContainerNodeSpec(wantedRestartGeneration, currentRestartGeneration));
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.getNodeAdmin().getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
                 Thread.sleep(10);
             }