Remove unused argument and simplify

2 files changed, 7 insertions, 38 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterControllerStateRestAPI.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterControllerStateRestAPI.java
index 5ca76d40fe1..4d57b92491c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterControllerStateRestAPI.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterControllerStateRestAPI.java
@@ -17,7 +17,6 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRe
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.SetResponse;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
 import java.util.Map;
-import java.util.Objects;
 import java.util.logging.Logger;
 
 public class ClusterControllerStateRestAPI implements StateRestAPI {
@@ -28,32 +27,8 @@ public class ClusterControllerStateRestAPI implements StateRestAPI {
         Map<String, RemoteClusterControllerTaskScheduler> getFleetControllers();
     }
 
-    public static class Socket {
-        public final String hostname;
-        public final int port;
-
-        public Socket(String hostname, int port) {
-            this.hostname = hostname;
-            this.port = port;
-        }
-
-        @Override
-        public String toString() {
-            return hostname + ":" + port;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(hostname, port);
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) return true;
-            if (!(object instanceof Socket)) return false;
-            Socket socket = (Socket) object;
-            return Objects.equals(hostname, socket.hostname) && port == socket.port;
-        }
+    public record Socket(String hostname, int port) {
+        @Override public String toString() { return hostname + ":" + port; }
     }
 
     private final FleetControllerResolver fleetControllerResolver;
@@ -98,9 +73,9 @@ public class ClusterControllerStateRestAPI implements StateRestAPI {
         } else {
             log.fine("Scheduling state request: " + req.getClass().toString());
             resolver.resolveFleetController(request.getUnitPath()).schedule(req);
-            log.finest("Scheduled state request: " + req.getClass().toString());
+            log.finest("Scheduled state request: " + req.getClass());
             req.waitForCompletion();
-            log.finest("Completed processing state request: " + req.getClass().toString());
+            log.finest("Completed processing state request: " + req.getClass());
         }
         try {
             return req.getResult();
@@ -119,7 +94,7 @@ public class ClusterControllerStateRestAPI implements StateRestAPI {
         {
             @Override
             public Request<? extends SetResponse> visitCluster(Id.Cluster id) {
-                return new SetNodeStatesForClusterRequest(id, request);
+                return new SetNodeStatesForClusterRequest(request);
             }
             @Override
             public Request<? extends SetResponse> visitNode(Id.Node id) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStatesForClusterRequest.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStatesForClusterRequest.java
index 1cc8f2860c6..3dbeb6c86dd 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStatesForClusterRequest.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStatesForClusterRequest.java
@@ -6,7 +6,6 @@ import com.yahoo.vdslib.distribution.ConfiguredNode;
 import com.yahoo.vdslib.state.Node;
 import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vespa.clustercontroller.core.RemoteClusterControllerTask;
-import com.yahoo.vespa.clustercontroller.core.restapiv2.Id;
 import com.yahoo.vespa.clustercontroller.core.restapiv2.Request;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.InternalFailure;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.InvalidContentException;
@@ -14,25 +13,20 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.StateRestApiE
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.SetUnitStateRequest;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.SetResponse;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitState;
-
 import java.time.Instant;
 import java.util.Map;
 import java.util.Optional;
-import java.util.logging.Logger;
 
 public class SetNodeStatesForClusterRequest extends Request<SetResponse> {
-    private static final Logger log = Logger.getLogger(SetNodeStateRequest.class.getName());
 
-    private final Id.Cluster cluster;
     private final Map<String, UnitState> newStates;
     private final SetUnitStateRequest.Condition condition;
     private final TimeBudget timeBudget;
     private final boolean probe;
 
 
-    public SetNodeStatesForClusterRequest(Id.Cluster cluster, SetUnitStateRequest request) {
+    public SetNodeStatesForClusterRequest(SetUnitStateRequest request) {
         super(MasterState.MUST_BE_MASTER);
-        this.cluster = cluster;
         this.newStates = request.getNewState();
         this.condition = request.getCondition();
         this.timeBudget = request.timeBudget();
@@ -42,7 +36,7 @@ public class SetNodeStatesForClusterRequest extends Request<SetResponse> {
     @Override
     public SetResponse calculateResult(RemoteClusterControllerTask.Context context) throws StateRestApiException {
         if (condition != SetUnitStateRequest.Condition.FORCE) {
-            // Setting all nodes to e.g. maintainence is by design unsafe in the sense
+            // Setting all nodes to e.g. maintenance is by design unsafe in the sense
             // that it allows effective redundancy to drop to 0, many/all nodes may
             // go down, etc. This is prohibited in Condition.SAFE.
             throw new InvalidContentException(