Clean up interface

2 files changed, 6 insertions, 22 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index 72592e16bfd..b09d8a7ba66 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -36,36 +36,21 @@ public interface NodeRepository {
 
     void deleteNode(ZoneId zone, String hostname);
 
-    void setState(ZoneId zone, NodeState nodeState, String nodename);
+    void setState(ZoneId zone, NodeState nodeState, String hostname);
 
     NodeRepositoryNode getNode(ZoneId zone, String hostname);
 
+    // TODO: Migrate any callers to list() and remove this method
     NodeList listNodes(ZoneId zone);
 
-    NodeList listNodes(ZoneId zone, ApplicationId application);
-
-    NodeList listNodes(ZoneId zone, List<HostName> hostnames);
-
     /** List all nodes in given zone */
-    default List<Node> list(ZoneId zone) {
-        return listNodes(zone).nodes().stream()
-                              .map(NodeRepository::toNode)
-                              .collect(Collectors.toUnmodifiableList());
-    }
+    List<Node> list(ZoneId zone);
 
     /** List all nodes in zone having given hostnames */
-    default List<Node> list(ZoneId zone, List<HostName> hostnames) {
-        return listNodes(zone, hostnames).nodes().stream()
-                                         .map(NodeRepository::toNode)
-                                         .collect(Collectors.toUnmodifiableList());
-    }
+    List<Node> list(ZoneId zone, List<HostName> hostnames);
 
     /** List all nodes in zone owned by given application */
-    default List<Node> list(ZoneId zone, ApplicationId application) {
-        return listNodes(zone, application).nodes().stream()
-                                           .map(NodeRepository::toNode)
-                                           .collect(Collectors.toUnmodifiableList());
-    }
+    List<Node> list(ZoneId zone, ApplicationId application);
 
     /** List all nodes in states, in zone owned by given application */
     default List<Node> list(ZoneId zone, ApplicationId application, Set<Node.State> states) {
@@ -111,7 +96,7 @@ public interface NodeRepository {
     /** Checks whether the zone has the spare capacity to remove the given hosts */
     boolean isReplaceable(ZoneId zoneId, List<HostName> hostNames);
 
-    private static Node toNode(NodeRepositoryNode node) {
+    static Node toNode(NodeRepositoryNode node) {
         var application = Optional.ofNullable(node.getOwner())
                                   .map(owner -> ApplicationId.from(owner.getTenant(), owner.getApplication(),
                                                                    owner.getInstance()));
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
index 26243a28ee0..a54680bd65a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.noderepository;
 
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepoStats;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;