diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-06 17:18:31 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-02-06 17:18:31 +0100 |
commit | 4cf97662f0bd141dc5b53ce82bbd5dfb5f29952b (patch) | |
tree | 8d3162a47ba4d8a5d0c8962037088b402accbf4b /vespa-testrunner-components | |
parent | a580687202f2b765917ffd4d974052e98291f931 (diff) |
Remove support for old format for /tester/v1/log requests,
start returning new format
Diffstat (limited to 'vespa-testrunner-components')
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 { |