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

Merge pull request #24867 from izeye 

* pr/24867:
  Fix property name for spring.dao.exceptiontranslation.enabled

Closes gh-24867
This commit is contained in:
Stephane Nicoll 2021-01-18 14:44:06 +01:00
parent 52ca841a2e 21db14227c
commit 819809849f
2 changed files with 3 additions and 3 deletions
Show Stats 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

@ -64,7 +64,7 @@ public class DataSourceTransactionManagerAutoConfiguration {
} }
private DataSourceTransactionManager createTransactionManager(Environment environment, DataSource dataSource) { private DataSourceTransactionManager createTransactionManager(Environment environment, DataSource dataSource) {
return environment.getProperty("spring.dao.exceptiontranslation.enable", Boolean.class, Boolean.TRUE) return environment.getProperty("spring.dao.exceptiontranslation.enabled", Boolean.class, Boolean.TRUE)
? new JdbcTransactionManager(dataSource) : new DataSourceTransactionManager(dataSource); ? new JdbcTransactionManager(dataSource) : new DataSourceTransactionManager(dataSource);
} }

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

@ -87,7 +87,7 @@ class DataSourceTransactionManagerAutoConfigurationTests {
@Test // gh-24321 @Test // gh-24321
void transactionManagerWithDaoExceptionTranslationDisabled() { void transactionManagerWithDaoExceptionTranslationDisabled() {
this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class)) this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.withPropertyValues("spring.dao.exceptiontranslation.enable=false") .withPropertyValues("spring.dao.exceptiontranslation.enabled=false")
.run((context) -> assertThat(context.getBean(TransactionManager.class)) .run((context) -> assertThat(context.getBean(TransactionManager.class))
.isExactlyInstanceOf(DataSourceTransactionManager.class)); .isExactlyInstanceOf(DataSourceTransactionManager.class));
} }
@ -95,7 +95,7 @@ class DataSourceTransactionManagerAutoConfigurationTests {
@Test // gh-24321 @Test // gh-24321
void transactionManagerWithDaoExceptionTranslationEnabled() { void transactionManagerWithDaoExceptionTranslationEnabled() {
this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class)) this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.withPropertyValues("spring.dao.exceptiontranslation.enable=true") .withPropertyValues("spring.dao.exceptiontranslation.enabled=true")
.run((context) -> assertThat(context.getBean(TransactionManager.class)) .run((context) -> assertThat(context.getBean(TransactionManager.class))
.isExactlyInstanceOf(JdbcTransactionManager.class)); .isExactlyInstanceOf(JdbcTransactionManager.class));
} }