diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-26 15:25:07 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-04-26 18:18:52 +0200 |
commit | c9d29590c5da3e27d061c347b50485fa5319600d (patch) | |
tree | 54a2fd1dc12429cb6cff83c31834377a96b559f4 /configserver/src | |
parent | 53d8e8afc0bc393663f221febe143cebfcbb8487 (diff) |
Use SlimeJsonResponse
Diffstat (limited to 'configserver/src')
4 files changed, 11 insertions, 47 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java index c503b60b3a3..ca9bbbf83d7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java @@ -2,28 +2,19 @@ package com.yahoo.vespa.config.server.http.v2; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.container.jdisc.HttpResponse; +import com.yahoo.restapi.SlimeJsonResponse; import com.yahoo.slime.Cursor; -import com.yahoo.slime.JsonFormat; -import com.yahoo.slime.Slime; -import com.yahoo.vespa.config.server.http.HttpConfigResponse; import com.yahoo.vespa.config.server.metrics.ClusterInfo; import com.yahoo.vespa.config.server.metrics.DeploymentMetricsAggregator; -import java.io.IOException; -import java.io.OutputStream; import java.util.Map; /** * @author olaa */ -public class DeploymentMetricsResponse extends HttpResponse { - - private final Slime slime = new Slime(); - - public DeploymentMetricsResponse(int status, ApplicationId applicationId, Map<ClusterInfo, DeploymentMetricsAggregator> aggregatedMetrics) { - super(status); +public class DeploymentMetricsResponse extends SlimeJsonResponse { + public DeploymentMetricsResponse(ApplicationId applicationId, Map<ClusterInfo, DeploymentMetricsAggregator> aggregatedMetrics) { Cursor application = slime.setObject(); application.setString("applicationId", applicationId.serializedForm()); @@ -43,14 +34,4 @@ public class DeploymentMetricsResponse extends HttpResponse { aggregator.aggregateFeedLatency().ifPresent(feedLatency -> metrics.setDouble("feedLatency", feedLatency)); } } - - @Override - public void render(OutputStream outputStream) throws IOException { - new JsonFormat(false).encode(outputStream, slime); - } - - @Override - public String getContentType() { - return HttpConfigResponse.JSON_CONTENT_TYPE; - } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ProtonMetricsResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ProtonMetricsResponse.java index 7f95d7e30d0..99b95f9244c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ProtonMetricsResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ProtonMetricsResponse.java @@ -2,26 +2,17 @@ package com.yahoo.vespa.config.server.http.v2; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.container.jdisc.HttpResponse; +import com.yahoo.restapi.SlimeJsonResponse; import com.yahoo.slime.Cursor; -import com.yahoo.slime.JsonFormat; -import com.yahoo.slime.Slime; -import com.yahoo.vespa.config.server.http.HttpConfigResponse; import com.yahoo.vespa.config.server.metrics.ProtonMetricsAggregator; -import java.io.IOException; -import java.io.OutputStream; import java.util.Map; -public class ProtonMetricsResponse extends HttpResponse { - - private final Slime slime = new Slime(); - - /** - * @author akvalsvik - */ - public ProtonMetricsResponse(int status, ApplicationId applicationId, Map<String, ProtonMetricsAggregator> aggregatedProtonMetrics) { - super(status); +/** + * @author akvalsvik + */ +public class ProtonMetricsResponse extends SlimeJsonResponse { + public ProtonMetricsResponse(ApplicationId applicationId, Map<String, ProtonMetricsAggregator> aggregatedProtonMetrics) { Cursor application = slime.setObject(); application.setString("applicationId", applicationId.serializedForm()); @@ -41,12 +32,4 @@ public class ProtonMetricsResponse extends HttpResponse { metrics.setDouble("resourceMemoryUsageAverage", aggregator.aggregateResourceMemoryUsageAverage()); } } - - @Override - public void render(OutputStream outputStream) throws IOException { - new JsonFormat(false).encode(outputStream, slime); - } - - @Override - public String getContentType() { return HttpConfigResponse.JSON_CONTENT_TYPE; } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java index 43847cd9c3d..7fc2c47c06c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java @@ -32,7 +32,7 @@ public class DeploymentMetricsRetriever { public DeploymentMetricsResponse getMetrics(Application application) { var hosts = getHostsOfApplication(application); var clusterMetrics = metricsRetriever.requestMetricsGroupedByCluster(hosts); - return new DeploymentMetricsResponse(200, application.getId(), clusterMetrics); + return new DeploymentMetricsResponse(application.getId(), clusterMetrics); } private static Collection<URI> getHostsOfApplication(Application application) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java index ae70225e8a4..5078fba8b38 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java @@ -24,7 +24,7 @@ public class ProtonMetricsRetriever { public ProtonMetricsResponse getMetrics(Application application) { var hosts = getHostsOfApplication(application); var clusterMetrics = metricsRetriever.requestMetricsGroupedByCluster(hosts); - return new ProtonMetricsResponse(200, application.getId(), clusterMetrics); + return new ProtonMetricsResponse(application.getId(), clusterMetrics); } private static Collection<URI> getHostsOfApplication(Application application) { |