diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 23:02:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 23:02:31 +0100 |
| commit | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (patch) | |
| tree | 88ab77cc41620eb2b8639b10b7edd1e57b901f12 /routing-generator | |
| parent | fae49834f53500587921196e86ee4af4c670d8c9 (diff) | |
| parent | fd54b4e4b136b05b67b471dca3ca6ce3dd116710 (diff) | |
Merge pull request #25103 from vespa-engine/balder/manual-revert-of-25097
Revert collect(Collectors.toList())
Diffstat (limited to 'routing-generator')
| -rw-r--r-- | routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java | 2 | ||||
| -rw-r--r-- | routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java index de3207fda2e..8db2387bf66 100644 --- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java +++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java @@ -103,7 +103,7 @@ public class RoutingTable { 4443, configuredEndpoint.weight(), applications.getValue().activeRotation())) - .toList(); + .collect(Collectors.toList()); Endpoint endpoint = new Endpoint(configuredEndpoint.dnsName(), routingMethodFrom(configuredEndpoint)); ClusterSpec.Id cluster = ClusterSpec.Id.from(configuredEndpoint.clusterId()); Target target; diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java index fb21d153ded..0b17daa3e3c 100644 --- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java +++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java @@ -146,7 +146,7 @@ public class NginxTest { List<String> rotatedFiles = Exceptions.uncheck(() -> Files.list(NginxPath.root.in(fileSystem)) .map(path -> path.getFileName().toString()) .filter(filename -> filename.contains(".conf-")) - .toList()); + .collect(Collectors.toList())); assertEquals(List.of(expectedRotatedFiles), rotatedFiles); return this; } |