Merge branch '1.5.x'

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 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

@@ -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

@@ -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

@@ -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

@@ -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

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;
 	}