spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Polish "Align use of transaction manager in MongoDB support"

Browse Source 
See gh-51725
This commit is contained in:
Stéphane Nicoll
2026-09-16 19:43:03 +02:00
parent f5b8c5a72d
commit d479a6a42f
2 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-batch-data-mongodb/src/main/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfiguration.java
-1
View File
@@ -56,7 +56,6 @@ import org.springframework.transaction.annotation.Isolation;
* {@link EnableAutoConfiguration Auto-configuration} for Spring Batch using Data MongoDB.
*
* @author Stephane Nicoll
* @author Yanming Zhou
* @since 4.1.0
*/
@AutoConfiguration(before = { BatchAutoConfiguration.class, BatchJobLauncherAutoConfiguration.class },
module/spring-boot-batch-data-mongodb/src/test/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfigurationTests.java
+5 -40
View File
@@ -50,7 +50,6 @@ import static org.mockito.Mockito.times;
* Tests for {@link BatchDataMongoAutoConfiguration}.
*
* @author Stephane Nicoll
* @author Yanming Zhou
*/
class BatchDataMongoAutoConfigurationTests {
@@ -71,17 +70,7 @@ class BatchDataMongoAutoConfigurationTests {
}
@Test
void autConfigurationUsesMainMongoTransactionManager() {
MongoTransactionManager transactionManager = mock(MongoTransactionManager.class);
this.contextRunner.withBean(MongoDatabaseFactory.class, this::mockMongoDatabaseFactory)
.withBean(MongoTransactionManager.class, () -> transactionManager)
.run((context) -> assertThat(
context.getBean(SpringBootBatchMongoConfiguration.class).getTransactionManager())
.isSameAs(transactionManager));
}
@Test
void autConfigurationUsesMainPlatformTransactionManager() {
void autConfigurationUsesMainTransactionManager() {
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
this.contextRunner.withBean(MongoDatabaseFactory.class, this::mockMongoDatabaseFactory)
.withBean(PlatformTransactionManager.class, () -> transactionManager)
@@ -91,24 +80,11 @@ class BatchDataMongoAutoConfigurationTests {
}
@Test
void autConfigurationFavorsBatchMongoTransactionManager() {
void autConfigurationFavorsBatchTransactionManager() {
MongoTransactionManager transactionManager = mock(MongoTransactionManager.class);
this.contextRunner.withBean(MongoDatabaseFactory.class, this::mockMongoDatabaseFactory)
.withBean(MongoTransactionManager.class, () -> transactionManager)
.withUserConfiguration(BatchMongoTransactionManagerConfiguration.class)
.run((context) -> {
assertThat(context.getBeansOfType(MongoTransactionManager.class)).hasSize(2);
assertThat(context.getBean(SpringBootBatchMongoConfiguration.class).getTransactionManager())
.isSameAs(context.getBean("customTransactionManager"));
});
}
@Test
void autConfigurationFavorsBatchPlatformTransactionManager() {
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
this.contextRunner.withBean(MongoDatabaseFactory.class, this::mockMongoDatabaseFactory)
.withBean(PlatformTransactionManager.class, () -> transactionManager)
.withUserConfiguration(BatchPlatformTransactionManagerConfiguration.class)
.withUserConfiguration(BatchTransactionManagerConfiguration.class)
.run((context) -> {
assertThat(context.getBeansOfType(PlatformTransactionManager.class)).hasSize(2);
assertThat(context.getBean(SpringBootBatchMongoConfiguration.class).getTransactionManager())
@@ -123,7 +99,7 @@ class BatchDataMongoAutoConfigurationTests {
assertThat(context).doesNotHaveBean(MongoTransactionManager.class);
assertThat(context.getBean(SpringBootBatchMongoConfiguration.class).getTransactionManager())
.isInstanceOfSatisfying(MongoTransactionManager.class,
(mongoTransactionManager) -> assertThat(mongoTransactionManager.getDatabaseFactory())
(transactionManager) -> assertThat(transactionManager.getDatabaseFactory())
.isSameAs(mongoDatabaseFactory));
});
}
@@ -223,18 +199,7 @@ class BatchDataMongoAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class BatchMongoTransactionManagerConfiguration {
@Bean
@BatchTransactionManager
MongoTransactionManager customTransactionManager() {
return mock(MongoTransactionManager.class);
}
}
@Configuration(proxyBeanMethods = false)
static class BatchPlatformTransactionManagerConfiguration {
static class BatchTransactionManagerConfiguration {
@Bean
@BatchTransactionManager