Unify on Set.of

1 files changed, 6 insertions, 8 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java
index 53c6c533518..743f15c00d6 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java
@@ -5,7 +5,6 @@ import ai.vespa.metricsproxy.metric.Metric;
 
 import java.time.Instant;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -14,7 +13,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 
-import static java.util.Collections.unmodifiableMap;
 import static java.util.stream.Collectors.joining;
 
 /**
@@ -42,13 +40,13 @@ public class MetricsPacket {
         this.statusMessage = statusMessage;
         this.timestamp = timestamp;
         this.service = service;
-        this.metrics = metrics;
-        this.dimensions = dimensions;
+        this.metrics = Map.copyOf(metrics);
+        this.dimensions = Map.copyOf(dimensions);
         this.consumers = Set.copyOf(consumers);
     }
 
-    public Map<MetricId, Number> metrics() { return unmodifiableMap(metrics); }
-    public Map<DimensionId, String> dimensions() { return unmodifiableMap(dimensions); }
+    public Map<MetricId, Number> metrics() { return metrics; }
+    public Map<DimensionId, String> dimensions() { return dimensions; }
     public Set<ConsumerId> consumers() { return consumers;}
 
     @Override
@@ -80,7 +78,7 @@ public class MetricsPacket {
         private long timestamp = 0L;
         private Map<MetricId, Number> metrics = new LinkedHashMap<>();
         private final Map<DimensionId, String> dimensions = new LinkedHashMap<>();
-        private Set<ConsumerId> consumers = Collections.emptySet();
+        private Set<ConsumerId> consumers = Set.of();
 
         public Builder(ServiceId service) {
             Objects.requireNonNull(service, "Service cannot be null.");
@@ -169,7 +167,7 @@ public class MetricsPacket {
             if ((extraConsumers != null) && !extraConsumers.isEmpty()) {
                 if (consumers.isEmpty()) {
                     if (extraConsumers.size() == 1) {
-                        consumers = Collections.singleton(extraConsumers.iterator().next());
+                        consumers = Set.of(extraConsumers.iterator().next());
                         return this;
                     }
                     consumers = new LinkedHashSet<>(extraConsumers.size());