Move method

2 files changed, 11 insertions, 10 deletions

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 f287745d85f..4b79e45eb2c 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
@@ -277,12 +277,6 @@ public abstract class FleetControllerTest implements Waiter {
         fleetController().waitForCompleteCycle(timeout);
     }
 
-    public static Set<ConfiguredNode> toNodes(Integer ... indexes) {
-        return Arrays.stream(indexes)
-                .map(i -> new ConfiguredNode(i, false))
-                .collect(Collectors.toSet());
-    }
-
     void setWantedState(DummyVdsNode node, State state, String reason, Supervisor supervisor) {
         setWantedState(new NodeState(node.getType(), state), reason, node.getSlobrokName(), supervisor);
     }
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 f7403b45707..205d5b05b29 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
@@ -11,13 +11,14 @@ import com.yahoo.vdslib.state.State;
 import com.yahoo.vespa.clustercontroller.core.AnnotatedClusterState;
 import com.yahoo.vespa.clustercontroller.core.ClusterStateBundle;
 import com.yahoo.vespa.clustercontroller.core.ContentCluster;
-import com.yahoo.vespa.clustercontroller.core.FleetControllerTest;
 import com.yahoo.vespa.clustercontroller.core.NodeInfo;
 import com.yahoo.vespa.clustercontroller.core.RemoteClusterControllerTaskScheduler;
 import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.StateRestAPI;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRequest;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.server.JsonWriter;
+
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -53,7 +54,7 @@ public abstract class StateRestApiTest {
         Distribution distribution = new Distribution(getSimpleGroupConfig(2, 10));
         jsonWriter.setDefaultPathPrefix("/cluster/v2");
         {
-            Set<ConfiguredNode> nodes = FleetControllerTest.toNodes(0, 1, 2, 3);
+            Set<ConfiguredNode> nodes = toNodes(0, 1, 2, 3);
             ContentCluster cluster = new ContentCluster("books", nodes, distribution);
             initializeCluster(cluster, nodes);
             AnnotatedClusterState baselineState = AnnotatedClusterState.withoutAnnotations(ClusterState.stateFromString("distributor:4 storage:4"));
@@ -64,8 +65,8 @@ public abstract class StateRestApiTest {
                     ClusterStateBundle.of(baselineState, bucketSpaceStates), 0, 0);
         }
         {
-            Set<ConfiguredNode> nodes = FleetControllerTest.toNodes(1, 2, 3, 5, 7);
-            Set<ConfiguredNode> nodesInSlobrok = FleetControllerTest.toNodes(1, 3, 5, 7);
+            Set<ConfiguredNode> nodes = toNodes(1, 2, 3, 5, 7);
+            Set<ConfiguredNode> nodesInSlobrok = toNodes(1, 3, 5, 7);
 
             ContentCluster cluster = new ContentCluster("music", nodes, distribution);
             if (dontInitializeNode2) {
@@ -202,4 +203,10 @@ public abstract class StateRestApiTest {
         return sb.toString();
     }
 
+    private static Set<ConfiguredNode> toNodes(Integer ... indexes) {
+        return Arrays.stream(indexes)
+                .map(i -> new ConfiguredNode(i, false))
+                .collect(Collectors.toSet());
+    }
+
 }