Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
59124d07
Commit
59124d07
authored
Mar 25, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch on @EnableTransactionManagement by default
Fixes gh-576
parent
809a5a71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
DataSourceTransactionManagerAutoConfiguration.java
...e/jdbc/DataSourceTransactionManagerAutoConfiguration.java
+1
-2
DataSourceTransactionManagerAutoConfigurationTests.java
...c/DataSourceTransactionManagerAutoConfigurationTests.java
+3
-0
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
View file @
59124d07
...
@@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
...
@@ -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 {
...
@@ -58,7 +57,7 @@ public class DataSourceTransactionManagerAutoConfiguration implements Ordered {
return
new
DataSourceTransactionManager
(
this
.
dataSource
);
return
new
DataSourceTransactionManager
(
this
.
dataSource
);
}
}
@ConditionalOnMissing
Class
(
AbstractTransactionManagementConfiguration
.
class
)
@ConditionalOnMissing
Bean
(
AbstractTransactionManagementConfiguration
.
class
)
@Configuration
@Configuration
@EnableTransactionManagement
@EnableTransactionManagement
protected
static
class
TransactionManagementConfiguration
{
protected
static
class
TransactionManagementConfiguration
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
View file @
59124d07
...
@@ -21,6 +21,7 @@ import javax.sql.DataSource;
...
@@ -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 {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment