Merge pull request spring-projects#24867 from izeye

* pr/24867: Fix property name for spring.dao.exceptiontranslation.enabled Closes spring-projectsgh-24867
snicoll · Jan 18, 2021 · 8198098 · 8198098
2 parents 52ca841 + 21db142
commit 8198098
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...pringframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/...pringframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
@@ -64,7 +64,7 @@ DataSourceTransactionManager transactionManager(Environment environment, DataSou
 		}
 
 		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);
 		}
 

diff --git a/...framework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/...framework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
@@ -87,15 +87,15 @@ void transactionManagerWithExistingTransactionManagerIsNotOverridden() {
 	@Test // gh-24321
 	void transactionManagerWithDaoExceptionTranslationDisabled() {
 		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))
 						.isExactlyInstanceOf(DataSourceTransactionManager.class));
 	}
 
 	@Test // gh-24321
 	void transactionManagerWithDaoExceptionTranslationEnabled() {
 		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))
 						.isExactlyInstanceOf(JdbcTransactionManager.class));
 	}