diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-01-10 13:14:31 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-01-11 09:29:05 +0100 |
commit | cb25bacee63ffc6b1a4023a45af683c967ef3cb3 (patch) | |
tree | a841f99c79ffa06707fbabdee59cad02fcf4c779 /node-repository | |
parent | 5fb219640514a98b65275c0d485ea371f58ac0df (diff) |
Simplify
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 733f5df7858..d2ab3c20080 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -6,10 +6,10 @@ import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.NodeType; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.slime.Cursor; +import com.yahoo.slime.JsonFormat; import com.yahoo.slime.Slime; -import com.yahoo.vespa.config.SlimeUtils; +import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.History; @@ -81,7 +81,7 @@ class NodesResponse extends HttpResponse { @Override public void render(OutputStream stream) throws IOException { - stream.write(toJson()); + new JsonFormat(true).encode(stream, slime); } @Override @@ -89,10 +89,6 @@ class NodesResponse extends HttpResponse { return "application/json"; } - private byte[] toJson() throws IOException { - return SlimeUtils.toJsonBytes(slime); - } - private void statesToSlime(Cursor root) { Cursor states = root.setObject("states"); for (Node.State state : Node.State.values()) |