Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Prefer JdbcTransactionManager over DataSourceTransactionManager"

Browse Source 
See gh-23672
This commit is contained in:
Stephane Nicoll
2020-10-08 15:59:34 +02:00
parent f9d50ee86a
commit 5beeeac4b3
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
View File

@@ -50,7 +50,7 @@ public class DataSourceTransactionManagerAutoConfiguration {
@Configuration(proxyBeanMethods = false)
@ConditionalOnSingleCandidate(DataSource.class)
static class DataSourceTransactionManagerConfiguration {
static class JdbcTransactionManagerConfiguration {
@Bean
@ConditionalOnMissingBean(TransactionManager.class)

18
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
View File

@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.transaction.TransactionManager;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +47,7 @@ class DataSourceTransactionManagerAutoConfigurationTests {
@Test
void transactionManagerWithoutDataSourceIsNotConfigured() {
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(DataSourceTransactionManager.class));
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(TransactionManager.class));
}
@Test
@@ -55,8 +55,8 @@ class DataSourceTransactionManagerAutoConfigurationTests {
this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.run((context) -> {
assertThat(context).hasSingleBean(TransactionManager.class)
.hasSingleBean(DataSourceTransactionManager.class);
assertThat(context.getBean(DataSourceTransactionManager.class).getDataSource())
.hasSingleBean(JdbcTransactionManager.class);
assertThat(context.getBean(JdbcTransactionManager.class).getDataSource())
.isSameAs(context.getBean(DataSource.class));
});
}
@@ -68,9 +68,8 @@ class DataSourceTransactionManagerAutoConfigurationTests {
"spring.transaction.rollback-on-commit-failure=true")
.run((context) -> {
assertThat(context).hasSingleBean(TransactionManager.class)
.hasSingleBean(DataSourceTransactionManager.class);
DataSourceTransactionManager transactionManager = context
.getBean(DataSourceTransactionManager.class);
.hasSingleBean(JdbcTransactionManager.class);
JdbcTransactionManager transactionManager = context.getBean(JdbcTransactionManager.class);
assertThat(transactionManager.getDefaultTimeout()).isEqualTo(60);
assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue();
});
@@ -93,9 +92,8 @@ class DataSourceTransactionManagerAutoConfigurationTests {
@Test
void transactionWithMultipleDataSourcesAndPrimaryCandidateIsConfigured() {
this.contextRunner.withUserConfiguration(MultiDataSourceUsingPrimaryConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(TransactionManager.class)
.hasSingleBean(DataSourceTransactionManager.class);
assertThat(context.getBean(DataSourceTransactionManager.class).getDataSource())
assertThat(context).hasSingleBean(TransactionManager.class).hasSingleBean(JdbcTransactionManager.class);
assertThat(context.getBean(JdbcTransactionManager.class).getDataSource())
.isSameAs(context.getBean("test1DataSource"));
});
}