summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-09-30 14:01:27 +0200
committerMartin Polden <mpolden@mpolden.no>2019-09-30 14:01:27 +0200
commit57934fd0d48fcc24e08d17177f68c19db7fcf0f2 (patch)
tree0c74a9bdc42977a9cad86122bac31cd381318d99 /container-core
parente2735128a9e93a7649a917422a149649ec0efc0a (diff)
Use ResourceResponse
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java14
1 files changed, 9 insertions, 5 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 4852bfafa60..ff301d44798 100644
--- a/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java
+++ b/container-core/src/main/java/com/yahoo/restapi/ResourceResponse.java
@@ -9,6 +9,7 @@ import com.yahoo.slime.Slime;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.URI;
/**
* Returns a response containing an array of links to sub-resources
@@ -19,18 +20,21 @@ public class ResourceResponse extends HttpResponse {
private final Slime slime = new Slime();
- public ResourceResponse(HttpRequest request, String ... 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(request.getUri())
- .append(subResource)
- .withTrailingSlash()
- .toString());
+ resourceEntry.setString("url", new Uri(parentUrl).append(subResource)
+ .withTrailingSlash()
+ .toString());
}
}
+ public ResourceResponse(HttpRequest request, String ... subResources) {
+ this(request.getUri(), subResources);
+ }
+
@Override
public void render(OutputStream stream) throws IOException {
new JsonFormat(true).encode(stream, slime);