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
4b641ca2
Commit
4b641ca2
authored
Dec 29, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-7561
parent
082a246f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
BasicBatchConfigurer.java
...mework/boot/autoconfigure/batch/BasicBatchConfigurer.java
+3
-5
BatchAutoConfiguration.java
...work/boot/autoconfigure/batch/BatchAutoConfiguration.java
+2
-2
PlatformTransactionManagerCustomizer.java
...ure/transaction/PlatformTransactionManagerCustomizer.java
+2
-1
TransactionManagerCustomizers.java
...oconfigure/transaction/TransactionManagerCustomizers.java
+1
-0
TransactionProperties.java
...boot/autoconfigure/transaction/TransactionProperties.java
+1
-1
Neo4jDataAutoConfigurationTests.java
...configure/data/neo4j/Neo4jDataAutoConfigurationTests.java
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java
View file @
4b641ca2
...
...
@@ -30,7 +30,6 @@ import org.springframework.batch.core.launch.JobLauncher;
import
org.springframework.batch.core.launch.support.SimpleJobLauncher
;
import
org.springframework.batch.core.repository.JobRepository
;
import
org.springframework.batch.core.repository.support.JobRepositoryFactoryBean
;
import
org.springframework.beans.factory.ObjectProvider
;
import
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers
;
import
org.springframework.jdbc.datasource.DataSourceTransactionManager
;
import
org.springframework.orm.jpa.JpaTransactionManager
;
...
...
@@ -73,7 +72,7 @@ public class BasicBatchConfigurer implements BatchConfigurer {
* {@code null})
*/
protected
BasicBatchConfigurer
(
BatchProperties
properties
,
DataSource
dataSource
,
ObjectProvider
<
TransactionManagerCustomizers
>
transactionManagerCustomizers
)
{
TransactionManagerCustomizers
transactionManagerCustomizers
)
{
this
(
properties
,
dataSource
,
null
,
transactionManagerCustomizers
);
}
...
...
@@ -87,12 +86,11 @@ public class BasicBatchConfigurer implements BatchConfigurer {
*/
protected
BasicBatchConfigurer
(
BatchProperties
properties
,
DataSource
dataSource
,
EntityManagerFactory
entityManagerFactory
,
ObjectProvider
<
TransactionManagerCustomizers
>
transactionManagerCustomizers
)
{
TransactionManagerCustomizers
transactionManagerCustomizers
)
{
this
.
properties
=
properties
;
this
.
entityManagerFactory
=
entityManagerFactory
;
this
.
dataSource
=
dataSource
;
this
.
transactionManagerCustomizers
=
transactionManagerCustomizers
.
getIfAvailable
();
this
.
transactionManagerCustomizers
=
transactionManagerCustomizers
;
}
@Override
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
View file @
4b641ca2
...
...
@@ -157,7 +157,7 @@ public class BatchAutoConfiguration {
EntityManagerFactory
entityManagerFactory
,
ObjectProvider
<
TransactionManagerCustomizers
>
transactionManagerCustomizers
)
{
return
new
BasicBatchConfigurer
(
this
.
properties
,
dataSource
,
entityManagerFactory
,
transactionManagerCustomizers
);
entityManagerFactory
,
transactionManagerCustomizers
.
getIfAvailable
()
);
}
@Bean
...
...
@@ -165,7 +165,7 @@ public class BatchAutoConfiguration {
public
BasicBatchConfigurer
basicBatchConfigurer
(
DataSource
dataSource
,
ObjectProvider
<
TransactionManagerCustomizers
>
transactionManagerCustomizers
)
{
return
new
BasicBatchConfigurer
(
this
.
properties
,
dataSource
,
transactionManagerCustomizers
);
transactionManagerCustomizers
.
getIfAvailable
()
);
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java
View file @
4b641ca2
...
...
@@ -25,9 +25,10 @@ import org.springframework.transaction.PlatformTransactionManager;
*
* @param <T> The transaction manager type
* @author Phillip Webb
* @since 1.5.0
*/
public
interface
PlatformTransactionManagerCustomizer
<
T
extends
PlatformTransactionManager
>
{
/**
* Customize the given transaction manager.
* @param transactionManager the transaction manager to customize
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
View file @
4b641ca2
...
...
@@ -27,6 +27,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* A collection of {@link PlatformTransactionManagerCustomizer}.
*
* @author Phillip Webb
* @since 1.5.0
*/
public
class
TransactionManagerCustomizers
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java
View file @
4b641ca2
...
...
@@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import
org.springframework.transaction.support.AbstractPlatformTransactionManager
;
/**
*
Nested c
onfiguration properties that can be applied to an
*
C
onfiguration properties that can be applied to an
* {@link AbstractPlatformTransactionManager}.
*
* @author Kazuki Shimizu
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java
View file @
4b641ca2
...
...
@@ -155,7 +155,7 @@ public class Neo4jDataAutoConfigurationTests {
ctx
.
register
(
config
);
}
ctx
.
register
(
PropertyPlaceholderAutoConfiguration
.
class
,
Neo4jDataAutoConfiguration
.
class
,
Transaction
AutoConfiguration
.
class
);
TransactionAutoConfiguration
.
class
,
Neo4jData
AutoConfiguration
.
class
);
ctx
.
refresh
();
this
.
context
=
ctx
;
}
...
...
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