From 5aa228307c58ebafd32155d8ac7a0729d58bb874 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 15 Dec 2021 18:31:13 +0100
Subject: Unify on Map.of/copyOf

---
 .../src/main/java/ai/vespa/metricsproxy/metric/Metric.java     | 10 ++++------
 .../main/java/ai/vespa/metricsproxy/service/MetricsParser.java |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'metrics-proxy')

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java
index a9e6e8e6e3c..9265e8ef1e5 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java
@@ -5,8 +5,6 @@ import ai.vespa.metricsproxy.metric.model.ConsumerId;
 import ai.vespa.metricsproxy.metric.model.DimensionId;
 import ai.vespa.metricsproxy.metric.model.MetricId;
 
-import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -34,12 +32,12 @@ public class Metric {
         this.time = time;
         this.value = value;
         this.name = name;
-        this.dimensions = dimensions;
+        this.dimensions = Map.copyOf(dimensions);
         this.description = description;
     }
 
     public Metric(MetricId name, Number value, long timestamp) {
-        this(name, value, timestamp, Collections.emptyMap(), "");
+        this(name, value, timestamp, Map.of(), "");
     }
 
     public Metric(MetricId name, Number value) {
@@ -47,7 +45,7 @@ public class Metric {
     }
 
     public void setDimensions(Map<DimensionId, String> dimensions) {
-        this.dimensions = dimensions;
+        this.dimensions = Map.copyOf(dimensions);
     }
 
     /**
@@ -104,7 +102,7 @@ public class Metric {
 
     @Override
     public Metric clone() {
-        return new Metric(name, value, time, new LinkedHashMap<>(dimensions), getDescription());
+        return new Metric(name, value, time, dimensions, getDescription());
     }
 
     @Override
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
index 8157ecb72fd..f9443c46bad 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
@@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -123,7 +122,7 @@ public class MetricsParser {
             description = metric.get("description").textValue();
         }
 
-        Map<DimensionId, String> dim = Collections.emptyMap();
+        Map<DimensionId, String> dim = Map.of();
         if (metric.has("dimensions")) {
             JsonNode dimensions = metric.get("dimensions");
             StringBuilder sb = new StringBuilder();
@@ -139,7 +138,7 @@ public class MetricsParser {
                     String v = dimensions.get(k).textValue();
                     dim.put(toDimensionId(k), v);
                 }
-                uniqueDimensions.put(sb.toString(), Collections.unmodifiableMap(dim));
+                uniqueDimensions.put(sb.toString(), Map.copyOf(dim));
             }
             dim = uniqueDimensions.get(sb.toString());
         }
-- 
cgit v1.2.3