Remove unused method and simplify

1 files changed, 20 insertions, 24 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
index 9538167c6de..b83d70b8656 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
@@ -20,16 +20,13 @@ import static com.yahoo.vdslib.state.NodeState.ORCHESTRATOR_RESERVED_DESCRIPTION
 
 public class ContentCluster {
 
-    private final String clusterName;
+    private static final int pollingFrequency = 5000;
 
+    private final String clusterName;
     private final ClusterInfo clusterInfo = new ClusterInfo();
-
     private final Map<Node, Long> nodeStartTimestamps = new TreeMap<>();
 
     private int slobrokGenerationCount = 0;
-
-    private int pollingFrequency = 5000;
-
     private Distribution distribution;
 
     private final int maxNumberOfGroupsAllowedToBeDown;
@@ -42,7 +39,7 @@ public class ContentCluster {
         this(options.clusterName(), options.nodes(), options.storageDistribution(), options.maxNumberOfGroupsAllowedToBeDown());
     }
 
-    private ContentCluster(String clusterName,
+    ContentCluster(String clusterName,
                           Collection<ConfiguredNode> configuredNodes,
                           Distribution distribution,
                           int maxNumberOfGroupsAllowedToBeDown) {
@@ -91,7 +88,6 @@ public class ContentCluster {
     }
 
     public int getPollingFrequency() { return pollingFrequency; }
-    public void setPollingFrequency(int millisecs) { pollingFrequency = millisecs; }
 
     /** Returns the configured nodes of this as a read-only map indexed on node index (distribution key) */
     public Map<Integer, ConfiguredNode> getConfiguredNodes() {
@@ -131,7 +127,7 @@ public class ContentCluster {
      * @param clusterState the current cluster state version
      * @param condition the upgrade condition
      * @param oldState the old/current wanted state
-     * @param newState state wanted to be set  @return NodeUpgradePrechecker.Response
+     * @param newState state wanted to be set
      * @param inMoratorium whether the CC is in moratorium
      */
     public NodeStateChangeChecker.Result calculateEffectOfNewState(
@@ -144,22 +140,22 @@ public class ContentCluster {
 
     /** Returns the indices of the nodes that have been safely set to the given state by the Orchestrator (best guess). */
     public List<Integer> nodesSafelySetTo(State state) {
-        switch (state) {
-            case MAINTENANCE:  // Orchestrator's ALLOWED_TO_BE_DOWN
-            case DOWN:  // Orchestrator's PERMANENTLY_DOWN
-                return clusterInfo.getStorageNodeInfos().stream()
-                                  .filter(storageNodeInfo -> {
-                            NodeState userWantedState = storageNodeInfo.getUserWantedState();
-                            return userWantedState.getState() == state &&
-                                    Objects.equals(userWantedState.getDescription(), ORCHESTRATOR_RESERVED_DESCRIPTION);
-                        })
-                                  .map(NodeInfo::getNodeIndex)
-                                  .toList();
-            default:
-                // Note: There is no trace left if the Orchestrator set the state to UP, so that's handled
-                // like any other state:
-                return List.of();
-        }
+        return switch (state) {
+            // Orchestrator's ALLOWED_TO_BE_DOWN or PERMANENTLY_DOWN, respectively
+            case MAINTENANCE, DOWN ->
+                    clusterInfo.getStorageNodeInfos().stream()
+                               .filter(storageNodeInfo -> {
+                                   NodeState userWantedState = storageNodeInfo.getUserWantedState();
+                                   return userWantedState.getState() == state &&
+                                           Objects.equals(userWantedState.getDescription(), ORCHESTRATOR_RESERVED_DESCRIPTION);
+                               })
+                               .map(NodeInfo::getNodeIndex)
+                               .toList();
+            default ->
+                    // Note: There is no trace left if the Orchestrator sets the state to UP, so that's handled
+                    // like any other state:
+                    List.of();
+        };
     }
 
     public boolean hasConfiguredNode(int index) {