From 37ca3594cac5c18c17157a77d8adbcd460ed1a10 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 26 Nov 2022 17:19:34 +0100 Subject: Minor cleanup --- .../vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java | 3 +-- .../src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java | 1 - .../src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index f7d9c2f4a0d..93b67407933 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -226,8 +226,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster getAdmin() { if (parent != null) { AbstractConfigProducerRoot r = parent.getRoot(); - if (r instanceof VespaModel) { - VespaModel model = (VespaModel) r; + if (r instanceof VespaModel model) { return Optional.ofNullable(model.getAdmin()); } } 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 f9ecaa29153..67c888a8d77 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 @@ -23,7 +23,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions; -import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors; import static java.util.logging.Level.FINE; import static java.util.stream.Collectors.toList; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java index def61006f15..0c25f31f266 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java @@ -62,7 +62,7 @@ public class ExternalMetrics { private Set metricsToRetain() { return consumers.getConsumersByMetric().keySet().stream() - .map(configuredMetric -> configuredMetric.id()) + .map(ConfiguredMetric::id) .collect(toCollection(LinkedHashSet::new)); } -- cgit v1.2.3