Simplify

2 files changed, 10 insertions, 33 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/JobsResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/JobsResponse.java
index e7d1b3e0ed8..6e872038a24 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/JobsResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/JobsResponse.java
@@ -1,31 +1,23 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.restapi.controller;
 
-import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.slime.Cursor;
-import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
-
-import java.io.IOException;
-import java.io.OutputStream;
+import com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse;
 
 /**
  * A response containing maintenance job status
  *
  * @author bratseth
  */
-public class JobsResponse extends HttpResponse {
-
-    private final JobControl jobControl;
+public class JobsResponse extends SlimeJsonResponse {
 
     public JobsResponse(JobControl jobControl) {
-        super(200);
-        this.jobControl = jobControl;
+        super(toSlime(jobControl));
     }
 
-    @Override
-    public void render(OutputStream stream) throws IOException {
+    private static Slime toSlime(JobControl jobControl) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
 
@@ -37,10 +29,7 @@ public class JobsResponse extends HttpResponse {
         for (String jobName : jobControl.inactiveJobs())
             inactiveArray.addString(jobName);
 
-        new JsonFormat(true).encode(stream, slime);
+        return slime;
     }
 
-    @Override
-    public String getContentType() { return "application/json"; }
-
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
index c4093c49fbd..fd8eb85a0ec 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
@@ -1,29 +1,21 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.restapi.controller;
 
-import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.slime.Cursor;
-import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.hosted.controller.maintenance.Upgrader;
-
-import java.io.IOException;
-import java.io.OutputStream;
+import com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse;
 
 /**
  * @author mpolden
  */
-public class UpgraderResponse extends HttpResponse {
-
-    private final Upgrader upgrader;
+public class UpgraderResponse extends SlimeJsonResponse {
 
     public UpgraderResponse(Upgrader upgrader) {
-        super(200);
-        this.upgrader = upgrader;
+        super(toSlime(upgrader));
     }
 
-    @Override
-    public void render(OutputStream outputStream) throws IOException {
+    private static Slime toSlime(Upgrader upgrader) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
         root.setDouble("upgradesPerMinute", upgrader.upgradesPerMinute());
@@ -35,11 +27,7 @@ public class UpgraderResponse extends HttpResponse {
             object.setString(version.toString(), confidence.name());
         });
 
-        new JsonFormat(true).encode(outputStream, slime);
+        return slime;
     }
 
-    @Override
-    public String getContentType() {
-        return "application/json";
-    }
 }