diff options
author | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-18 14:40:17 +0200 |
---|---|---|
committer | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-18 15:13:24 +0200 |
commit | ce7a90324a0768383da82c84e148e53c840777fd (patch) | |
tree | 0cc8469f02f7653ec885a91c30834981eac86c76 /controller-api/src | |
parent | 4a46f72283fe35cba7308b17b64de348346c4218 (diff) |
Replace HTTP response with Log class. Other cleanup
Diffstat (limited to 'controller-api/src')
2 files changed, 18 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index 50749f3da82..5dacaf9b0db 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.configserver; -import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; @@ -9,6 +8,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.Hostname; import com.yahoo.vespa.serviceview.bindings.ApplicationView; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -42,7 +42,7 @@ public interface ConfigServer { Map<?,?> getServiceApiResponse(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath); - HttpResponse getLogs(DeploymentId deployment, String apiParams); + Optional<Logs> getLogs(DeploymentId deployment, HashMap<String, String> queryParameters); /** * Set new status on en endpoint in one zone. * diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java new file mode 100644 index 00000000000..223d3e88f13 --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java @@ -0,0 +1,16 @@ +package com.yahoo.vespa.hosted.controller.api.integration.configserver; + +import java.util.Map; + +public class Logs { + + private final Map<String, String> logs; + + public Logs(Map<String, String> logs) { + this.logs = logs; + } + + public Map<String, String> logs() { + return this.logs; + } +} |