root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x 

Closes gh-30164
This commit is contained in:
Andy Wilkinson 2022-03-11 11:03:01 +00:00
parent 4c1d1a6a69 eef89c6c35
commit 6bbf3aff0e
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java
View File

@ -49,9 +49,10 @@ class CassandraAutoConfigurationIntegrationTests {
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues( .withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.connection.connect-timeout=60s",
"spring.data.cassandra.request.timeout=20s"); "spring.data.cassandra.connection.init-query-timeout=60s",
"spring.data.cassandra.request.timeout=60s");
@Test @Test
void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() { void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() {

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java
View File

@ -58,8 +58,10 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues( .withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.connection.init-query-timeout=10s"); "spring.data.cassandra.connection.connect-timeout=60s",
"spring.data.cassandra.connection.init-query-timeout=60s",
"spring.data.cassandra.request.timeout=60s");
@Test @Test
void authenticationWithValidUsernameAndPassword() { void authenticationWithValidUsernameAndPassword() {

9
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -54,9 +54,10 @@ class CassandraDataAutoConfigurationIntegrationTests {
.withPropertyValues( .withPropertyValues(
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.connection.connect-timeout=60s",
"spring.data.cassandra.request.timeout=20s") "spring.data.cassandra.connection.init-query-timeout=60s",
"spring.data.cassandra.request.timeout=60s")
.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context, .withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
City.class.getPackage().getName())); City.class.getPackage().getName()));

6
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
*/ */
@DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1", @DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s", "spring.data.cassandra.connection.connect-timeout=60s",
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.request.timeout=20s" }) "spring.data.cassandra.connection.init-query-timeout=60s", "spring.data.cassandra.request.timeout=60s" })
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestIntegrationTests { class DataCassandraTestIntegrationTests {

8
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.assertThat;
@DataCassandraTest(includeFilters = @Filter(Service.class), @DataCassandraTest(includeFilters = @Filter(Service.class),
properties = { "spring.data.cassandra.local-datacenter=datacenter1", properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s", "spring.data.cassandra.connection.connect-timeout=60s",
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.connection.init-query-timeout=60s",
"spring.data.cassandra.request.timeout=20s" }) "spring.data.cassandra.request.timeout=60s" })
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestWithIncludeFilterIntegrationTests { class DataCassandraTestWithIncludeFilterIntegrationTests {