aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-11-26 17:19:34 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2022-11-26 17:19:34 +0100
commit37ca3594cac5c18c17157a77d8adbcd460ed1a10 (patch)
treeb265759b8c02f4c91084e469e7a517eced6d1c7f
parenta7362569f24ec81f053667c454cb2402661d7bfe (diff)
Minor cleanup
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java3
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java1
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java2
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<MetricsProxyC
private Optional<Admin> 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<MetricId> metricsToRetain() {
return consumers.getConsumersByMetric().keySet().stream()
- .map(configuredMetric -> configuredMetric.id())
+ .map(ConfiguredMetric::id)
.collect(toCollection(LinkedHashSet::new));
}