diff options
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java index 8a15d87b6c5..7eec4450f33 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/monitoring/MetricSetTest.java @@ -1,11 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import org.junit.jupiter.api.Test; +import java.util.List; import java.util.Map; import static java.util.Collections.emptyList; @@ -19,9 +18,9 @@ public class MetricSetTest { @Test void metrics_from_children_are_added() { - MetricSet child1 = new MetricSet("child1", ImmutableList.of(new Metric("child1_metric"))); - MetricSet child2 = new MetricSet("child2", ImmutableList.of(new Metric("child2_metric"))); - MetricSet parent = new MetricSet("parent", emptyList(), ImmutableList.of(child1, child2)); + MetricSet child1 = new MetricSet("child1", List.of(new Metric("child1_metric"))); + MetricSet child2 = new MetricSet("child2", List.of(new Metric("child2_metric"))); + MetricSet parent = new MetricSet("parent", emptyList(), List.of(child1, child2)); Map<String, Metric> parentMetrics = parent.getMetrics(); assertEquals(2, parentMetrics.size()); @@ -31,8 +30,8 @@ public class MetricSetTest { @Test void adding_the_same_child_set_twice_has_no_effect() { - MetricSet child = new MetricSet("child", ImmutableList.of(new Metric("child_metric"))); - MetricSet parent = new MetricSet("parent", emptyList(), ImmutableList.of(child, child)); + MetricSet child = new MetricSet("child", List.of(new Metric("child_metric"))); + MetricSet parent = new MetricSet("parent", emptyList(), List.of(child, child)); Map<String, Metric> parentMetrics = parent.getMetrics(); assertEquals(1, parentMetrics.size()); @@ -44,16 +43,10 @@ public class MetricSetTest { String METRIC_NAME = "metric1"; String COMMON_DIMENSION_KEY = "commonKey"; - Map<String, String> childDimensions = ImmutableMap.<String, String>builder() - .put(COMMON_DIMENSION_KEY, "childCommonVal") - .put("childKey", "childVal") - .build(); + Map<String, String> childDimensions = Map.of(COMMON_DIMENSION_KEY, "childCommonVal", "childKey", "childVal"); Metric childMetric = new Metric(METRIC_NAME, "child-output-name", "child-description", childDimensions); - Map<String, String> parentDimensions = ImmutableMap.<String, String>builder() - .put(COMMON_DIMENSION_KEY, "parentCommonVal") - .put("parentKey", "parentVal") - .build(); + Map<String, String> parentDimensions = Map.of(COMMON_DIMENSION_KEY, "parentCommonVal","parentKey", "parentVal"); Metric parentMetric = new Metric(METRIC_NAME, "parent-output-name", "parent-description", parentDimensions); MetricSet child = new MetricSet("set1", Sets.newHashSet(childMetric)); |