Reuse existing classes

1 files changed, 9 insertions, 53 deletions

diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
index f9deef0bfd2..c10ee5416db 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
@@ -8,6 +8,8 @@ import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.LoggingRequestHandler;
 import com.yahoo.io.IOUtils;
+import com.yahoo.restapi.MessageResponse;
+import com.yahoo.restapi.SlimeJsonResponse;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
@@ -31,8 +33,6 @@ import static com.yahoo.jdisc.Response.Status;
  */
 public class TestRunnerHandler extends LoggingRequestHandler {
 
-    private static final String CONTENT_TYPE_APPLICATION_JSON = "application/json";
-
     private final com.yahoo.vespa.hosted.testrunner.TestRunner testRunner;
 
     @Inject
@@ -48,13 +48,13 @@ public class TestRunnerHandler extends LoggingRequestHandler {
                 case GET: return handleGET(request);
                 case POST: return handlePOST(request);
 
-                default: return new Response(Status.METHOD_NOT_ALLOWED, "Method '" + request.getMethod() + "' is not supported");
+                default: return new MessageResponse(Status.METHOD_NOT_ALLOWED, "Method '" + request.getMethod() + "' is not supported");
             }
         } catch (IllegalArgumentException e) {
-            return new Response(Status.BAD_REQUEST, Exceptions.toMessageString(e));
+            return new MessageResponse(Status.BAD_REQUEST, Exceptions.toMessageString(e));
         } catch (Exception e) {
             log.log(Level.WARNING, "Unexpected error handling '" + request.getUri() + "'", e);
-            return new Response(Status.INTERNAL_SERVER_ERROR, Exceptions.toMessageString(e));
+            return new MessageResponse(Status.INTERNAL_SERVER_ERROR, Exceptions.toMessageString(e));
         }
     }
 
@@ -66,9 +66,9 @@ public class TestRunnerHandler extends LoggingRequestHandler {
                                                                                : -1)));
         } else if (path.equals("/tester/v1/status")) {
             log.info("Responding with status " + testRunner.getStatus());
-            return new Response(testRunner.getStatus().name());
+            return new MessageResponse(testRunner.getStatus().name());
         }
-        return new Response(Status.NOT_FOUND, "Not found: " + request.getUri().getPath());
+        return new MessageResponse(Status.NOT_FOUND, "Not found: " + request.getUri().getPath());
     }
 
     private HttpResponse handlePOST(HttpRequest request) throws IOException {
@@ -79,9 +79,9 @@ public class TestRunnerHandler extends LoggingRequestHandler {
             byte[] config = IOUtils.readBytes(request.getData(), 1 << 16);
             testRunner.test(suite, config);
             log.info("Started tests of type " + type + " and status is " + testRunner.getStatus());
-            return new Response("Successfully started " + type + " tests");
+            return new MessageResponse("Successfully started " + type + " tests");
         }
-        return new Response(Status.NOT_FOUND, "Not found: " + request.getUri().getPath());
+        return new MessageResponse(Status.NOT_FOUND, "Not found: " + request.getUri().getPath());
     }
 
     private static String lastElement(String path) {
@@ -124,48 +124,4 @@ public class TestRunnerHandler extends LoggingRequestHandler {
                 : "error";
     }
 
-    private static class SlimeJsonResponse extends HttpResponse {
-        private final Slime slime;
-
-        private SlimeJsonResponse(Slime slime) {
-            super(200);
-            this.slime = slime;
-        }
-
-        @Override
-        public void render(OutputStream outputStream) throws IOException {
-            new JsonFormat(true).encode(outputStream, slime);
-        }
-
-        @Override
-        public String getContentType() {
-            return CONTENT_TYPE_APPLICATION_JSON;
-        }
-    }
-
-    private static class Response extends HttpResponse {
-        private static final ObjectMapper objectMapper = new ObjectMapper();
-        private final String message;
-
-        private Response(String response) {
-            this(200, response);
-        }
-
-        private Response(int statusCode, String message) {
-            super(statusCode);
-            this.message = message;
-        }
-
-        @Override
-        public void render(OutputStream outputStream) throws IOException {
-            ObjectNode objectNode = objectMapper.createObjectNode();
-            objectNode.put("message", message);
-            objectMapper.writeValue(outputStream, objectNode);
-        }
-
-        @Override
-        public String getContentType() {
-            return CONTENT_TYPE_APPLICATION_JSON;
-        }
-    }
 }