From 4b641ca21173a59efca41d025adc4133db36ff8c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 29 Dec 2016 10:07:23 +0100 Subject: [PATCH] Polish Closes gh-7561 --- .../boot/autoconfigure/batch/BasicBatchConfigurer.java | 8 +++----- .../boot/autoconfigure/batch/BatchAutoConfiguration.java | 4 ++-- .../transaction/PlatformTransactionManagerCustomizer.java | 3 ++- .../transaction/TransactionManagerCustomizers.java | 1 + .../autoconfigure/transaction/TransactionProperties.java | 2 +- .../data/neo4j/Neo4jDataAutoConfigurationTests.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java index c52bf1da591..39813242c9d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java @@ -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) { 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) { this.properties = properties; this.entityManagerFactory = entityManagerFactory; this.dataSource = dataSource; - this.transactionManagerCustomizers = transactionManagerCustomizers - .getIfAvailable(); + this.transactionManagerCustomizers = transactionManagerCustomizers; } @Override diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index 74bab632db4..daf4b467ebf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -157,7 +157,7 @@ public class BatchAutoConfiguration { EntityManagerFactory entityManagerFactory, ObjectProvider 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) { return new BasicBatchConfigurer(this.properties, dataSource, - transactionManagerCustomizers); + transactionManagerCustomizers.getIfAvailable()); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java index ca30bb169f2..5c9d4325fed 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java @@ -25,9 +25,10 @@ import org.springframework.transaction.PlatformTransactionManager; * * @param The transaction manager type * @author Phillip Webb + * @since 1.5.0 */ - public interface PlatformTransactionManagerCustomizer { + /** * Customize the given transaction manager. * @param transactionManager the transaction manager to customize diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java index a8c2ad3c9a9..e44502775a9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java @@ -27,6 +27,7 @@ import org.springframework.transaction.PlatformTransactionManager; * A collection of {@link PlatformTransactionManagerCustomizer}. * * @author Phillip Webb + * @since 1.5.0 */ public class TransactionManagerCustomizers { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java index 9e8130ea35e..7273dd2e5dc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java @@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.transaction.support.AbstractPlatformTransactionManager; /** - * Nested configuration properties that can be applied to an + * Configuration properties that can be applied to an * {@link AbstractPlatformTransactionManager}. * * @author Kazuki Shimizu diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 23721c80baa..c651987d8b8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -155,7 +155,7 @@ public class Neo4jDataAutoConfigurationTests { ctx.register(config); } ctx.register(PropertyPlaceholderAutoConfiguration.class, - Neo4jDataAutoConfiguration.class, TransactionAutoConfiguration.class); + TransactionAutoConfiguration.class, Neo4jDataAutoConfiguration.class); ctx.refresh(); this.context = ctx; }