Use plural for methods returning collection

18 files changed, 72 insertions, 72 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java
index c25dd5a5965..da5114b8675 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java
@@ -40,11 +40,11 @@ public class ClusterInfo {
     /** Returns information about the given node id, or null if this node does not exist */
     public NodeInfo getNodeInfo(Node node) { return allNodeInfo.get(node); }
 
-    Collection<DistributorNodeInfo> getDistributorNodeInfo() { return Collections.unmodifiableCollection(distributorNodeInfo.values()); }
+    Collection<DistributorNodeInfo> getDistributorNodeInfos() { return Collections.unmodifiableCollection(distributorNodeInfo.values()); }
 
-    Collection<StorageNodeInfo> getStorageNodeInfo() { return Collections.unmodifiableCollection(storageNodeInfo.values()); }
+    Collection<StorageNodeInfo> getStorageNodeInfos() { return Collections.unmodifiableCollection(storageNodeInfo.values()); }
 
-    Collection<NodeInfo> getAllNodeInfo() { return Collections.unmodifiableCollection(allNodeInfo.values()); }
+    Collection<NodeInfo> getAllNodeInfos() { return Collections.unmodifiableCollection(allNodeInfo.values()); }
 
     /** Returns the configured nodes of this as a read-only map indexed on node index (distribution key) */
     Map<Integer, ConfiguredNode> getConfiguredNodes() { return Collections.unmodifiableMap(nodes); }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java
index f984c3cb3a2..75c6dbe6cec 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java
@@ -129,7 +129,7 @@ public class ClusterStateGenerator {
         final ClusterState workingState = ClusterState.emptyState();
         final Map<Node, NodeStateReason> nodeStateReasons = new HashMap<>();
 
-        for (final NodeInfo nodeInfo : cluster.getNodeInfo()) {
+        for (final NodeInfo nodeInfo : cluster.getNodeInfos()) {
             final NodeState nodeState = computeEffectiveNodeState(nodeInfo, params, nodeStateReasons);
             workingState.setNodeState(nodeInfo.getNode(), nodeState);
         }
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 fabc4999fe5..579417cb8ae 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
@@ -104,7 +104,7 @@ public class ContentCluster {
 
     public void setDistribution(Distribution distribution) {
         this.distribution = distribution;
-        for (NodeInfo info : clusterInfo.getAllNodeInfo()) {
+        for (NodeInfo info : clusterInfo.getAllNodeInfos()) {
             info.setGroup(distribution);
         }
     }
@@ -128,7 +128,7 @@ public class ContentCluster {
     }
 
     public void clearStates() {
-        for (NodeInfo info : clusterInfo.getAllNodeInfo()) {
+        for (NodeInfo info : clusterInfo.getAllNodeInfos()) {
             info.setReportedState(null, 0);
         }
     }
@@ -145,8 +145,8 @@ public class ContentCluster {
         return clusterInfo.getConfiguredNodes();
     }
 
-    public Collection<NodeInfo> getNodeInfo() {
-        return Collections.unmodifiableCollection(clusterInfo.getAllNodeInfo());
+    public Collection<NodeInfo> getNodeInfos() {
+        return Collections.unmodifiableCollection(clusterInfo.getAllNodeInfos());
     }
 
     public ClusterInfo clusterInfo() { return clusterInfo; }
@@ -158,7 +158,7 @@ public class ContentCluster {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("ContentCluster(").append(clusterName).append(") {");
-        for (NodeInfo node : clusterInfo.getAllNodeInfo()) {
+        for (NodeInfo node : clusterInfo.getAllNodeInfos()) {
             sb.append("\n  ").append(node);
         }
         sb.append("\n}");
@@ -197,14 +197,14 @@ public class ContentCluster {
         switch (state) {
             case MAINTENANCE:  // Orchestrator's ALLOWED_TO_BE_DOWN
             case DOWN:  // Orchestrator's PERMANENTLY_DOWN
-                return clusterInfo.getStorageNodeInfo().stream()
-                        .filter(storageNodeInfo -> {
+                return clusterInfo.getStorageNodeInfos().stream()
+                                  .filter(storageNodeInfo -> {
                             NodeState userWantedState = storageNodeInfo.getUserWantedState();
                             return userWantedState.getState() == state &&
                                     Objects.equals(userWantedState.getDescription(), ORCHESTRATOR_RESERVED_DESCRIPTION);
                         })
-                        .map(NodeInfo::getNodeIndex)
-                        .collect(Collectors.toList());
+                                  .map(NodeInfo::getNodeIndex)
+                                  .collect(Collectors.toList());
             default:
                 // Note: There is no trace left if the Orchestrator set the state to UP, so that's handled
                 // like any other state:
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 3137dfff606..1d98b9fe831 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
@@ -380,7 +380,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         ClusterState baselineState = stateBundle.getBaselineClusterState();
         newStates.add(stateBundle);
         metricUpdater.updateClusterStateMetrics(cluster, baselineState,
-                ResourceUsageStats.calculateFrom(cluster.getNodeInfo(), options.clusterFeedBlockLimit, stateBundle.getFeedBlock()));
+                ResourceUsageStats.calculateFrom(cluster.getNodeInfos(), options.clusterFeedBlockLimit, stateBundle.getFeedBlock()));
         lastMetricUpdateCycleCount = cycleCount;
         systemStateBroadcaster.handleNewClusterStates(stateBundle);
         // Iff master, always store new version in ZooKeeper _before_ publishing to any
@@ -399,7 +399,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
             ClusterStateBundle stateBundle = stateVersionTracker.getVersionedClusterStateBundle();
             ClusterState baselineState = stateBundle.getBaselineClusterState();
             metricUpdater.updateClusterStateMetrics(cluster, baselineState,
-                    ResourceUsageStats.calculateFrom(cluster.getNodeInfo(), options.clusterFeedBlockLimit, stateBundle.getFeedBlock()));
+                    ResourceUsageStats.calculateFrom(cluster.getNodeInfos(), options.clusterFeedBlockLimit, stateBundle.getFeedBlock()));
             lastMetricUpdateCycleCount = cycleCount;
             return true;
         } else {
@@ -806,10 +806,10 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         if (bundle == null) {
             return List.of();
         }
-        return cluster.getNodeInfo().stream().
-                filter(n -> effectiveActivatedStateVersion(n, bundle) < version).
-                map(NodeInfo::getNode).
-                collect(Collectors.toList());
+        return cluster.getNodeInfos().stream().
+                      filter(n -> effectiveActivatedStateVersion(n, bundle) < version).
+                      map(NodeInfo::getNode).
+                      collect(Collectors.toList());
     }
 
     private static <E> String stringifyListWithLimits(List<E> list, int limit) {
@@ -939,7 +939,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
                     .stateDeriver(createBucketSpaceStateDeriver())
                     .deferredActivation(options.enableTwoPhaseClusterStateActivation)
                     .feedBlock(createResourceExhaustionCalculator()
-                            .inferContentClusterFeedBlockOrNull(cluster.getNodeInfo()))
+                            .inferContentClusterFeedBlockOrNull(cluster.getNodeInfos()))
                     .deriveAndBuild();
             stateVersionTracker.updateLatestCandidateStateBundle(candidateBundle);
             invokeCandidateStateListeners(candidateBundle);
@@ -1183,7 +1183,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         synchronized (monitor) {
             while (true) {
                 int ackedNodes = 0;
-                for (NodeInfo node : cluster.getNodeInfo()) {
+                for (NodeInfo node : cluster.getNodeInfos()) {
                     if (node.getClusterStateVersionBundleAcknowledged() >= version) {
                         ++ackedNodes;
                     }
@@ -1206,7 +1206,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         synchronized (monitor) {
             while (true) {
                 int distCount = 0, storCount = 0;
-                for (NodeInfo info : cluster.getNodeInfo()) {
+                for (NodeInfo info : cluster.getNodeInfos()) {
                     if (!info.isRpcAddressOutdated()) {
                         if (info.isDistributor()) ++distCount;
                         else ++storCount;
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
index eb0368749f0..3ed03e94fda 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
@@ -359,7 +359,7 @@ public class NodeStateChangeChecker {
         // This method verifies both storage nodes and distributors are up (or retired).
         // The complicated part is making a summary error message.
 
-        for (NodeInfo storageNodeInfo : clusterInfo.getStorageNodeInfo()) {
+        for (NodeInfo storageNodeInfo : clusterInfo.getStorageNodeInfos()) {
             State wantedState = storageNodeInfo.getUserWantedState().getState();
             if (wantedState != State.UP && wantedState != State.RETIRED) {
                 return Result.createDisallowed("Another storage node wants state " +
@@ -373,7 +373,7 @@ public class NodeStateChangeChecker {
             }
         }
 
-        for (NodeInfo distributorNodeInfo : clusterInfo.getDistributorNodeInfo()) {
+        for (NodeInfo distributorNodeInfo : clusterInfo.getDistributorNodeInfos()) {
             State wantedState = distributorNodeInfo.getUserWantedState().getState();
             if (wantedState != State.UP && wantedState != State.RETIRED) {
                 return Result.createDisallowed("Another distributor wants state " + wantedState.toString().toUpperCase() +
@@ -418,10 +418,10 @@ public class NodeStateChangeChecker {
      * @param clusterStateVersion the cluster state we expect distributors to have
      */
     private Result checkDistributors(Node node, int clusterStateVersion) {
-        if (clusterInfo.getDistributorNodeInfo().isEmpty()) {
+        if (clusterInfo.getDistributorNodeInfos().isEmpty()) {
             return Result.createDisallowed("Not aware of any distributors, probably not safe to upgrade?");
         }
-        for (DistributorNodeInfo distributorNodeInfo : clusterInfo.getDistributorNodeInfo()) {
+        for (DistributorNodeInfo distributorNodeInfo : clusterInfo.getDistributorNodeInfos()) {
             Integer distributorClusterStateVersion = distributorNodeInfo.getHostInfo().getClusterStateVersionOrNull();
             if (distributorClusterStateVersion == null) {
                 return Result.createDisallowed("Distributor node " + distributorNodeInfo.getNodeIndex()
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
index e3fe371c05e..cb22271b401 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
@@ -57,7 +57,7 @@ public class NodeStateGatherer {
     public boolean sendMessages(ContentCluster cluster, Communicator communicator, NodeStateOrHostInfoChangeHandler listener) {
         boolean sentAnyMessages = false;
         long currentTime = timer.getCurrentTimeInMillis();
-        for (NodeInfo info : cluster.getNodeInfo()) {
+        for (NodeInfo info : cluster.getNodeInfos()) {
             Long requestTime = info.getLatestNodeStateRequestTime();
 
             if (requestTime != null && (currentTime - requestTime < nodeStateRequestTimeoutMS)) continue; // pending request
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
index 46fafddfade..47b5b38edc8 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
@@ -246,7 +246,7 @@ public class StateChangeHandler {
         boolean triggeredAnyTimers = false;
         final long currentTime = timer.getCurrentTimeInMillis();
 
-        for(NodeInfo node : cluster.getNodeInfo()) {
+        for(NodeInfo node : cluster.getNodeInfos()) {
             triggeredAnyTimers |= handleTimeDependentOpsForNode(currentClusterState, nodeListener, currentTime, node);
         }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index d061f7edbea..2359e4d8389 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -188,18 +188,18 @@ public class SystemStateBroadcaster {
     }
 
     private List<NodeInfo> resolveStateVersionSendSet(DatabaseHandler.DatabaseContext dbContext) {
-        return dbContext.getCluster().getNodeInfo().stream()
-                .filter(this::nodeNeedsClusterStateBundle)
-                .filter(node -> !newestStateBundleAlreadySentToNode(node))
-                .collect(Collectors.toList());
+        return dbContext.getCluster().getNodeInfos().stream()
+                        .filter(this::nodeNeedsClusterStateBundle)
+                        .filter(node -> !newestStateBundleAlreadySentToNode(node))
+                        .collect(Collectors.toList());
     }
 
     // Precondition: no nodes in the cluster need to receive the current cluster state version bundle
     private List<NodeInfo> resolveStateActivationSendSet(DatabaseHandler.DatabaseContext dbContext) {
-        return dbContext.getCluster().getNodeInfo().stream()
-                .filter(this::nodeNeedsClusterStateActivation)
-                .filter(node -> !newestStateActivationAlreadySentToNode(node))
-                .collect(Collectors.toList());
+        return dbContext.getCluster().getNodeInfos().stream()
+                        .filter(this::nodeNeedsClusterStateActivation)
+                        .filter(node -> !newestStateActivationAlreadySentToNode(node))
+                        .collect(Collectors.toList());
     }
 
     private boolean newestStateBundleAlreadySentToNode(NodeInfo node) {
@@ -222,9 +222,9 @@ public class SystemStateBroadcaster {
             return; // Nothing to do for the current state
         }
         final int currentStateVersion = clusterStateBundle.getVersion();
-        boolean anyDistributorsNeedStateBundle = dbContext.getCluster().getNodeInfo().stream()
-                .filter(NodeInfo::isDistributor)
-                .anyMatch(this::nodeNeedsClusterStateBundle);
+        boolean anyDistributorsNeedStateBundle = dbContext.getCluster().getNodeInfos().stream()
+                                                          .filter(NodeInfo::isDistributor)
+                                                          .anyMatch(this::nodeNeedsClusterStateBundle);
 
         if (!anyDistributorsNeedStateBundle && (currentStateVersion > lastStateVersionBundleAcked)) {
             markCurrentClusterStateBundleAsReceivedByAllDistributors();
@@ -243,9 +243,9 @@ public class SystemStateBroadcaster {
             return;
         }
 
-        boolean anyDistributorsNeedActivation = dbContext.getCluster().getNodeInfo().stream()
-                .filter(NodeInfo::isDistributor)
-                .anyMatch(this::nodeNeedsClusterStateActivation);
+        boolean anyDistributorsNeedActivation = dbContext.getCluster().getNodeInfos().stream()
+                                                         .filter(NodeInfo::isDistributor)
+                                                         .anyMatch(this::nodeNeedsClusterStateActivation);
 
         if (!anyDistributorsNeedActivation && (currentStateVersion > lastClusterStateVersionConverged)) {
             markCurrentClusterStateAsConverged(database, dbContext, fleetController);
@@ -352,7 +352,7 @@ public class SystemStateBroadcaster {
 
     private static ClusterState buildModifiedClusterState(ClusterState sourceState, DatabaseHandler.DatabaseContext dbContext) {
         ClusterState newState = sourceState.clone();
-        for (NodeInfo n : dbContext.getCluster().getNodeInfo()) {
+        for (NodeInfo n : dbContext.getCluster().getNodeInfos()) {
             NodeState ns = newState.getNodeState(n.getNode());
             if (!n.isDistributor() && ns.getStartTimestamp() == 0) {
                 ns.setStartTimestamp(n.getStartTimestamp());
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 0c6c773a9bc..6db3c640a61 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
@@ -429,7 +429,7 @@ public class DatabaseHandler {
     public void saveWantedStates(DatabaseContext databaseContext) {
         fleetControllerContext.log(logger, Level.FINE, () -> "Checking whether wanted states have changed compared to zookeeper version.");
         Map<Node, NodeState> wantedStates = new TreeMap<>();
-        for (NodeInfo info : databaseContext.getCluster().getNodeInfo()) {
+        for (NodeInfo info : databaseContext.getCluster().getNodeInfos()) {
             if (!info.getUserWantedState().equals(new NodeState(info.getNode().getType(), State.UP))) {
                 wantedStates.put(info.getNode(), info.getUserWantedState());
             }
@@ -477,7 +477,7 @@ public class DatabaseHandler {
         }
 
         // Remove wanted state from any node having a wanted state set that is no longer valid
-        for (NodeInfo info : databaseContext.getCluster().getNodeInfo()) {
+        for (NodeInfo info : databaseContext.getCluster().getNodeInfos()) {
             NodeState wantedState = wantedStates.get(info.getNode());
             if (wantedState == null && !info.getUserWantedState().equals(new NodeState(info.getNode().getType(), State.UP))) {
                 info.setWantedState(null);
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index 65c8a9df28e..60cd3c06893 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -234,7 +234,7 @@ public class RpcServer {
                     log.log(Level.FINE, "Resolving RPC getNodeList request");
                     List<String> slobrok = new ArrayList<String>();
                     List<String> rpc = new ArrayList<String>();
-                    for(NodeInfo node : cluster.getNodeInfo()) {
+                    for(NodeInfo node : cluster.getNodeInfos()) {
                         String s1 = node.getSlobrokAddress();
                         String s2 = node.getRpcAddress();
                         assert(s1 != null);
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
index 7487f9546b7..589e9b25e54 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
@@ -149,7 +149,7 @@ public class SlobrokClient implements NodeLookup {
             }
         }
         cluster.setSlobrokGenerationCount(mirrorVersion);
-        for (NodeInfo nodeInfo : cluster.getNodeInfo()) {
+        for (NodeInfo nodeInfo : cluster.getNodeInfos()) {
             if (slobrokNodes.containsKey(nodeInfo.getNode()) && nodeInfo.isRpcAddressOutdated()) {
                 context.log(log,
                             Level.WARNING,
@@ -174,7 +174,7 @@ public class SlobrokClient implements NodeLookup {
             List<SlobrokData> alteredRpcAddress,
             List<NodeInfo> returningRpcAddressNodeInfos)
     {
-        Iterator<NodeInfo> oldIt = oldCluster.getNodeInfo().iterator();
+        Iterator<NodeInfo> oldIt = oldCluster.getNodeInfos().iterator();
         Iterator<SlobrokData> newIt = slobrokNodes.values().iterator();
         NodeInfo oldNext = null;
         SlobrokData newNext = null;
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 4ce32484098..ba2a4352d51 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
@@ -142,7 +142,7 @@ public class ClusterFixture {
     }
 
     public ClusterFixture assignDummyRpcAddresses() {
-        cluster.getNodeInfo().forEach(ni -> {
+        cluster.getNodeInfos().forEach(ni -> {
             ni.setRpcAddress(String.format("tcp/%s.%d.local:0",
                     ni.isStorage() ? "storage" : "distributor",
                     ni.getNodeIndex()));
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 3c232a7c52b..e999c5b2011 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
@@ -140,7 +140,7 @@ public class DummyCommunicator implements Communicator, NodeLookup {
             for (Node node : tmp)
                 cluster.clusterInfo().setRpcAddress(node, "foo");
 
-            for (NodeInfo info : cluster.getNodeInfo()) {
+            for (NodeInfo info : cluster.getNodeInfos()) {
                 if (!tmp.contains(info.getNode())) {
                     info.markRpcAddressOutdated(timer);
                     listener.handleMissingNode(info);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculatorTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculatorTest.java
index 7e02f63d56e..e136ddfa72d 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculatorTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceExhaustionCalculatorTest.java
@@ -23,7 +23,7 @@ public class ResourceExhaustionCalculatorTest {
         var calc = new ResourceExhaustionCalculator(true, mapOf(usage("disk", 0.5), usage("memory", 0.8)));
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.49), usage("memory", 0.79)),
                                                  forNode(2, usage("disk", 0.4), usage("memory", 0.6)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNull(feedBlock);
     }
 
@@ -32,7 +32,7 @@ public class ResourceExhaustionCalculatorTest {
         var calc = new ResourceExhaustionCalculator(true, mapOf(usage("disk", 0.5), usage("memory", 0.8)));
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.51), usage("memory", 0.79)),
                                                  forNode(2, usage("disk", 0.4), usage("memory", 0.6)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertTrue(feedBlock.blockFeedInCluster());
         assertEquals("disk on node 1 [storage.1.local] (0.510 > 0.500)", feedBlock.getDescription());
@@ -43,7 +43,7 @@ public class ResourceExhaustionCalculatorTest {
         var calc = new ResourceExhaustionCalculator(true, mapOf(usage("disk", 0.5), usage("memory", 0.8)));
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", "a-fancy-disk", 0.51), usage("memory", 0.79)),
                                                  forNode(2, usage("disk", 0.4), usage("memory", 0.6)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertTrue(feedBlock.blockFeedInCluster());
         assertEquals("disk:a-fancy-disk on node 1 [storage.1.local] (0.510 > 0.500)", feedBlock.getDescription());
@@ -56,7 +56,7 @@ public class ResourceExhaustionCalculatorTest {
                                                  forNode(2, usage("disk", 0.4), usage("memory", 0.85)));
         cf.cluster().getNodeInfo(storageNode(1)).setRpcAddress(null);
         cf.cluster().getNodeInfo(storageNode(2)).setRpcAddress("max mekker");
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertTrue(feedBlock.blockFeedInCluster());
         assertEquals("disk on node 1 [unknown hostname] (0.510 > 0.500), " +
@@ -68,7 +68,7 @@ public class ResourceExhaustionCalculatorTest {
         var calc = new ResourceExhaustionCalculator(true, mapOf(usage("disk", 0.4), usage("memory", 0.8)));
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.51), usage("memory", 0.85)),
                                                  forNode(2, usage("disk", 0.45), usage("memory", 0.6)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertTrue(feedBlock.blockFeedInCluster());
         assertEquals("disk on node 1 [storage.1.local] (0.510 > 0.400), " +
@@ -83,7 +83,7 @@ public class ResourceExhaustionCalculatorTest {
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.51), usage("memory", 0.85)),
                                                  forNode(2, usage("disk", 0.45), usage("memory", 0.6)),
                                                  forNode(3, usage("disk", 0.6), usage("memory", 0.9)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertTrue(feedBlock.blockFeedInCluster());
         assertEquals("disk on node 1 [storage.1.local] (0.510 > 0.400), " +
@@ -97,7 +97,7 @@ public class ResourceExhaustionCalculatorTest {
         var calc = new ResourceExhaustionCalculator(false, mapOf(usage("disk", 0.5), usage("memory", 0.8)));
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.51), usage("memory", 0.79)),
                                                  forNode(2, usage("disk", 0.4), usage("memory", 0.6)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNull(feedBlock);
     }
 
@@ -109,7 +109,7 @@ public class ResourceExhaustionCalculatorTest {
         // Node 2 is at 0.49 but was not previously blocked and should not be blocked now either.
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.3), usage("memory", 0.49)),
                                                  forNode(2, usage("disk", 0.3), usage("memory", 0.49)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         // TODO should we not change the limits themselves? Explicit mention of hysteresis state?
         assertEquals("memory on node 1 [storage.1.local] (0.490 > 0.400)",
@@ -124,7 +124,7 @@ public class ResourceExhaustionCalculatorTest {
         // Node 2 is at 0.49 but was not previously blocked and should not be blocked now either.
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.3), usage("memory", 0.48)),
                                                  forNode(2, usage("disk", 0.3), usage("memory", 0.49)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNotNull(feedBlock);
         assertEquals("memory on node 1 [storage.1.local] (0.480 > 0.400)",
                 feedBlock.getDescription());
@@ -138,7 +138,7 @@ public class ResourceExhaustionCalculatorTest {
         // Node 2 is at 0.49 but was not previously blocked and should not be blocked now either.
         var cf = createFixtureWithReportedUsages(forNode(1, usage("disk", 0.3), usage("memory", 0.39)),
                                                  forNode(2, usage("disk", 0.3), usage("memory", 0.49)));
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNull(feedBlock);
     }
 
@@ -149,7 +149,7 @@ public class ResourceExhaustionCalculatorTest {
                                                  forNode(2, usage("disk", 0.6), usage("memory", 0.6)));
         cf.reportStorageNodeState(1, State.DOWN);
         cf.reportStorageNodeState(2, State.DOWN);
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNull(feedBlock);
     }
 
@@ -160,7 +160,7 @@ public class ResourceExhaustionCalculatorTest {
                                                  forNode(2, usage("disk", 0.6), usage("memory", 0.6)));
         cf.proposeStorageNodeWantedState(1, State.DOWN);
         cf.proposeStorageNodeWantedState(2, State.MAINTENANCE);
-        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfo());
+        var feedBlock = calc.inferContentClusterFeedBlockOrNull(cf.cluster().getNodeInfos());
         assertNull(feedBlock);
     }
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java
index 3a5f9954a20..2eeaf7658ff 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java
@@ -66,7 +66,7 @@ public class ResourceUsageStatsTest {
     }
 
     private static Collection<NodeInfo> createNodeInfo(FeedBlockUtil.NodeAndUsages... nodeAndUsages) {
-        return createFixtureWithReportedUsages(nodeAndUsages).cluster().getNodeInfo();
+        return createFixtureWithReportedUsages(nodeAndUsages).cluster().getNodeInfos();
     }
 
     private static Map<String, Double> createFeedBlockLimits(double diskLimit, double memoryLimit) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
index 5395048cad9..47ba7e1cb77 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
@@ -99,7 +99,7 @@ public class SlobrokTest extends FleetControllerTest {
     private boolean clusterAvailable() {
         boolean ok = true;
         ContentCluster cluster = fleetController.getCluster();
-        for (NodeInfo info : cluster.getNodeInfo()) {
+        for (NodeInfo info : cluster.getNodeInfos()) {
             if (info.getConnectionAttemptCount() > 0) ok = false;
             if (info.getLatestNodeStateRequestTime() == null) ok = false;
         }
@@ -107,7 +107,7 @@ public class SlobrokTest extends FleetControllerTest {
     }
     private void assertClusterAvailable() {
         ContentCluster cluster = fleetController.getCluster();
-        for (NodeInfo info : cluster.getNodeInfo()) {
+        for (NodeInfo info : cluster.getNodeInfos()) {
             assertEquals("Node " + info + " connection attempts.", 0, info.getConnectionAttemptCount());
             assertTrue("Node " + info + " has no last request time.", info.getLatestNodeStateRequestTime() != 0);
         }
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 45593375c0b..913485913bf 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
@@ -91,7 +91,7 @@ public class SystemStateBroadcasterTest {
         ClusterFixture cf = ClusterFixture.forFlatCluster(2).bringEntireClusterUp().assignDummyRpcAddresses();
         f.broadcaster.handleNewClusterStates(stateBundle);
         f.broadcaster.broadcastNewStateBundleIfRequired(dbContextFrom(cf.cluster()), f.mockCommunicator, 3);
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> verify(f.mockCommunicator).setSystemState(eq(stateBundle), eq(nodeInfo), any()));
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> verify(f.mockCommunicator).setSystemState(eq(stateBundle), eq(nodeInfo), any()));
     }
 
     @Test
@@ -121,7 +121,7 @@ public class SystemStateBroadcasterTest {
         f.broadcaster.handleNewClusterStates(stateBundle);
         f.broadcaster.broadcastNewStateBundleIfRequired(dbContextFrom(cf.cluster()), f.mockCommunicator, 3);
 
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> verify(f.mockCommunicator).setSystemState(eq(stateBundle), eq(nodeInfo), any()));
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> verify(f.mockCommunicator).setSystemState(eq(stateBundle), eq(nodeInfo), any()));
     }
 
     @Test
@@ -153,7 +153,7 @@ public class SystemStateBroadcasterTest {
         f.broadcaster.handleNewClusterStates(stateBundle);
         f.broadcaster.broadcastNewStateBundleIfRequired(dbContextFrom(cf.cluster()), f.mockCommunicator, 99);
 
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> {
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> {
             verify(f.mockCommunicator, times(0)).setSystemState(any(), eq(nodeInfo), any());
         });
     }
@@ -166,7 +166,7 @@ public class SystemStateBroadcasterTest {
         f.broadcaster.handleNewClusterStates(stateBundle);
         f.broadcaster.broadcastNewStateBundleIfRequired(dbContextFrom(cf.cluster()), f.mockCommunicator, 100);
 
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> {
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> {
             verify(f.mockCommunicator, times(1)).setSystemState(any(), eq(nodeInfo), any());
         });
     }
@@ -276,7 +276,7 @@ public class SystemStateBroadcasterTest {
         f.simulateBroadcastTick(cf, 123);
 
         // No activations should be sent yet
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> {
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> {
             verify(f.mockCommunicator, times(0)).activateClusterStateVersion(eq(123), eq(nodeInfo), any());
         });
         assertNull(f.broadcaster.getLastClusterStateBundleConverged());
@@ -285,7 +285,7 @@ public class SystemStateBroadcasterTest {
         f.simulateBroadcastTick(cf, 123);
 
         // Activation should now be sent to _all_ nodes (distributor and storage)
-        cf.cluster().getNodeInfo().forEach(nodeInfo -> {
+        cf.cluster().getNodeInfos().forEach(nodeInfo -> {
             verify(f.mockCommunicator).activateClusterStateVersion(eq(123), eq(nodeInfo), any());
         });
         // But not converged yet, as activations have not been ACKed
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/WaitTask.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/WaitTask.java
index 6362d6fe9a7..d9967381e75 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/WaitTask.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/WaitTask.java
@@ -25,7 +25,7 @@ public abstract class WaitTask {
         public boolean performWaitTask() {
             boolean didWork = false;
             synchronized (fleetController.getMonitor()) {
-                for (NodeInfo info : fleetController.getCluster().getNodeInfo()) {
+                for (NodeInfo info : fleetController.getCluster().getNodeInfos()) {
                     if (info.getTimeForNextStateRequestAttempt() != 0) didWork = true;
                     info.setNextGetStateAttemptTime(0);
                 }