diff options
19 files changed, 35 insertions, 54 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java index 4d019f2ce59..d3e74965c4b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.stream.Collectors.toList; - /** * @author bjorncs */ @@ -41,7 +39,7 @@ public class ZtsClientMock implements ZtsClient { return athenz.domains.values().stream() .filter(domain -> domain.tenantAdmins.contains(userIdentity) || domain.admins.contains(userIdentity)) .map(domain -> domain.name) - .collect(toList()); + .toList(); } @Override diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java index c40788ecb3f..d010893f1d4 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -325,7 +324,7 @@ public class SystemFlagsDataArchiveTest { private static List<FlagData> getData(SystemFlagsDataArchive archive, FlagId flagId, FlagsTarget target) { return archive.flagData(target).stream() .filter(d -> d.id().equals(flagId)) - .collect(toList()); + .toList(); } private static class SimpleZone implements ZoneApi { @@ -338,4 +337,4 @@ public class SystemFlagsDataArchiveTest { @Override public String getCloudNativeRegionName() { throw new UnsupportedOperationException(); } } -}
\ No newline at end of file +} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index db188ea3e7e..4159b099387 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -114,7 +114,6 @@ import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.counting; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; @@ -648,7 +647,7 @@ public class ApplicationController { .orElse(List.of()); List<X509Certificate> operatorCertificates = controller.supportAccess().activeGrantsFor(deployment).stream() .map(SupportAccessGrant::certificate) - .collect(toList()); + .toList(); if (testerCertificate.isPresent()) { operatorCertificates = Stream.concat(operatorCertificates.stream(), testerCertificate.stream()).toList(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java index 17644d5e207..afb854b2aaa 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java @@ -172,11 +172,11 @@ public class TestPackage { if (bundleCategoriesHeader == null) continue; for (String suite : bundleCategoriesHeader.split(",")) if ( ! suite.isBlank()) switch (suite.trim()) { - case "SystemTest": suites.add(system); break; - case "StagingSetup": suites.add(staging_setup); break; - case "StagingTest": suites.add(staging); break; - case "ProductionTest": suites.add(production); break; - default: problems.add("unexpected test suite name '" + suite + "' in bundle manifest"); + case "SystemTest" -> suites.add(system); + case "StagingSetup" -> suites.add(staging_setup); + case "StagingTest" -> suites.add(staging); + case "ProductionTest" -> suites.add(production); + default -> problems.add("unexpected test suite name '" + suite + "' in bundle manifest"); } } catch (Exception e) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index dd285917f2a..a76e76611c2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -67,7 +67,6 @@ import static java.util.function.BinaryOperator.maxBy; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; @@ -104,7 +103,7 @@ public class DeploymentStatus { Map<JobId, JobStatus> jobs = new HashMap<>(); this.jobSteps = jobDependencies(application.deploymentSpec(), allSteps, job -> jobs.computeIfAbsent(job, allJobs)); this.allSteps = Collections.unmodifiableList(allSteps); - this.allJobs = JobList.from(jobSteps.keySet().stream().map(allJobs).collect(toList())); + this.allJobs = JobList.from(jobSteps.keySet().stream().map(allJobs).toList()); } private JobType systemTest(JobType dependent) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index e905b60687e..3c2dbcb8633 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; /** @@ -284,7 +283,7 @@ public class DeploymentTrigger { } newList = newList.stream() .filter(entry -> !(entry.jobId().equals(requiredEntry.jobId()) && entry.requiredRun() < requiredEntry.requiredRun())) - .collect(toList()); + .toList(); controller.curator().writeRetriggerEntries(newList); } controller.jobController().abort(run.id(), "force re-triggered"); @@ -367,7 +366,7 @@ public class DeploymentTrigger { .filter(status -> ! hasExceededQuota(status.application().id().tenant())) .map(this::computeReadyJobs) .flatMap(Collection::stream) - .collect(toList()); + .toList(); } /** Finds the next step to trigger for the given application, if any, and returns these as a list. */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index c500189dc4d..7da61f9bc63 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -92,7 +92,6 @@ import static java.util.logging.Level.FINE; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; /** @@ -210,7 +209,7 @@ public class InternalStepRunner implements StepRunner { Instant.ofEpochMilli(entry.epochMillis()), LogEntry.typeOf(entry.level()), entry.message())) - .collect(toList())); + .toList()); logger.log("Deployment successful."); logger.log(result.message()); @@ -330,7 +329,7 @@ public class InternalStepRunner implements StepRunner { logger.log("######## Details for all nodes ########"); logger.log(nodeList.asList().stream() .flatMap(node -> nodeDetails(node, true)) - .collect(toList())); + .toList()); } else if ( ! summary.converged()) { logger.log("Waiting for convergence of " + summary.services() + " services across " + summary.nodes() + " nodes"); @@ -396,7 +395,7 @@ public class InternalStepRunner implements StepRunner { logger.log("######## Details for all nodes ########"); logger.log(nodeList.asList().stream() .flatMap(node -> nodeDetails(node, true)) - .collect(toList())); + .toList()); logger.log("######## Details for nodes with pending changes ########"); logger.log(nodeList.not().in(nodeList.not().needsNewConfig() .not().needsPlatformUpgrade() @@ -406,7 +405,7 @@ public class InternalStepRunner implements StepRunner { .not().needsOsUpgrade()) .asList().stream() .flatMap(node -> nodeDetails(node, true)) - .collect(toList())); + .toList()); logger.log(INFO, failureReason); return Optional.of(installationFailed); } @@ -415,7 +414,7 @@ public class InternalStepRunner implements StepRunner { logger.log(FINE, nodeList.expectedDown().and(nodeList.needsNewConfig()).asList().stream() .distinct() .flatMap(node -> nodeDetails(node, false)) - .collect(toList())); + .toList()); controller.jobController().locked(id, lockedRun -> { Instant noNodesDownSince = nodeList.allowedDown().size() == 0 ? lockedRun.noNodesDownSince().orElse(controller.clock().instant()) : null; @@ -461,7 +460,7 @@ public class InternalStepRunner implements StepRunner { NodeList nodeList = NodeList.of(nodes, parents, services.get()); logger.log(nodeList.asList().stream() .flatMap(node -> nodeDetails(node, false)) - .collect(toList())); + .toList()); if (nodeList.summary().converged() && testerContainersAreUp(testerId, zone, logger)) { logger.log("Tester container successfully installed!"); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 24bab28c520..9c983eb5a0f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -94,7 +94,6 @@ import static java.util.Comparator.naturalOrder; import static java.util.function.Predicate.not; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toUnmodifiableList; /** @@ -184,7 +183,7 @@ public class JobController { public void log(RunId id, Step step, Level level, List<String> messages) { log(id, step, messages.stream() .map(message -> new LogEntry(0, controller.clock().instant(), LogEntry.typeOf(level), message)) - .collect(toList())); + .toList()); } /** Stores the given log message for the given run and step. */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java index ab8f7fe22d3..bbab9487ea2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java @@ -19,7 +19,6 @@ import java.util.TreeMap; import static ai.vespa.validation.Validation.require; import static java.util.Collections.emptyNavigableMap; -import static java.util.stream.Collectors.toList; /** * History of application revisions for an {@link com.yahoo.vespa.hosted.controller.Application}. @@ -113,7 +112,7 @@ public class RevisionHistory { public List<ApplicationVersion> withPackage() { return production.values().stream() .filter(ApplicationVersion::hasPackage) - .collect(toList()); + .toList(); } /** Returns the currently deployable revisions of the application. */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java index ec4d138c44f..358925d00b2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.stream.Stream; import static java.util.Comparator.reverseOrder; -import static java.util.stream.Collectors.toList; /** * Steps that make up a deployment job. See {@link JobProfile} for preset profiles. @@ -90,7 +89,7 @@ public enum Step { pre.allPrerequisites(among).stream())) .sorted(reverseOrder()) .distinct() - .collect(toList()); + .toList(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 1505d7e2ca8..c9ad34b5082 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -167,7 +167,6 @@ import static java.util.Comparator.comparingInt; import static java.util.Map.Entry.comparingByKey; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; /** * This implements the application/v4 API which is used to deploy and manage applications @@ -397,7 +396,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { for (Tenant tenant : controller.tenants().asList(includeDeleted(request))) toSlime(tenantArray.addObject(), tenant, - applications.stream().filter(app -> app.id().tenant().equals(tenant.name())).collect(toList()), + applications.stream().filter(app -> app.id().tenant().equals(tenant.name())).toList(), request); return new SlimeJsonResponse(slime); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java index 26a5da45bdb..eed12f61a76 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java @@ -17,8 +17,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static java.util.stream.Collectors.toList; - public class Badges { // https://chrishewett.com/blog/calculating-text-width-programmatically/ thank you! @@ -120,7 +118,7 @@ public class Badges { .filter(Run::hasEnded) .skip(1) .limit(length) - .collect(toList()); + .toList(); text = lastTriggered.id().type().jobName(); textWidth = widthOf(text); @@ -312,4 +310,4 @@ public class Badges { "</svg>\n"; } -}
\ No newline at end of file +} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java index 9c529230a7f..6946efdbe2a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java @@ -98,7 +98,7 @@ public class DeploymentApiHandler extends ThreadedHttpRequestHandler { var versionStatus = controller.readVersionStatus(); ApplicationList applications = ApplicationList.from(controller.applications().asList()).withJobs(); var deploymentStatuses = controller.jobController().deploymentStatuses(applications, versionStatus); - Map<Version, DeploymentStatistics> deploymentStatistics = DeploymentStatistics.compute(versionStatus.versions().stream().map(VespaVersion::versionNumber).collect(toList()), + Map<Version, DeploymentStatistics> deploymentStatistics = DeploymentStatistics.compute(versionStatus.versions().stream().map(VespaVersion::versionNumber).toList(), deploymentStatuses) .stream().collect(toMap(DeploymentStatistics::version, identity())); for (VespaVersion version : versionStatus.versions()) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java index b8f884e67ac..872202dc222 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java @@ -23,8 +23,6 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; -import static java.util.stream.Collectors.toList; - /** * @author bjorncs */ @@ -104,7 +102,7 @@ class SystemFlagsDeployResult { wireChange.flagId = change.flagId().toString(); wireChange.owners = owners(change.flagId()); wireChange.operation = change.operation().asString(); - wireChange.targets = change.targets().stream().map(FlagsTarget::asString).collect(toList()); + wireChange.targets = change.targets().stream().map(FlagsTarget::asString).toList(); wireChange.data = change.data().map(FlagData::toWire).orElse(null); wireChange.previousData = change.previousData().map(FlagData::toWire).orElse(null); wireResult.changes.add(wireChange); @@ -114,7 +112,7 @@ class SystemFlagsDeployResult { var wireError = new WireOperationFailure(); wireError.message = error.message(); wireError.operation = error.operation().asString(); - wireError.targets = error.targets().stream().map(FlagsTarget::asString).collect(toList()); + wireError.targets = error.targets().stream().map(FlagsTarget::asString).toList(); wireError.flagId = error.flagId().map(FlagId::toString).orElse(null); wireError.owners = error.flagId().map(id -> owners(id)).orElse(List.of()); wireError.data = error.flagData().map(FlagData::toWire).orElse(null); @@ -126,7 +124,7 @@ class SystemFlagsDeployResult { wireWarning.message = warning.message(); wireWarning.flagId = warning.flagId().toString(); wireWarning.owners = owners(warning.flagId()); - wireWarning.targets = warning.targets().stream().map(FlagsTarget::asString).collect(toList()); + wireWarning.targets = warning.targets().stream().map(FlagsTarget::asString).toList(); wireResult.warnings.add(wireWarning); } return wireResult; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java index e55c42f6b57..3f93cdda61c 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors; import static java.util.logging.Level.FINE; -import static java.util.stream.Collectors.toList; /** * Retrieves metrics from a single Vespa node over http. To avoid unnecessary load on metrics @@ -101,7 +100,7 @@ public class NodeMetricsClient { return builders.stream() .map(builder -> applyProcessors(builder, processors)) .map(MetricsPacket.Builder::build) - .collect(toList()); + .toList(); } long snapshotsRetrieved() { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java index a3555f96be8..a71a5526fc2 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java @@ -65,7 +65,7 @@ public class GenericJsonUtil { var genericMetricsList = packets.stream() .filter(packet -> ! (packet.metrics().isEmpty() && packet.dimensions().isEmpty())) .map(packet -> new GenericMetrics(packet.metrics(), packet.dimensions())) - .collect(toList()); + .toList(); var genericService = packets.stream().findFirst() .map(firstPacket -> new GenericService(serviceId.id, firstPacket.timestamp, diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java index 2e7f7c7a936..d6b084acbb3 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java @@ -37,7 +37,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static com.yahoo.collections.CollectionUtil.first; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -220,7 +219,7 @@ public class ApplicationMetricsHandlerTest { private MetricsNodesConfig nodesConfig(String... paths) { var nodes = Arrays.stream(paths) .map(this::nodeConfig) - .collect(toList()); + .toList(); return new MetricsNodesConfig.Builder() .node(nodes) .build(); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java index de614e14349..cb028713d13 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java @@ -17,7 +17,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -160,7 +159,7 @@ public class ApplicationMetricsRetrieverTest { private MetricsNodesConfig nodesConfig(String... paths) { var nodes = Arrays.stream(paths) .map(this::nodeConfig) - .collect(toList()); + .toList(); return new MetricsNodesConfig.Builder() .node(nodes) .build(); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java index 5ddd10fd03c..1e21bae25c5 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java @@ -15,7 +15,6 @@ import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId; import static ai.vespa.metricsproxy.metric.model.json.JacksonUtil.createObjectMapper; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -51,7 +50,7 @@ public class GenericJsonModelTest { GenericJsonModel modelFromFile = genericJsonModelFromTestFile(TEST_FILE); List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(modelFromFile).stream() .map(MetricsPacket.Builder::build) - .collect(toList()); + .toList(); assertEquals(4, metricsPackets.size()); @@ -70,7 +69,7 @@ public class GenericJsonModelTest { GenericJsonModel modelFromFile = genericJsonModelFromTestFile(TEST_FILE_WITHOUT_NODE); List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(modelFromFile).stream() .map(MetricsPacket.Builder::build) - .collect(toList()); + .toList(); assertEquals(2, metricsPackets.size()); @@ -122,7 +121,7 @@ public class GenericJsonModelTest { String genericJson = getFileContents(TEST_FILE); List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(genericJson).stream() .map(MetricsPacket.Builder::build) - .collect(toList()); + .toList(); assertEquals(4, metricsPackets.size()); GenericJsonModel modelFromPackets = GenericJsonUtil.toGenericJsonModel(metricsPackets); |