Remove unused argument and method

4 files changed, 4 insertions, 23 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index ac33398120f..29887666a1b 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -1144,8 +1144,6 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
         @Override
         public FleetController getFleetController() { return FleetController.this; }
         @Override
-        public SlobrokListener getNodeAddedOrRemovedListener() { return FleetController.this; }
-        @Override
         public NodeListener getNodeStateUpdateListener() { return FleetController.this; }
     };
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
index 01b8ed48c80..408c10e81b1 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
@@ -6,14 +6,12 @@ import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.State;
 import com.yahoo.vespa.clustercontroller.core.ClusterStateBundle;
 import com.yahoo.vespa.clustercontroller.core.ContentCluster;
-import com.yahoo.vespa.clustercontroller.core.FleetControllerContext;
 import com.yahoo.vespa.clustercontroller.core.FleetController;
+import com.yahoo.vespa.clustercontroller.core.FleetControllerContext;
 import com.yahoo.vespa.clustercontroller.core.NodeInfo;
 import com.yahoo.vespa.clustercontroller.core.Timer;
-import com.yahoo.vespa.clustercontroller.core.listeners.SlobrokListener;
 import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener;
 import org.apache.zookeeper.KeeperException;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Map;
@@ -32,7 +30,6 @@ public class DatabaseHandler {
     public interface DatabaseContext {
         ContentCluster getCluster();
         FleetController getFleetController();
-        SlobrokListener getNodeAddedOrRemovedListener();
         NodeListener getNodeStateUpdateListener();
     }
 
@@ -179,7 +176,7 @@ public class DatabaseHandler {
 
     private boolean usingZooKeeper() { return (zooKeeperAddress != null); }
 
-    private void connect(ContentCluster cluster, long currentTime) {
+    private void connect(long currentTime) {
         try {
             lastZooKeeperConnectionAttempt = currentTime;
             synchronized (databaseMonitor) {
@@ -251,7 +248,7 @@ public class DatabaseHandler {
                 return false; // Not time to attempt connection yet.
             }
             didWork = true;
-            connect(databaseContext.getCluster(), currentTime);
+            connect(currentTime);
         }
         try {
             synchronized (databaseMonitor) {
@@ -344,7 +341,7 @@ public class DatabaseHandler {
         return didWork;
     }
 
-    public void setMasterVote(DatabaseContext databaseContext, int wantedMasterCandidate) throws InterruptedException {
+    public void setMasterVote(DatabaseContext databaseContext, int wantedMasterCandidate) {
         fleetControllerContext.log(logger, Level.FINE, () -> "Checking if master vote has been updated and need to be stored.");
         // Schedule a write if one of the following is true:
         //   - There is already a pending vote to be written, that may have been written already without our knowledge
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 4d8c7799c58..c07a29b3c1e 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
@@ -9,14 +9,12 @@ import com.yahoo.vespa.clustercontroller.core.database.Database;
 import com.yahoo.vespa.clustercontroller.core.database.DatabaseFactory;
 import com.yahoo.vespa.clustercontroller.core.database.DatabaseHandler;
 import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener;
-import com.yahoo.vespa.clustercontroller.core.listeners.SlobrokListener;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.MockitoAnnotations;
-
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -71,11 +69,6 @@ public class DatabaseHandlerTest {
                 }
 
                 @Override
-                public SlobrokListener getNodeAddedOrRemovedListener() {
-                    return null;
-                }
-
-                @Override
                 public NodeListener getNodeStateUpdateListener() {
                     return null;
                 }
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 0a193766df3..6bc9f434ee6 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
@@ -6,11 +6,9 @@ import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vdslib.state.State;
 import com.yahoo.vespa.clustercontroller.core.database.DatabaseHandler;
-import com.yahoo.vespa.clustercontroller.core.listeners.SlobrokListener;
 import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -69,11 +67,6 @@ public class SystemStateBroadcasterTest {
             }
 
             @Override
-            public SlobrokListener getNodeAddedOrRemovedListener() {
-                return null;
-            }
-
-            @Override
             public NodeListener getNodeStateUpdateListener() {
                 return null;
             }