Replace HTTP response with Log class. Other cleanup

3 files changed, 9 insertions, 17 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 6ed496a56fb..6c67f730f60 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -484,9 +484,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     // ---------------- Logs ----------------------------------------------------------------
 
     public HttpResponse getLogs(ApplicationId applicationId, String apiParams) {
-        String logServerHostName = getLogServerURI(applicationId) + "/" + apiParams;
+        String logServerURI = getLogServerURI(applicationId) + apiParams;
         LogRetriever logRetriever = new LogRetriever();
-        return logRetriever.getLogs(logServerHostName);
+        return logRetriever.getLogs(logServerURI);
     }
 
     // ---------------- Session operations ----------------------------------------------------------------
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 746ed8635e0..528575f4f27 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -97,16 +97,8 @@ public class ApplicationHandler extends HttpHandler {
         }
 
         if (isLogRequest(request)) {
-            String apiParams = "?";
-            if (request.hasProperty("from")) {
-                apiParams = apiParams + "from=" + request.getProperty("from") + "&";
-            }
-            if (request.hasProperty("to")) {
-                apiParams = apiParams + "to=" + request.getProperty("to");
-            }
-            StringBuilder api = new StringBuilder("?");
-            request.propertyMap().entrySet().stream().forEach(entry -> api.append(entry.getKey() + "=" + entry.getValue() + "&"));
-            apiParams = getPathSuffix(request);
+            String apiParams = request.getUri().getQuery();
+            apiParams = apiParams == null ? "" : "?" + apiParams;
             return applicationRepository.getLogs(applicationId, apiParams);
         }
 
@@ -155,7 +147,7 @@ public class ApplicationHandler extends HttpHandler {
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*",
                 "http://*/application/v2/tenant/*/application/*",
-                "http://*/application/v2/tenant/*/application/*/logs/*");
+                "http://*/application/v2/tenant/*/application/*/logs");
     }
 
     private static boolean isLogRequest(HttpRequest request) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 120119f35bb..2ae8917e905 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -118,7 +118,7 @@ public class ApplicationRepositoryTest {
     }
 
     @Test
-    public void getLogs(){
+    public void getLogs() {
         WireMockServer wireMock = new WireMockServer(wireMockConfig().port(8080));
         wireMock.start();
         WireMock.configureFor("localhost", wireMock.port());
@@ -127,15 +127,15 @@ public class ApplicationRepositoryTest {
                         .withStatus(200)));
         wireMock.start();
         deployApp(testAppLogServerWithContainer);
-        HttpResponse response = applicationRepository.getLogs(applicationId());
-        assertEquals(response.getStatus(),200);
+        HttpResponse response = applicationRepository.getLogs(applicationId(), "");
+        assertEquals(200, response.getStatus());
         wireMock.stop();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void getLogsNoContainerOnLogServerHostShouldThrowException() {
         deployApp(testApp);
-        applicationRepository.getLogs(applicationId());
+        applicationRepository.getLogs(applicationId(), "");
     }
 
     @Test