diff --git a/module/spring-boot-data-jdbc-test/src/test/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTestIntegrationTests.java b/module/spring-boot-data-jdbc-test/src/test/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTestIntegrationTests.java index 6d468ad7f4d..44976d9be42 100644 --- a/module/spring-boot-data-jdbc-test/src/test/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTestIntegrationTests.java +++ b/module/spring-boot-data-jdbc-test/src/test/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTestIntegrationTests.java @@ -23,6 +23,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.TestPropertySource; @@ -77,4 +79,11 @@ class DataJdbcTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + } diff --git a/module/spring-boot-data-jpa-test/src/test/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTestIntegrationTests.java b/module/spring-boot-data-jpa-test/src/test/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTestIntegrationTests.java index 13e89020b4c..f441cc733ed 100644 --- a/module/spring-boot-data-jpa-test/src/test/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTestIntegrationTests.java +++ b/module/spring-boot-data-jpa-test/src/test/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTestIntegrationTests.java @@ -24,6 +24,8 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jpa.test.autoconfigure.TestEntityManager; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.data.repository.config.BootstrapMode; import org.springframework.jdbc.core.JdbcTemplate; @@ -111,6 +113,13 @@ class DataJpaTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + @Test void bootstrapModeIsDefaultByDefault() { assertThat(this.applicationContext.getEnvironment().getProperty("spring.data.jpa.repositories.bootstrap-mode")) diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java index aa213e78944..5f836867b2c 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java @@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; import org.springframework.boot.testsupport.container.TestImage; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.data.mongodb.core.MongoTemplate; @@ -78,4 +80,11 @@ class DataMongoTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + } diff --git a/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports b/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports index 65e43e3e8c2..e99b6909d5a 100644 --- a/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports +++ b/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports @@ -6,4 +6,5 @@ org.springframework.boot.data.mongodb.autoconfigure.DataMongoRepositoriesAutoCon org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java index 0d7e68b1e53..6e721c7d399 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java @@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; import org.springframework.boot.testsupport.container.TestImage; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.data.neo4j.core.Neo4jTemplate; @@ -80,4 +82,11 @@ class DataNeo4jTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + } diff --git a/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports b/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports index b8041629fa4..38279357bd4 100644 --- a/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports +++ b/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports @@ -4,4 +4,5 @@ org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jReactiveRepositoriesA org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jRepositoriesAutoConfiguration org.springframework.boot.neo4j.autoconfigure.Neo4jAutoConfiguration org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports b/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports index 95cd3ac7f46..3533831df9f 100644 --- a/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports +++ b/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports @@ -4,4 +4,5 @@ org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration org.springframework.boot.r2dbc.autoconfigure.R2dbcInitializationAutoConfiguration org.springframework.boot.r2dbc.autoconfigure.R2dbcTransactionManagerAutoConfiguration org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/module/spring-boot-data-r2dbc-test/src/test/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTestIntegrationTests.java b/module/spring-boot-data-r2dbc-test/src/test/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTestIntegrationTests.java index f165b7dbf5a..8f492494805 100644 --- a/module/spring-boot-data-r2dbc-test/src/test/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTestIntegrationTests.java +++ b/module/spring-boot-data-r2dbc-test/src/test/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTestIntegrationTests.java @@ -26,6 +26,8 @@ import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.r2dbc.core.DatabaseClient; @@ -72,4 +74,11 @@ class DataR2dbcTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + } diff --git a/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc.imports b/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc.imports index 2e4c183ed8c..67e70275dd4 100644 --- a/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc.imports +++ b/module/spring-boot-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc.imports @@ -3,4 +3,5 @@ org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConf org.springframework.boot.jdbc.autoconfigure.JdbcClientAutoConfiguration org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/module/spring-boot-jdbc-test/src/test/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTestIntegrationTests.java b/module/spring-boot-jdbc-test/src/test/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTestIntegrationTests.java index 195b7a2f624..35d38d8405b 100644 --- a/module/spring-boot-jdbc-test/src/test/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTestIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/test/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTestIntegrationTests.java @@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.simple.JdbcClient; @@ -102,4 +104,11 @@ class JdbcTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + } diff --git a/module/spring-boot-jooq-test/src/main/resources/META-INF/spring/org.springframework.boot.jooq.test.autoconfigure.AutoConfigureJooq.imports b/module/spring-boot-jooq-test/src/main/resources/META-INF/spring/org.springframework.boot.jooq.test.autoconfigure.AutoConfigureJooq.imports index 90b05bf5719..9e4aceae9f4 100644 --- a/module/spring-boot-jooq-test/src/main/resources/META-INF/spring/org.springframework.boot.jooq.test.autoconfigure.AutoConfigureJooq.imports +++ b/module/spring-boot-jooq-test/src/main/resources/META-INF/spring/org.springframework.boot.jooq.test.autoconfigure.AutoConfigureJooq.imports @@ -2,4 +2,5 @@ org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration org.springframework.boot.jooq.autoconfigure.JooqAutoConfiguration org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java index 0d7a9cf8909..4ea08370bc1 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java @@ -27,6 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration; import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration; +import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.test.context.TestPropertySource; @@ -86,4 +88,11 @@ class JooqTestIntegrationTests { assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class)); } + @Test + void transactionAutoConfigurationWasImported() { + assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class)); + assertThat(this.applicationContext) + .has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class)); + } + }