Remove support for old format for /tester/v1/log requests,

start returning new format

2 files changed, 3 insertions, 22 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 ec8a78467ca..ed079442440 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
@@ -61,12 +61,9 @@ public class TestRunnerHandler extends LoggingRequestHandler {
 
     private HttpResponse handleGET(HttpRequest request) {
         String path = request.getUri().getPath();
-        if (path.equals("/tester/v1/log")) {
+        // TODO: Migrate to /tester/v1/log when /tester/v1/log2 is not in use anymore (and remove /tester/v1/log2)
+        if (path.equals("/tester/v1/log") || path.equals("/tester/v1/log2")) {
             return new SlimeJsonResponse(logToSlime(testRunner.getLog(request.hasProperty("after")
-                                                                              ? Long.parseLong(request.getProperty("after"))
-                                                                              : -1)));
-        } else if (path.equals("/tester/v1/log2")) { // TODO: Migrate to /tester/v1/log when the above is not in use anymore
-            return new SlimeJsonResponse(log2ToSlime(testRunner.getLog(request.hasProperty("after")
                                                                                ? Long.parseLong(request.getProperty("after"))
                                                                                : -1)));
         } else if (path.equals("/tester/v1/status")) {
@@ -98,13 +95,6 @@ public class TestRunnerHandler extends LoggingRequestHandler {
     }
 
     static Slime logToSlime(Collection<LogRecord> log) {
-        Slime root = new Slime();
-        Cursor recordArray = root.setArray();
-        logArrayToSlime(recordArray, log);
-        return root;
-    }
-
-    static Slime log2ToSlime(Collection<LogRecord> log) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
         Cursor recordArray = root.setArray("logRecords");
diff --git a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandlerTest.java b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandlerTest.java
index 1cdc0e2f0fd..77de009571b 100644
--- a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandlerTest.java
+++ b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandlerTest.java
@@ -24,17 +24,8 @@ public class TestRunnerHandlerTest {
         Log log = new Log();
         LogRecord record = log.getLogRecord();
         String trace = log.getTrace();
-        assertEquals("[{\"id\":1,\"at\":2,\"type\":\"info\",\"message\":\"Hello.\\n" + trace + "\"}]",
-                     new String(SlimeUtils.toJsonBytes(TestRunnerHandler.logToSlime(Collections.singletonList(record)))));
-    }
-
-    @Test
-    public void log2Serialization() throws IOException {
-        Log log = new Log();
-        LogRecord record = log.getLogRecord();
-        String trace = log.getTrace();
         assertEquals("{\"logRecords\":[{\"id\":1,\"at\":2,\"type\":\"info\",\"message\":\"Hello.\\n" + trace + "\"}]}",
-                     new String(SlimeUtils.toJsonBytes(TestRunnerHandler.log2ToSlime(Collections.singletonList(record)))));
+                     new String(SlimeUtils.toJsonBytes(TestRunnerHandler.logToSlime(Collections.singletonList(record)))));
     }
 
     private static class Log {