diff options
Diffstat (limited to 'node-admin')
17 files changed, 26 insertions, 26 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index 76ee3a52d64..793bae9e2ab 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -45,7 +45,7 @@ public class RealNodeRepository implements NodeRepository { public void addNodes(List<AddNode> nodes) { List<NodeRepositoryNode> nodesToPost = nodes.stream() .map(RealNodeRepository::nodeRepositoryNodeFromAddNode) - .collect(Collectors.toList()); + .toList(); configServerApi.post("/nodes/v2/node", nodesToPost, StandardConfigServerResponse.class) .throwOnError("Failed to add nodes"); @@ -58,7 +58,7 @@ public class RealNodeRepository implements NodeRepository { return nodesForHost.nodes.stream() .map(RealNodeRepository::createNodeSpec) - .collect(Collectors.toList()); + .toList(); } @Override @@ -149,7 +149,7 @@ public class RealNodeRepository implements NodeRepository { List<TrustStoreItem> trustStore = Optional.ofNullable(node.trustStore).orElse(List.of()).stream() .map(item -> new TrustStoreItem(item.fingerprint, Instant.ofEpochMilli(item.expiry))) - .collect(Collectors.toList()); + .toList(); return new NodeSpec( @@ -299,7 +299,7 @@ public class RealNodeRepository implements NodeRepository { node.currentFirmwareCheck = nodeAttributes.getCurrentFirmwareCheck().map(Instant::toEpochMilli).orElse(null); node.trustStore = nodeAttributes.getTrustStore().stream() .map(item -> new NodeRepositoryNode.TrustStoreItem(item.fingerprint(), item.expiry().toEpochMilli())) - .collect(Collectors.toList()); + .toList(); Map<String, JsonNode> reports = nodeAttributes.getReports(); node.reports = reports == null || reports.isEmpty() ? null : new TreeMap<>(reports); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java index 9060261b806..c1c08c15740 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java @@ -137,7 +137,7 @@ public class ContainerOperations { /** Deletes the local images that are currently not in use by any container and not recently used. */ public boolean deleteUnusedContainerImages(TaskContext context, List<DockerImage> excludes, Duration minImageAgeToDelete) { - List<String> excludedRefs = excludes.stream().map(DockerImage::asString).collect(Collectors.toList()); + List<String> excludedRefs = excludes.stream().map(DockerImage::asString).toList(); return imagePruner.removeUnusedImages(context, excludedRefs, minImageAgeToDelete); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 5ae0620fa7d..b2b587490ca 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -90,7 +90,7 @@ public class StorageMaintainer { .stream() .sorted(Comparator.comparing(FileFinder.FileAttributes::lastModifiedTime)) .flatMap(fa -> SyncFileInfo.forLogFile(archiveUri.get(), fa.path(), throttle, owner).stream()) - .collect(Collectors.toList()); + .toList(); return syncClient.sync(context, syncFileInfos, throttle ? 1 : 100); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java index 8d179b08bfb..102d6964ee5 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java @@ -52,9 +52,9 @@ public class CoredumpCleanupRule { List<FileAttributes> fileAttributes = FileFinder.files(containerCrashPath) .maxDepth(1).stream() .sorted(CORE_DUMP_FILE_ATTRIBUTE_COMPARATOR) - .collect(Collectors.toList()); + .toList(); - return mapFirstAndRemaining(fileAttributes, Priority.MEDIUM, Priority.HIGHEST).collect(Collectors.toList()); + return mapFirstAndRemaining(fileAttributes, Priority.MEDIUM, Priority.HIGHEST).toList(); } } @@ -81,7 +81,7 @@ public class CoredumpCleanupRule { return fileAttributesByContainerDay.values().stream() .flatMap(fa -> mapFirstAndRemaining(fa, Priority.MEDIUM, Priority.HIGH)) - .collect(Collectors.toList()); + .toList(); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java index e6fcbf024f3..1798d83213d 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java @@ -43,6 +43,6 @@ public class LinearCleanupRule implements DiskCleanupRule { public Collection<PrioritizedFileAttributes> prioritize() { return lister.get().stream() .map(fa -> new PrioritizedFileAttributes(fa, prioritizer.apply(fa))) - .collect(Collectors.toList()); + .toList(); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java index 4218df662da..4f72c1e0adb 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java @@ -30,7 +30,7 @@ class ArtifactProducers { .filter(p -> p.getClass().equals(type)) .findAny() .orElseThrow(() -> new IllegalArgumentException("No producer of type " + type))) - .collect(Collectors.toList()); + .toList(); if (producerMap.containsKey(alias)) { throw new IllegalStateException("Alias name '" + alias + "' conflicts with producer"); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java index 43b4df7415e..ea393979bf6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java @@ -139,7 +139,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper { String classification = a.classification().map(Artifact.Classification::value).orElse(null); return SyncFileInfo.forServiceDump(destination, a.file(), compression, owner, classification); }) - .collect(Collectors.toList()); + .toList(); ctx.log(log, Level.INFO, "Uploading " + filesToUpload.size() + " file(s) with destination " + destination); if (!syncClient.sync(ctx, filesToUpload, Integer.MAX_VALUE)) { diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java index 314844dc6eb..8b735f27aee 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java @@ -175,6 +175,6 @@ public class NodeAdminStateUpdater { .stream() .filter(node -> node.state() == NodeState.active) .map(NodeSpec::hostname) - .collect(Collectors.toList()); + .toList(); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java index 4caccc36b6f..ab702c85ffc 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java @@ -128,7 +128,7 @@ public class FileFinder { List<Path> paths = deletedPaths.stream() .map(basePath::relativize) .sorted() - .collect(Collectors.toList()); + .toList(); context.log(logger, "Deleted these paths in " + basePath + ": " + paths); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java index 148d80c9803..4b59e40cc82 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java @@ -47,7 +47,7 @@ public interface IPAddresses { return Stream.of(getAddresses(hostname)) .filter(inetAddress -> isOfType(inetAddress, ipVersion)) .map(InetAddresses::toAddrString) - .collect(Collectors.toList()); + .toList(); } /** @@ -62,7 +62,7 @@ public interface IPAddresses { .map(Inet6Address.class::cast) .filter(inetAddress -> !inetAddress.isLinkLocalAddress()) .filter(inetAddress -> !inetAddress.isSiteLocalAddress()) - .collect(Collectors.toList()); + .toList(); if (ipv6addresses.size() <= 1) return ipv6addresses.stream().findFirst(); @@ -92,13 +92,13 @@ public interface IPAddresses { .filter(Inet4Address.class::isInstance) .filter(inetAddress -> !inetAddress.isLoopbackAddress()) .map(Inet4Address.class::cast) - .collect(Collectors.toList()); + .toList(); if (ipv4Addresses.size() <= 1) return ipv4Addresses.stream().findFirst(); List<Inet4Address> siteLocalIPv4Addresses = ipv4Addresses.stream() .filter(InetAddress::isSiteLocalAddress) - .collect(Collectors.toList()); + .toList(); if (siteLocalIPv4Addresses.size() == 1) return Optional.of(siteLocalIPv4Addresses.get(0)); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java index 2032fecf4d9..faad85a14af 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java @@ -37,7 +37,7 @@ public class CommandResult { /** Returns the output lines of the command, omitting trailing empty lines. */ public List<String> getOutputLines() { - return getOutputLinesStream().collect(Collectors.toList()); + return getOutputLinesStream().toList(); } /** Returns the output lines as a stream, omitting trailing empty lines. */ @@ -78,7 +78,7 @@ public class CommandResult { * RuntimeException in UnexpectedOutputException w/output snippet. See map() for details. */ public <R> List<R> mapEachLine(Function<String, R> mapper) { - return map(result -> result.getOutputLinesStream().map(mapper).collect(Collectors.toList())); + return map(result -> result.getOutputLinesStream().map(mapper).toList()); } /** diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java index 070bac3dfc9..975f5b8eb90 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java @@ -103,7 +103,7 @@ public abstract class YumCommand<T extends YumCommand<T>> { CommandLine commandLine = terminal.newCommandLine(context); commandLine.add("yum", yumCommand.name()); addParametersToCommandLine(commandLine); - commandLine.add(packages.stream().map(pkg -> pkg.toName()).collect(Collectors.toList())); + commandLine.add(packages.stream().map(pkg -> pkg.toName()).toList()); // There's no way to figure out whether a yum command would have been a no-op. // Therefore, run the command and parse the output to decide. diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java index 5d53f13420e..20a42aed3d5 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java @@ -54,7 +54,7 @@ public class YumTester extends Yum { private GenericYumCommandExpectation(CommandType commandType, String... packages) { this.commandType = commandType; - this.packages = Stream.of(packages).map(YumPackageName::fromString).collect(Collectors.toList()); + this.packages = Stream.of(packages).map(YumPackageName::fromString).toList(); } public GenericYumCommandExpectation withEnableRepo(String... repo) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java index 9a5ca8c805e..701dd33cf55 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java @@ -53,7 +53,7 @@ public class ContainerOperationsTest { assertEquals(List.of(c1.name(), c3.name()), containerEngine.listContainers(context).stream() .map(PartialContainer::name) .sorted() - .collect(Collectors.toList())); + .toList()); } private Container createContainer(String name, boolean managed) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java index cb9bcea7da3..997b613c337 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java @@ -33,7 +33,7 @@ public class NodeRepoMock implements NodeRepository { public List<NodeSpec> getNodes(String baseHostName) { return nodeSpecByHostname.values().stream() .filter(node -> baseHostName.equals(node.parentHostname().orElse(null))) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java index 5366156cfbe..554a319f08b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java @@ -227,7 +227,7 @@ class VespaServiceDumperImplTest { List<URI> actualFilenames = actualFiles.stream() .map(SyncFileInfo::destination) .sorted() - .collect(Collectors.toList()); + .toList(); assertEquals(expectedDestinations, actualFilenames); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java index 75dc4fffff8..bc4ac4eaa47 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java @@ -190,7 +190,7 @@ public class NodeAdminStateUpdaterTest { // When doing batch suspend, only suspend the containers if the host is not active List<String> activeHostnames = nodeRepository.getNodes(hostHostname.value()).stream() .map(NodeSpec::hostname) - .collect(Collectors.toList()); + .toList(); updater.converge(SUSPENDED); verify(orchestrator, times(1)).suspend(eq(hostHostname.value()), eq(activeHostnames)); } |