Unify on Map.of

2 files changed, 4 insertions, 8 deletions

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 3fd95220aca..44f4efb41cc 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
@@ -19,9 +19,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.yahoo.stream.CustomCollectors.toLinkedMap;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.emptySet;
 
 /**
  * Datamodel for Yamas execute output
@@ -80,7 +77,7 @@ public class YamasJsonModel {
     }
 
     List<Metric> getMetricsList() {
-        if (metrics == null) return emptyList();
+        if (metrics == null) return List.of();
 
         return metrics.keySet().stream()
                 .map(name -> new Metric(MetricId.toMetricId(name), metrics.get(name)))
@@ -88,14 +85,14 @@ public class YamasJsonModel {
     }
 
     Map<DimensionId, String> getDimensionsById() {
-        if (dimensions == null) return emptyMap();
+        if (dimensions == null) return Map.of();
 
         return dimensions.keySet().stream().collect(toLinkedMap(DimensionId::toDimensionId,
                                                                 name -> dimensions.get(name)));
     }
 
     Set<ConsumerId> getYamasConsumers() {
-        if (routing == null || routing.get("yamas") == null) return emptySet();
+        if (routing == null || routing.get("yamas") == null) return Set.of();
 
         return routing.get("yamas").namespaces.stream()
                 .map(ConsumerId::toConsumerId)
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java
index a83a28ff9c6..573292a6592 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java
@@ -7,7 +7,6 @@ import ai.vespa.metricsproxy.metric.Metrics;
 import ai.vespa.metricsproxy.metric.model.DimensionId;
 import ai.vespa.metricsproxy.metric.model.ServiceId;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -20,7 +19,7 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class VespaService implements Comparable<VespaService> {
 
-    private static final Map<DimensionId, String> EMPTY_DIMENSIONS = Collections.emptyMap();
+    private static final Map<DimensionId, String> EMPTY_DIMENSIONS = Map.of();
     private static final String DEFAULT_MONITORING_PREFIX = "vespa";
     public static final String SEPARATOR = ".";