diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-18 12:17:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 12:17:52 +0100 |
| commit | 6c457e6dd5993ec2ef15177dab4a16e3d3702b85 (patch) | |
| tree | 2a180e00fa5b77e3ac8512873a259d1ecc6cc619 /configserver | |
| parent | 827dd7099d2da4f4914c91bd70e0ad4707b93f26 (diff) | |
| parent | 592674c7317fd1e97107ed700fb7a039ef9365a7 (diff) | |
Merge pull request #25610 from vespa-engine/balder/unify-on-toList
Balder/unify on to list
Diffstat (limited to 'configserver')
3 files changed, 3 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java index 438ac7dc9a8..d757421c23a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java @@ -122,7 +122,7 @@ public class ApplicationCuratorDatabase { .sorted() .map(ApplicationId::fromSerializedForm) .filter(id -> activeSessionOf(id).isPresent()) - .collect(Collectors.toUnmodifiableList()); + .toList(); } public Optional<ApplicationReindexing> readReindexingStatus(ApplicationId id) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java index cbd66c0bb67..369f91ec876 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java @@ -99,7 +99,7 @@ public class RoutingStatusApiHandler extends RestApiRequestHandler<RoutingStatus List<String> inactiveDeployments = curator.getChildren(DEPLOYMENT_STATUS_ROOT).stream() .filter(upstreamName -> deploymentStatus(upstreamName).status() == RoutingStatus.out) .sorted() - .collect(Collectors.toUnmodifiableList()); + .toList(); Slime slime = new Slime(); Cursor rootArray = slime.setArray(); inactiveDeployments.forEach(rootArray::addString); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 39b1a588a17..842416615e2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -52,7 +52,6 @@ import static com.yahoo.vespa.config.server.deploy.DeployTester.CountingModelFac import static com.yahoo.vespa.config.server.deploy.DeployTester.createFailingModelFactory; import static com.yahoo.vespa.config.server.deploy.DeployTester.createHostedModelFactory; import static com.yahoo.yolean.Exceptions.uncheck; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; @@ -529,7 +528,7 @@ public class HostedDeployTest { private List<Host> createHosts(int count, String ... versions) { return IntStream.rangeClosed(1, count) .mapToObj(i -> createHost("host" + i, versions[Math.min(i, versions.length) - 1])) - .collect(toList()); + .toList(); } private Host createHost(String hostname, String version) { |