Minor cleanup

GC dead code, optimize imports, fix unnecessary throws statements

14 files changed, 20 insertions, 40 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
index eccdb4d7832..6855f771258 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
@@ -19,14 +19,12 @@ import static org.mockito.Mockito.mock;
 public class ClusterFixture {
 
     public final ContentCluster cluster;
-    public final Distribution distribution;
     public final FakeTimer timer;
     final StateChangeHandler nodeStateChangeHandler;
     private final ClusterStateGenerator.Params params = new ClusterStateGenerator.Params();
 
-    public ClusterFixture(ContentCluster cluster, Distribution distribution) {
+    public ClusterFixture(ContentCluster cluster) {
         this.cluster = cluster;
-        this.distribution = distribution;
         this.timer = new FakeTimer();
         var context = new FleetControllerContextImpl(new FleetControllerId(cluster.getName(), 0));
         this.nodeStateChangeHandler = new StateChangeHandler(context, timer, mock(EventLogInterface.class));
@@ -184,7 +182,7 @@ public class ClusterFixture {
         Distribution distribution = DistributionBuilder.forFlatCluster(nodeCount);
         ContentCluster cluster = new ContentCluster("foo", nodes, distribution);
 
-        return new ClusterFixture(cluster, distribution);
+        return new ClusterFixture(cluster);
     }
 
     static ClusterFixture forHierarchicCluster(DistributionBuilder.GroupBuilder root) {
@@ -192,7 +190,7 @@ public class ClusterFixture {
         Distribution distribution = DistributionBuilder.forHierarchicCluster(root);
         ContentCluster cluster = new ContentCluster("foo", nodes, distribution);
 
-        return new ClusterFixture(cluster, distribution);
+        return new ClusterFixture(cluster);
     }
 
     ClusterStateGenerator.Params generatorParams() {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleTest.java
index 17c461a487b..930040b0143 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleTest.java
@@ -244,7 +244,6 @@ public class ClusterStateBundleTest {
     @Test
     void cloning_preserves_feed_block_state() {
         var bundle = createTestBundleWithFeedBlock("foo");
-        ;
         var derived = bundle.cloneWithMapper(Function.identity());
         assertEquals(bundle, derived);
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
index 31432d561d0..8d5c2f685f8 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
@@ -10,8 +10,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
index c07a29b3c1e..71ba160a314 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
@@ -45,7 +45,7 @@ public class DatabaseHandlerTest {
         final Object monitor = new Object();
         final ClusterStateBundle dummyBundle;
 
-        Fixture() throws Exception {
+        Fixture() {
             dummyBundle = ClusterStateBundleUtil.makeBundle("distributor:2 storage:2",
                     StateMapping.of("default", "distributor:2 storage:2 .0.s:d"),
                     StateMapping.of("upsidedown", "distributor:2 .0.s:d storage:2"));
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyCommunicator.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyCommunicator.java
index b82d4a135ae..682e36254c9 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyCommunicator.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyCommunicator.java
@@ -25,18 +25,15 @@ public class DummyCommunicator implements Communicator, NodeLookup {
     }
 
     static class DummyGetNodeStateRequest extends GetNodeStateRequest {
-        Waiter<GetNodeStateRequest> waiter;
+        final Waiter<GetNodeStateRequest> waiter;
 
         DummyGetNodeStateRequest(NodeInfo nodeInfo, Waiter<GetNodeStateRequest> waiter) {
             super(nodeInfo);
-
             this.waiter = waiter;
         }
 
         @Override
-        public void abort() {
-
-        }
+        public void abort() {}
     }
 
     public static class DummySetClusterStateRequest extends SetClusterStateRequest {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index f2494ea0301..df7357f31da 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -61,14 +61,15 @@ public class DummyVdsNode {
     private boolean registeredInSlobrok = false;
 
     static class Req {
-        Request request;
-        long timeToReply;
+        final Request request;
+        final long timeToReply;
 
         Req(Request r, long timeToReply) {
             request = r;
             this.timeToReply = timeToReply;
         }
     }
+
     static class BackOff implements BackOffPolicy {
         public void reset() {}
         public double get() { return 0.01; }
@@ -118,7 +119,7 @@ public class DummyVdsNode {
     };
 
     public DummyVdsNode(Timer timer, String[] slobrokConnectionSpecs, String clusterName,
-                        NodeType nodeType, int index) throws Exception {
+                        NodeType nodeType, int index) {
         this.timer = timer;
         this.slobrokConnectionSpecs = slobrokConnectionSpecs;
         this.clusterName = clusterName;
@@ -249,12 +250,6 @@ public class DummyVdsNode {
         setNodeState(new NodeState(type, state));
     }
 
-    public NodeState getNodeState() {
-        synchronized(timer) {
-            return nodeState;
-        }
-    }
-
     List<ClusterState> getSystemStatesReceived() {
         synchronized(timer) {
             return clusterStateBundles.stream()
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerContextImplTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerContextImplTest.java
index 96ce050f33b..b922011b4af 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerContextImplTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerContextImplTest.java
@@ -29,7 +29,7 @@ public class FleetControllerContextImplTest {
     }
 
     private static class MockLogger extends Logger {
-        public List<LogRecord> records = new ArrayList<>();
+        public final List<LogRecord> records = new ArrayList<>();
 
         public MockLogger() {
             super(MockLogger.class.getName(), null);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index f43c5354be5..6abd5dae23f 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -24,7 +24,6 @@ import com.yahoo.vespa.clustercontroller.core.testutils.WaitTask;
 import com.yahoo.vespa.clustercontroller.core.testutils.Waiter;
 import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter;
 import org.junit.jupiter.api.AfterEach;
-import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,7 +55,7 @@ public abstract class FleetControllerTest implements Waiter {
     protected Slobrok slobrok;
     protected FleetControllerOptions options;
     ZooKeeperTestServer zooKeeperServer;
-    protected List<FleetController> fleetControllers = new ArrayList<>();
+    protected final List<FleetController> fleetControllers = new ArrayList<>();
     protected List<DummyVdsNode> nodes = new ArrayList<>();
     private String testName;
 
@@ -154,7 +153,7 @@ public abstract class FleetControllerTest implements Waiter {
         fleetControllers.forEach(f -> {
             try {
                 f.shutdown();
-            } catch (InterruptedException | IOException e) {
+            } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         });
@@ -257,7 +256,7 @@ public abstract class FleetControllerTest implements Waiter {
         fleetControllers.forEach(f -> {
             try {
                 f.shutdown();
-            } catch (InterruptedException | IOException e) {
+            } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         });
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
index f0c8503fed9..0f9fad2c76c 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
@@ -295,7 +295,7 @@ public class GroupAutoTakedownTest {
     }
 
     @Test
-    void previously_cleared_start_timestamps_are_not_reintroduced_on_up_edge() throws Exception {
+    void previously_cleared_start_timestamps_are_not_reintroduced_on_up_edge() {
         ClusterFixture fixture = createFixtureForAllUpHierarchicCluster(
                 DistributionBuilder.withGroups(3).eachWithNodeCount(2), 0.51);
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
index 6bc9f434ee6..1aa3222921d 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
@@ -319,7 +319,6 @@ public class SystemStateBroadcasterTest {
 
     // Type erasure of Waiter in mocked argument capture
     @Test
-    @SuppressWarnings("unchecked")
     void activation_not_sent_if_deferred_activation_is_disabled_in_state_bundle() {
         var f = StateActivationFixture.withTwoPhaseDisabled();
         var cf = f.cf;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ZooKeeperDatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ZooKeeperDatabaseTest.java
index 79c03a67698..52bfd0e2dff 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ZooKeeperDatabaseTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ZooKeeperDatabaseTest.java
@@ -71,7 +71,7 @@ public class ZooKeeperDatabaseTest {
     }
 
     @Test
-    void storing_cluster_state_bundle_with_mismatching_expected_znode_version_throws_exception() throws Exception {
+    void storing_cluster_state_bundle_with_mismatching_expected_znode_version_throws_exception() {
         Throwable exception = assertThrows(CasWriteFailed.class, () -> {
             try (Fixture f = new Fixture()) {
                 f.createDatabase();
@@ -82,7 +82,7 @@ public class ZooKeeperDatabaseTest {
     }
 
     @Test
-    void storing_cluster_state_version_with_mismatching_expected_znode_version_throws_exception() throws Exception {
+    void storing_cluster_state_version_with_mismatching_expected_znode_version_throws_exception() {
         Throwable exception = assertThrows(CasWriteFailed.class, () -> {
             try (Fixture f = new Fixture()) {
                 f.createDatabase();
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/HasMetricContext.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/HasMetricContext.java
index c00076d0faa..92123752465 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/HasMetricContext.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/HasMetricContext.java
@@ -29,7 +29,7 @@ public class HasMetricContext extends BaseMatcher<MetricReporter.Context> {
 
     @Override
     public void describeTo(Description description) {
-        description.appendText(String.format("Context with dimensions %s", dimensions.toString()));
+        description.appendText(String.format("Context with dimensions %s", dimensions));
     }
 
     @Override
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
index b4b468ba70f..e076c4af1e7 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
@@ -10,28 +10,23 @@ import java.util.logging.Level;
 
 public class TestEventLog implements EventLogInterface {
     private StringBuilder events = new StringBuilder();
-    private int eventCount = 0;
 
-    public void clear() { events = new StringBuilder(); eventCount = 0; }
+    public void clear() { events = new StringBuilder(); }
     public String toString() { return events.toString(); }
-    public int getEventCount() { return eventCount; }
 
     @Override
     public void add(Event e) {
         events.append("add(" + e.getDescription() + ")\n");
-        ++eventCount;
     }
 
     @Override
     public void add(Event e, boolean logInfo) {
         events.append("add(" + e + ", log ? " + logInfo + ")\n");
-        ++eventCount;
     }
 
     @Override
     public void addNodeOnlyEvent(NodeEvent e, Level level) {
         events.append("add(" + e + ", " + level + ")\n");
-        ++eventCount;
     }
 
     @Override
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
index b09069dbad7..f7403b45707 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
@@ -49,7 +49,7 @@ public abstract class StateRestApiTest {
         public String[] getUnitPath() { return path; }
     }
 
-    protected void setUp(boolean dontInitializeNode2) throws Exception {
+    protected void setUp(boolean dontInitializeNode2) {
         Distribution distribution = new Distribution(getSimpleGroupConfig(2, 10));
         jsonWriter.setDefaultPathPrefix("/cluster/v2");
         {