Simplify subclassing DefaultBatchConfigurer

Author: Mattias Jiderhamn

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/DefaultBatchConfigurer.java

@@ -58,6 +58,10 @@ public DefaultBatchConfigurer(DataSource dataSource) {
 		setDataSource(dataSource);
 	}
 
+	protected DataSource getDataSource() {
+		return dataSource;
+	}
+
 	@Override
 	public JobRepository getJobRepository() {
 		return jobRepository;
@@ -81,14 +85,15 @@ public JobExplorer getJobExplorer() {
 	@PostConstruct
 	public void initialize() {
 		try {
-			if(dataSource == null) {
+			if(getDataSource() == null) {
 				logger.warn("No datasource was provided...using a Map based JobRepository");
 
-				if(this.transactionManager == null) {
-					this.transactionManager = new ResourcelessTransactionManager();
+				PlatformTransactionManager transactionManager = this.getTransactionManager(); 
+				if(transactionManager == null) {
+					transactionManager = new ResourcelessTransactionManager();
 				}
 
-				MapJobRepositoryFactoryBean jobRepositoryFactory = new MapJobRepositoryFactoryBean(this.transactionManager);
+				MapJobRepositoryFactoryBean jobRepositoryFactory = new MapJobRepositoryFactoryBean(transactionManager);
 				jobRepositoryFactory.afterPropertiesSet();
 				this.jobRepository = jobRepositoryFactory.getObject();
 
@@ -99,7 +104,7 @@ public void initialize() {
 				this.jobRepository = createJobRepository();
 
 				JobExplorerFactoryBean jobExplorerFactoryBean = new JobExplorerFactoryBean();
-				jobExplorerFactoryBean.setDataSource(this.dataSource);
+				jobExplorerFactoryBean.setDataSource(this.getDataSource());
 				jobExplorerFactoryBean.afterPropertiesSet();
 				this.jobExplorer = jobExplorerFactoryBean.getObject();
 			}
@@ -119,8 +124,8 @@ protected JobLauncher createJobLauncher() throws Exception {
 
 	protected JobRepository createJobRepository() throws Exception {
 		JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
-		factory.setDataSource(dataSource);
-		factory.setTransactionManager(transactionManager);
+		factory.setDataSource(getDataSource());
+		factory.setTransactionManager(getTransactionManager());
 		factory.afterPropertiesSet();
 		return  factory.getObject();
 	}