Merge branch 'master' into lesters/add-local-llms

6 files changed, 15 insertions, 16 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/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index ee0506070b5..3b26e3b6965 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.AfterEach;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -221,7 +220,7 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     static Set<Integer> asIntSet(Integer... idx) {
-        return new HashSet<>(Arrays.asList(idx));
+        return new HashSet<>(List.of(idx));
     }
 
     static Set<ConfiguredNode> asConfiguredNodes(Set<Integer> indices) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java
index cab67c0b498..17f58ff40f0 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java
@@ -5,7 +5,9 @@ import com.yahoo.document.FixedBucketSpaces;
 import com.yahoo.vdslib.state.ClusterState;
 import org.junit.jupiter.api.Test;
 
+
 import java.util.Arrays;
+import java.util.List;
 
 import static com.yahoo.vespa.clustercontroller.core.NodeStateReason.MAY_HAVE_MERGES_PENDING;
 import static com.yahoo.vespa.clustercontroller.core.NodeStateReason.NODE_TOO_UNSTABLE;
@@ -110,8 +112,8 @@ public class MaintenanceWhenPendingGlobalMergesTest {
     @Test
     void node_with_pending_merges_only_set_to_maintenance_if_eligible() {
         Fixture f = new Fixture();
-        Arrays.asList(1, 2, 3).forEach(idx -> when(f.mockPendingChecker.mayHaveMergesPending(globalSpace(), idx)).thenReturn(true));
-        Arrays.asList(1, 2, 4).forEach(idx -> when(f.mockTransitionConstraint.maintenanceTransitionAllowed(idx)).thenReturn(false));
+        List.of(1, 2, 3).forEach(idx -> when(f.mockPendingChecker.mayHaveMergesPending(globalSpace(), idx)).thenReturn(true));
+        List.of(1, 2, 4).forEach(idx -> when(f.mockTransitionConstraint.maintenanceTransitionAllowed(idx)).thenReturn(false));
         AnnotatedClusterState derived = f.deriver.derivedFrom(stateFromString("distributor:5 storage:5"), defaultSpace());
         assertThat(derived, equalTo(AnnotatedClusterStateBuilder.ofState("distributor:5 storage:5 .3.s:m")
                 .reason(MAY_HAVE_MERGES_PENDING, 3).build()));
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());
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
index 9e7665e65ee..bf8ba7756e2 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
@@ -8,7 +8,6 @@ import com.yahoo.vespa.clustercontroller.core.DummyVdsNode;
 import com.yahoo.vespa.clustercontroller.core.FleetController;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -62,13 +61,13 @@ public interface Waiter {
             return waitForState(state, data.getTimeout());
         }
         public ClusterState waitForStateInAllSpaces(String state) {
-            return waitForState(state, data.getTimeout(), true, Collections.emptySet());
+            return waitForState(state, data.getTimeout(), true, Set.of());
         }
         public ClusterState waitForStateInSpace(String space, String state) {
-            return waitForState(state, data.getTimeout(), false, Collections.singleton(space));
+            return waitForState(state, data.getTimeout(), false, Set.of(space));
         }
         public ClusterState waitForState(String state, Duration timeoutMS) {
-            return waitForState(state, timeoutMS, false, Collections.emptySet());
+            return waitForState(state, timeoutMS, false, Set.of());
         }
         public ClusterState waitForStableSystem() {
             return waitForStableSystem(data.getDummyNodes().size() / 2);