From 6954a0d10fddb9bee32931ba69b2d4b427ee71e2 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 2 Dec 2022 22:37:16 +0000 Subject: collect(Collectors.toList()) -> toList() --- .../src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java | 2 +- .../src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java | 4 ++-- .../metricsproxy/http/application/ApplicationMetricsHandler.java | 2 +- .../metricsproxy/http/application/ApplicationMetricsRetriever.java | 2 +- .../ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java | 2 +- .../java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java | 2 +- .../src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java | 2 +- .../main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'metrics-proxy/src/main/java/ai') diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java index 67c888a8d77..a3b02e608c2 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java @@ -129,7 +129,7 @@ public class MetricsManager { .map(builder -> builder.putDimensionsIfAbsent(globalDims)) .map(builder -> builder.putDimensionsIfAbsent(extraDimensions)) .map(builder -> adjustTimestamp(builder, startTime)) - .collect(Collectors.toList()); + .toList(); } /** diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java index 037fca95588..db8e18c3ef5 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java @@ -45,7 +45,7 @@ public class ValuesFetcher { return metricsManager.getMetrics(vespaServices.getVespaServices(), Instant.now(), consumer) .stream() .filter(metricsPacket -> metricsPacket.consumers().contains(consumer)) - .collect(Collectors.toList()); + .toList(); } public MetricsPacket.Builder[] fetchMetricsAsBuilders(String requestedConsumer) throws JsonRenderingException { @@ -54,7 +54,7 @@ public class ValuesFetcher { List builders = metricsManager.getMetricsAsBuilders(vespaServices.getVespaServices(), Instant.now(), consumer) .stream() .filter(builder -> builder.hasConsumer(consumer)) - .collect(Collectors.toList()); + .toList(); return builders.toArray(new MetricsPacket.Builder[builders.size()]); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java index 30acf6eacc8..54150f98687 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java @@ -87,7 +87,7 @@ public class ApplicationMetricsHandler extends HttpHandlerBase { .stream() .map(builder -> builder.putDimension(DimensionId.toDimensionId("hostname"), element.hostname)) .map(MetricsPacket.Builder::build)) - .collect(Collectors.toList()); + .toList(); return new TextResponse(200, toPrometheusModel(metricsForAllNodes).serialize()); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java index 6c27d10a62f..d4f04cdb3fc 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java @@ -185,7 +185,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent implements Ru return nodesConfig.node().stream() .map(Node::new) .map(node-> new NodeMetricsClient(httpClient, node, Clock.systemUTC())) - .collect(Collectors.toList()); + .toList(); } static CloseableHttpAsyncClient createHttpClient() { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java index d05b251207d..21f884a27b7 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java @@ -78,6 +78,6 @@ public final class PublicDimensions { * All public dimensions, common dimensions first, then dimensions for individual metrics */ public static final List publicDimensions = Stream.concat(commonDimensions.stream(), metricDimensions.stream()) - .collect(Collectors.toList()); + .toList(); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java index 911c772c0e4..f475c06d634 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java @@ -84,7 +84,7 @@ public class YamasJsonModel { return metrics.keySet().stream() .map(name -> new Metric(MetricId.toMetricId(name), metrics.get(name))) - .collect(Collectors.toList()); + .toList(); } Map getDimensionsById() { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java index 148f48136f4..1a7c1b4df4d 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java @@ -64,7 +64,7 @@ public class NodeMetricGatherer { metricPacketBuilder.putDimensionsIfAbsent(applicationDimensions.getDimensions()) .putDimensionsIfAbsent(nodeDimensions.getDimensions()) .putDimensionsIfAbsent(metricsManager.getExtraDimensions()).build() - ).collect(Collectors.toList()); + ).toList(); } protected static void addObjectToBuilders(List builders, JsonNode object) { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java index 5f8cbf0784d..d09f2aff3e5 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java @@ -30,7 +30,7 @@ public class ServiceHealthGatherer { .putDimension(DimensionId.toDimensionId("metrictype"), "health") .addConsumers(Set.of(ConsumerId.toConsumerId("Vespa"))); }) - .collect(Collectors.toList()); + .toList(); } } -- cgit v1.2.3