From d479a6a42f3e4a21f756cba27437ff9262d629c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 16 Sep 2026 19:26:20 +0200 Subject: [PATCH] Polish "Align use of transaction manager in MongoDB support" See gh-51725 --- .../BatchDataMongoAutoConfiguration.java | 1 - .../BatchDataMongoAutoConfigurationTests.java | 45 +++---------------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/module/spring-boot-batch-data-mongodb/src/main/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfiguration.java b/module/spring-boot-batch-data-mongodb/src/main/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfiguration.java index cda380c5449..ea64addfa0e 100644 --- a/module/spring-boot-batch-data-mongodb/src/main/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfiguration.java +++ b/module/spring-boot-batch-data-mongodb/src/main/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfiguration.java @@ -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 }, diff --git a/module/spring-boot-batch-data-mongodb/src/test/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfigurationTests.java b/module/spring-boot-batch-data-mongodb/src/test/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfigurationTests.java index dd05b603fc4..f1cf27b0079 100644 --- a/module/spring-boot-batch-data-mongodb/src/test/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfigurationTests.java +++ b/module/spring-boot-batch-data-mongodb/src/test/java/org/springframework/boot/batch/mongodb/autoconfigure/BatchDataMongoAutoConfigurationTests.java @@ -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