diff options
Diffstat (limited to 'config-model/src/test/java/com')
11 files changed, 25 insertions, 31 deletions
diff --git a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java index 268e0b17b24..b5007bba494 100644 --- a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java @@ -175,7 +175,7 @@ public class SummaryTestCase { tests.forEach(testValue -> { var actualFields = testValue.summary.getSummaryFields().values().stream() .map(FieldBase::getName) - .toList(); + .collect(Collectors.toList()); assertEquals(Optional.ofNullable(testValue.parent), testValue.summary.inherited(), testValue.summary.getName() + (testValue.parent == null ? " does not inherit anything" : " inherits " + testValue.parent.getName())); @@ -278,7 +278,7 @@ public class SummaryTestCase { public TestValue(DocumentSummary summary, DocumentSummary parent, List<List<String>> fields) { this.summary = summary; this.parent = parent; - this.fields = fields.stream().flatMap(Collection::stream).toList();; + this.fields = fields.stream().flatMap(Collection::stream).collect(Collectors.toList());; } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java index 9705bc83e2b..a08023f2e10 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java @@ -161,7 +161,7 @@ public class ConfigValueChangeValidatorTest { private List<ConfigChangeAction> getConfigChanges(AbstractConfigProducerRoot currentModel, AbstractConfigProducerRoot nextModel) { ConfigValueChangeValidator validator = new ConfigValueChangeValidator(logger); - return validator.findConfigChangesFromModels(currentModel, nextModel).toList(); + return validator.findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.toList()); } private static void assertComponentsEquals(List<ConfigChangeAction> changes, String name, int index) { @@ -219,7 +219,7 @@ public class ConfigValueChangeValidatorTest { private static List<String> createSchemas(List<String> docTypes) { return docTypes.stream() .map(type -> "search " + type + " { document " + type + " { } }") - .toList(); + .collect(Collectors.toList()); } private static String createQrStartConfigSegment(boolean verboseGc, int heapsize) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java index 5d0a1704a1d..8d906259835 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java @@ -70,7 +70,7 @@ public class IndexingModeChangeValidatorTest { private void assertReindexingChange(String message, List<ConfigChangeAction> changeActions) { List<ConfigChangeAction> reindexingActions = changeActions.stream() .filter(a -> a instanceof ConfigChangeReindexAction) - .toList(); + .collect(Collectors.toList()); assertEquals(1, reindexingActions.size()); assertTrue(reindexingActions.get(0) instanceof ConfigChangeReindexAction); assertEquals("indexing-mode-change", ((ConfigChangeReindexAction)reindexingActions.get(0)).name()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java index 16687af5a9f..827aee42b0e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java @@ -49,7 +49,7 @@ public class StartupCommandChangeValidatorTest { private static List<ConfigChangeAction> getStartupCommandChanges( AbstractConfigProducerRoot currentModel, AbstractConfigProducerRoot nextModel) { StartupCommandChangeValidator validator = new StartupCommandChangeValidator(); - return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).toList(); + return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.toList()); } private static MockRoot createRootWithChildren(AbstractConfigProducer<?>... children) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 500843a82a0..23b576be8b3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -337,7 +337,7 @@ public class ContainerClusterTest { cluster.getConfig(configBuilder); CuratorConfig config = configBuilder.build(); assertEquals(List.of("host-c1", "host-c2"), - config.server().stream().map(CuratorConfig.Server::hostname).toList()); + config.server().stream().map(CuratorConfig.Server::hostname).collect(Collectors.toList())); assertTrue(config.zookeeperLocalhostAffinity()); assertEquals(30, config.zookeeperSessionTimeoutSeconds()); } @@ -360,7 +360,7 @@ public class ContainerClusterTest { cluster.getConfig(configBuilder); assertEquals(0, configBuilder.build().myid()); assertEquals(List.of("host-c1", "host-c2", "host-c3"), - configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).toList()); + configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).collect(Collectors.toList())); } @@ -440,11 +440,11 @@ public class ContainerClusterTest { cluster.doPrepare(state); List<ApplicationClusterEndpoint> endpoints = cluster.endpoints(); - assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).toList()); - assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).toList()); + assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).collect(Collectors.toList())); + assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).collect(Collectors.toList())); List<ContainerEndpoint> endpointsWithWeight = - globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).toList(); + globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).collect(Collectors.toList()); endpointsWithWeight.stream() .filter(ce -> ce.weight().isPresent()) .forEach(ce -> assertTrue(endpointsMatch(ce, endpoints))); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java index 5f9ebe85e11..1d534c314ba 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java @@ -136,7 +136,7 @@ public class ConfigserverClusterTest { @SuppressWarnings("varargs") private static <T> void assertZookeeperServerProperty( List<ZookeeperServerConfig.Server> zkServers, Function<ZookeeperServerConfig.Server, T> propertyMapper, T... expectedProperties) { - List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).toList(); + List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).collect(Collectors.toList()); List<T> expectedPropertyValues = Arrays.asList(expectedProperties); assertEquals(expectedPropertyValues, actualPropertyValues); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index 593fa7e76ba..0db52bf8eb5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -450,7 +450,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { assertEquals(2, caCerts.size()); List<String> certnames = caCerts.stream() .map(cert -> cert.getSubjectX500Principal().getName()) - .toList(); + .collect(Collectors.toList()); assertThat(certnames, containsInAnyOrder("CN=operator", "CN=application")); } @@ -491,7 +491,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { assertEquals(2, connectorFactories.size()); List<Integer> ports = connectorFactories.stream() .map(ConnectorFactory::getListenPort) - .toList(); + .collect(Collectors.toList()); assertThat(ports, Matchers.containsInAnyOrder(8080, 4443)); ConnectorFactory tlsPort = connectorFactories.stream().filter(connectorFactory -> connectorFactory.getListenPort() == 4443).findFirst().orElseThrow(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index addf4dffde2..6ef7b9f5b56 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -454,7 +454,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { final var model = new VespaModel(new NullConfigModelRegistry(), deployState); final var containers = model.getContainerClusters().values().stream() .flatMap(cluster -> cluster.getContainers().stream()) - .toList(); + .collect(Collectors.toList()); assertFalse(containers.isEmpty(), "Missing container objects based on configuration"); @@ -497,7 +497,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { assertEquals(List.of(cloudAccount), model.provisioned().all().values() .stream() .map(capacity -> capacity.cloudAccount().get()) - .toList()); + .collect(Collectors.toList())); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java index 45546e57808..3515bb7409e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java @@ -135,28 +135,22 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { // Valid options, should not log anything verifyLoggingOfJvmGcOptions(true, "-XX:+ParallelGCThreads=8"); verifyLoggingOfJvmGcOptions(true, "-XX:MaxTenuringThreshold=15"); // No + or - after colon + verifyLoggingOfJvmGcOptions(false, "-XX:+UseConcMarkSweepGC"); } - private void verifyThatInvalidJvmGcOptionsFailDeployment(String options, String expected) throws IOException, SAXException { + @Test + void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException { try { buildModelWithJvmOptions(new TestProperties().setHostedVespa(true), - new TestLogger(), "gc-options", options); + new TestLogger(), + "gc-options", + "-XX:+ParallelGCThreads=8 foo bar"); fail(); } catch (IllegalArgumentException e) { - assertTrue(e.getMessage().startsWith(expected)); + assertTrue(e.getMessage().startsWith("Invalid or misplaced JVM GC options in services.xml: bar,foo")); } } - @Test - void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException { - verifyThatInvalidJvmGcOptionsFailDeployment( - "-XX:+ParallelGCThreads=8 foo bar", - "Invalid or misplaced JVM GC options in services.xml: bar,foo"); - verifyThatInvalidJvmGcOptionsFailDeployment( - "-XX:+UseConcMarkSweepGC", - "Invalid or misplaced JVM GC options in services.xml: -XX:+UseConcMarkSweepGC"); - } - private void verifyLoggingOfJvmGcOptions(boolean isHosted, String override, String... invalidOptions) throws IOException, SAXException { verifyLoggingOfJvmOptions(isHosted, "gc-options", override, invalidOptions); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java index b5cca3f4e7b..cad888168fe 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java @@ -43,7 +43,7 @@ public class TopologicalDocumentTypeSorterTest { private void assertOrder(List<String> expOrder, DocumentTypesBuilder builder) { List<NewDocumentType> sortedDocTypes = TopologicalDocumentTypeSorter.sort(builder.build()); - List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).toList(); + List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).collect(Collectors.toList()); assertEquals(expOrder, actOrder); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java index fee16620e02..12d14448511 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java @@ -42,7 +42,7 @@ public class SchemaBuilder { return Arrays.asList(docTypes) .stream() .map(type -> new SchemaBuilder().name(type).build()) - .toList(); + .collect(Collectors.toList()); } } |