diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-02-08 14:08:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 14:08:43 +0100 |
| commit | 8ceff780883d070e7916ee6eb2a241f437faa339 (patch) | |
| tree | b1516fd53461ada7a059209ab7d7ffd7cf9c6b16 /node-repository | |
| parent | cdd1430c6eb50ef5fbe4e65881dbee936fb0a075 (diff) | |
| parent | 6f5f4183b0ed20d54d4bb708813603228c1a180b (diff) | |
Merge pull request #25923 from vespa-engine/mpolden/cleanup
Misc cleanup
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index fd466108063..d09ff1b84fc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -16,7 +16,6 @@ import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.flags.StringFlag; import com.yahoo.vespa.hosted.provision.Node; -import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Address; import com.yahoo.vespa.hosted.provision.node.Allocation; @@ -107,17 +106,11 @@ class NodesResponse extends SlimeJsonResponse { /** Outputs the nodes in the given states to a node array */ private void nodesToSlime(Set<Node.State> states, Cursor parentObject) { Cursor nodeArray = parentObject.setArray("nodes"); - NodeList nodes = nodeRepository.nodes().list() - .state(states) - .sortedBy(Comparator.comparing(Node::hostname)); - toSlime(nodes, nodeArray); - } - - private void toSlime(NodeList nodes, Cursor array) { - for (Node node : nodes) { - if ( ! filter.test(node)) continue; - toSlime(node, recursive, array.addObject()); - } + nodeRepository.nodes().list() + .state(states) + .matching(filter) + .sortedBy(Comparator.comparing(Node::hostname)) + .forEach(node -> toSlime(node, recursive, nodeArray.addObject())); } private void nodeToSlime(String hostname, Cursor object) { |