diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-11 09:12:53 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-11 09:12:53 +0200 |
commit | 42a9f71995b99044652bddf52ad869a824d98ddc (patch) | |
tree | 8766842d727e4a766c39d19dab6eb756ed06f829 /clustercontroller-core/src/test/java/com | |
parent | ed76cd45f86c8af9431860a9ac7c40fc59fb9e3c (diff) |
Unify on Map.of
Diffstat (limited to 'clustercontroller-core/src/test/java/com')
3 files changed, 7 insertions, 8 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleUtil.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleUtil.java index 7c39135291c..8280706bcd2 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleUtil.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundleUtil.java @@ -14,13 +14,13 @@ public class ClusterStateBundleUtil { public static ClusterStateBundle.Builder makeBundleBuilder(String baselineState, StateMapping... bucketSpaceStates) { return ClusterStateBundle.builder(AnnotatedClusterState.withoutAnnotations(ClusterState.stateFromString(baselineState))) - .explicitDerivedStates(Stream.of(bucketSpaceStates).collect(Collectors.toMap(sm -> sm.bucketSpace, + .explicitDerivedStates(Stream.of(bucketSpaceStates).collect(Collectors.toUnmodifiableMap(sm -> sm.bucketSpace, sm -> AnnotatedClusterState.withoutAnnotations(sm.state)))); } public static ClusterStateBundle makeBundle(String baselineState, StateMapping... bucketSpaceStates) { return ClusterStateBundle.of(AnnotatedClusterState.withoutAnnotations(ClusterState.stateFromString(baselineState)), - Stream.of(bucketSpaceStates).collect(Collectors.toMap(sm -> sm.bucketSpace, + Stream.of(bucketSpaceStates).collect(Collectors.toUnmodifiableMap(sm -> sm.bucketSpace, sm -> AnnotatedClusterState.withoutAnnotations(sm.state)))); } diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java index 175b7de8f4f..8048e77b05c 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.Collections; import java.util.Map; import java.util.TreeMap; @@ -53,7 +52,7 @@ public class ContentClusterHtmlRendererTest { statsAggregator, 1.0, 10, - Collections.emptyMap(), + Map.of(), eventLog, "pathPrefix", "name"); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java index b4246806079..168fe6521d5 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ResourceUsageStatsTest.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.clustercontroller.core; import org.junit.jupiter.api.Test; import java.util.Collection; -import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Optional; @@ -46,20 +46,20 @@ public class ResourceUsageStatsTest { @Test void nodes_above_limit_is_zero_without_feed_block_status() { - var stats = ResourceUsageStats.calculateFrom(Collections.emptyList(), Collections.emptyMap(), Optional.empty()); + var stats = ResourceUsageStats.calculateFrom(List.of(), Map.of(), Optional.empty()); assertEquals(0, stats.getNodesAboveLimit()); } @Test void nodes_above_limit_is_equal_to_node_resource_exhaustions() { - var stats = ResourceUsageStats.calculateFrom(Collections.emptyList(), Collections.emptyMap(), + var stats = ResourceUsageStats.calculateFrom(List.of(), Map.of(), createFeedBlock(exhaustion(1, "disk"), exhaustion(2, "memory"))); assertEquals(2, stats.getNodesAboveLimit()); } @Test void nodes_above_limit_counts_each_node_only_once() { - var stats = ResourceUsageStats.calculateFrom(Collections.emptyList(), Collections.emptyMap(), + var stats = ResourceUsageStats.calculateFrom(List.of(), Map.of(), createFeedBlock(exhaustion(1, "disk"), exhaustion(1, "memory"))); assertEquals(1, stats.getNodesAboveLimit()); } |