Make ModularBatchConfiguration extend SimpleBatchConfiguration

This change makes the added value of ModularBatchConfiguration
compared to SimpleBatchConfiguration more visible.

Author: fmbenhassine

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

@@ -30,48 +30,19 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
- * Base {@code Configuration} class providing common structure for enabling and using Spring Batch. Customization is
- * available by implementing the {@link BatchConfigurer} interface.
+ * Base {@code Configuration} class providing common structure for enabling and using Spring Batch.
+ * Customization is available by implementing the {@link BatchConfigurer} interface.
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
  * @since 2.2
  * @see EnableBatchProcessing
  */
 @Configuration(proxyBeanMethods = false)
-public class ModularBatchConfiguration extends AbstractBatchConfiguration {
-
-	@Autowired
-	private ApplicationContext context;
-
-	@Autowired(required = false)
-	private Collection<BatchConfigurer> configurers;
+public class ModularBatchConfiguration extends SimpleBatchConfiguration {
 
 	private AutomaticJobRegistrar registrar = new AutomaticJobRegistrar();
 
-	@Override
-	@Bean
-	public JobRepository jobRepository() throws Exception {
-		return getConfigurer(configurers).getJobRepository();
-	}
-
-	@Override
-	@Bean
-	public JobLauncher jobLauncher() throws Exception {
-		return getConfigurer(configurers).getJobLauncher();
-	}
-
-	@Override
-	public PlatformTransactionManager transactionManager() throws Exception {
-		return getConfigurer(configurers).getTransactionManager();
-	}
-
-	@Override
-	@Bean
-	public JobExplorer jobExplorer() throws Exception {
-		return getConfigurer(configurers).getJobExplorer();
-	}
-
 	/**
 	 * Creates a {@link AutomaticJobRegistrar} bean.
 	 *

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

@@ -47,7 +47,7 @@
 public class SimpleBatchConfiguration extends AbstractBatchConfiguration {
 
 	@Autowired
-	private ApplicationContext context;
+	protected ApplicationContext context;
 
 	@Autowired(required = false)
 	private Collection<BatchConfigurer> configurers;