diff options
4 files changed, 8 insertions, 9 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index 2952d3bf9ee..4dc1fe81fd2 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -560,7 +560,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta StringBuilder content = new StringBuilder(); response.setContentType("text/html"); response.setResponseCode(responseCode); - content.append("<!-- Answer to request " + httpRequest.getRequest() + " -->\n"); + content.append("<!-- Answer to request ").append(httpRequest.getRequest()).append(" -->\n"); content.append("<p>UTC time when creating this page: ").append(RealTimer.printDateNoMilliSeconds(currentTime, tz)).append("</p>"); response.writeHtmlHeader(content, message); response.writeHtmlFooter(content, hiddenMessage); @@ -781,7 +781,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta return cluster.getNodeInfos().stream(). filter(n -> effectiveActivatedStateVersion(n, bundle) < version). map(NodeInfo::getNode). - collect(Collectors.toList()); + toList(); } private static <E> String stringifyListWithLimits(List<E> list, int limit) { diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java index 53d126ebc22..42555e38326 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java @@ -31,7 +31,6 @@ import java.util.stream.Stream; import static java.util.logging.Level.FINE; import static java.util.logging.Level.WARNING; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toUnmodifiableList; @@ -135,7 +134,7 @@ public class ReindexingMaintainer extends AbstractComponent { long intervalMillis = interval.toMillis(); List<String> hostnames = Stream.of(clusterHostnames.split(",")) .map(hostPort -> hostPort.split(":")[0]) - .collect(toList()); + .toList(); if (hostnames.contains(hostname)) { long offset = hostnames.indexOf(hostname) * intervalMillis; intervalMillis *= hostnames.size(); diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java index dffe1dd43ef..9c4d43faa4b 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java @@ -32,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -182,7 +181,7 @@ class ReindexerTest { } List<Trigger> triggers(long... ready) { - return Arrays.stream(ready).mapToObj(at -> new Trigger(music, Instant.ofEpochMilli(at), 0.2)).collect(toList()); + return Arrays.stream(ready).mapToObj(at -> new Trigger(music, Instant.ofEpochMilli(at), 0.2)).toList(); } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java b/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java index 8414f6588ea..8380c9d00ef 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java @@ -7,15 +7,16 @@ import com.yahoo.messagebus.test.SimpleReply; import org.junit.jupiter.api.Test; import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collections; import java.util.Deque; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; +import java.util.stream.Collectors; import java.util.stream.IntStream; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toUnmodifiableList; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -218,7 +219,7 @@ public class DynamicThrottlePolicyTest { System.err.printf("\n### Running %d operations of %d ticks each against %d workers with parallelism %d and queue size %d\n", operations, workPerSuccess, numberOfWorkers, workerParallelism, maximumTasksPerWorker); - List<Integer> order = IntStream.range(0, policies.length).boxed().collect(toList()); + List<Integer> order = IntStream.range(0, policies.length).boxed().collect(Collectors.toCollection(ArrayList::new)); MockServer resource = new MockServer(workPerSuccess, numberOfWorkers, maximumTasksPerWorker, workerParallelism); AtomicLong outstanding = new AtomicLong(operations); AtomicLong errors = new AtomicLong(0); @@ -350,4 +351,4 @@ public class DynamicThrottlePolicyTest { } -}
\ No newline at end of file +} |