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

Switch on @EnableTransactionManagement by default 

Fixes gh-576
This commit is contained in:
Dave Syer 2014-03-25 16:32:06 +00:00
parent 809a5a711f
commit 59124d07c4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@ -58,7 +57,7 @@ public class DataSourceTransactionManagerAutoConfiguration implements Ordered {
return new DataSourceTransactionManager(this.dataSource); return new DataSourceTransactionManager(this.dataSource);
} }
@ConditionalOnMissingClass(AbstractTransactionManagementConfiguration.class) @ConditionalOnMissingBean(AbstractTransactionManagementConfiguration.class)
@Configuration @Configuration
@EnableTransactionManagement @EnableTransactionManagement
protected static class TransactionManagementConfiguration { protected static class TransactionManagementConfiguration {

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

@ -21,6 +21,7 @@ import javax.sql.DataSource;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.annotation.AbstractTransactionManagementConfiguration;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -42,6 +43,8 @@ public class DataSourceTransactionManagerAutoConfigurationTests {
this.context.refresh(); this.context.refresh();
assertNotNull(this.context.getBean(DataSource.class)); assertNotNull(this.context.getBean(DataSource.class));
assertNotNull(this.context.getBean(DataSourceTransactionManager.class)); assertNotNull(this.context.getBean(DataSourceTransactionManager.class));
assertNotNull(this.context
.getBean(AbstractTransactionManagementConfiguration.class));
} }
@Test @Test