Simplify ResourceResponse

1 files changed, 17 insertions, 22 deletions

diff --git a/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java b/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java
index ff301d44798..0188136addb 100644
--- a/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java
+++ b/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java
@@ -1,46 +1,41 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.restapi;
 
 import com.yahoo.container.jdisc.HttpRequest;
-import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.slime.Cursor;
-import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URI;
+import java.util.List;
 
 /**
  * Returns a response containing an array of links to sub-resources
  * 
  * @author bratseth
  */
-public class ResourceResponse extends HttpResponse {
+public class ResourceResponse extends SlimeJsonResponse {
 
-    private final Slime slime = new Slime();
+    public ResourceResponse(URI parentUrl, List<String> subResources) {
+        super(200, toSlime(parentUrl, subResources));
+    }
 
     public ResourceResponse(URI parentUrl, String ... subResources) {
-        super(200);
-        Cursor resourceArray = slime.setObject().setArray("resources");
-        for (String subResource : subResources) {
-            Cursor resourceEntry = resourceArray.addObject();
-            resourceEntry.setString("url", new Uri(parentUrl).append(subResource)
-                                                             .withTrailingSlash()
-                                                             .toString());
-        }
+        this(parentUrl, List.of(subResources));
     }
 
     public ResourceResponse(HttpRequest request, String ... subResources) {
         this(request.getUri(), subResources);
     }
 
-    @Override
-    public void render(OutputStream stream) throws IOException {
-        new JsonFormat(true).encode(stream, slime);
+    private static Slime toSlime(URI parentUrl, List<String> subResources) {
+        var slime = new Slime();
+        var resourceArray = slime.setObject().setArray("resources");
+        for (var subResource : subResources) {
+            var resourceEntry = resourceArray.addObject();
+            resourceEntry.setString("url", new Uri(parentUrl).append(subResource)
+                                                             .withTrailingSlash()
+                                                             .toString());
+        }
+        return slime;
     }
 
-    @Override
-    public String getContentType() { return "application/json"; }
-
 }