diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-12-02 23:09:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-02 23:09:25 +0100 |
commit | afcf1bb71cb7b87a03149d197f724cfc7603ef92 (patch) | |
tree | fff1df3e68101edc3d3d3b98b5eb51b7758c209c /config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java | |
parent | 7f870bf3cb8dd0a3d015a448608ba7291a783932 (diff) | |
parent | fcf664e1a6bb9890bd54ff4f8b78497236152bf2 (diff) |
Merge pull request #25096 from vespa-engine/revert-25091-revert-25088-balder/immutablelist-2-listv8.94.46
Revert "Revert "Let list handling catch up with Java 17""
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java index 41204ce6e9a..fb67100b435 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.admin.monitoring; import java.util.Collection; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -24,7 +23,7 @@ public class MetricSet { private final Set<MetricSet> children; public MetricSet(String id, Collection<Metric> metrics) { - this(id, metrics, Collections.emptySet()); + this(id, metrics, Set.of()); } public MetricSet(String id, Collection<Metric> metrics, Collection<MetricSet> children) { @@ -57,9 +56,7 @@ public class MetricSet { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof MetricSet)) return false; - - MetricSet that = (MetricSet) o; + if (!(o instanceof MetricSet that)) return false; return Objects.equals(id, that.id); |