Remove dependency to JobExplorer in SimpleJobOperator

Resolves #4817

Author: fmbenhassine

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

@@ -254,7 +254,6 @@ private void registerJobOperator(BeanDefinitionRegistry registry, EnableBatchPro
 
 		beanDefinitionBuilder.addPropertyReference(JOB_REPOSITORY, JOB_REPOSITORY);
 		beanDefinitionBuilder.addPropertyReference(JOB_LAUNCHER, JOB_LAUNCHER);
-		beanDefinitionBuilder.addPropertyReference(JOB_EXPLORER, JOB_EXPLORER);
 		beanDefinitionBuilder.addPropertyReference(JOB_REGISTRY, JOB_REGISTRY);
 
 		// set optional properties

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java

@@ -197,20 +197,18 @@ public JobRegistry jobRegistry() throws BatchConfigurationException {
 	/**
 	 * Define a job operator bean.
 	 * @param jobRepository a job repository
-	 * @param jobExplorer a job explorer
 	 * @param jobRegistry a job registry
 	 * @param jobLauncher a job launcher
 	 * @return a job operator
 	 * @throws BatchConfigurationException if unable to configure the default job operator
 	 * @since 5.2
 	 */
 	@Bean
-	public JobOperator jobOperator(JobRepository jobRepository, JobExplorer jobExplorer, JobRegistry jobRegistry,
-			JobLauncher jobLauncher) throws BatchConfigurationException {
+	public JobOperator jobOperator(JobRepository jobRepository, JobRegistry jobRegistry, JobLauncher jobLauncher)
+			throws BatchConfigurationException {
 		JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
 		jobOperatorFactoryBean.setTransactionManager(getTransactionManager());
 		jobOperatorFactoryBean.setJobRepository(jobRepository);
-		jobOperatorFactoryBean.setJobExplorer(jobExplorer);
 		jobOperatorFactoryBean.setJobRegistry(jobRegistry);
 		jobOperatorFactoryBean.setJobLauncher(jobLauncher);
 		jobOperatorFactoryBean.setJobParametersConverter(getJobParametersConverter());

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java

@@ -61,8 +61,6 @@ public class JobOperatorFactoryBean implements FactoryBean<JobOperator>, Initial
 
 	private JobRepository jobRepository;
 
-	private JobExplorer jobExplorer;
-
 	private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();
 
 	private final ProxyFactory proxyFactory = new ProxyFactory();
@@ -72,7 +70,6 @@ public void afterPropertiesSet() throws Exception {
 		Assert.notNull(this.transactionManager, "TransactionManager must not be null");
 		Assert.notNull(this.jobLauncher, "JobLauncher must not be null");
 		Assert.notNull(this.jobRegistry, "JobRegistry must not be null");
-		Assert.notNull(this.jobExplorer, "JobExplorer must not be null");
 		Assert.notNull(this.jobRepository, "JobRepository must not be null");
 		if (this.transactionAttributeSource == null) {
 			Properties transactionAttributes = new Properties();
@@ -108,14 +105,6 @@ public void setJobRepository(JobRepository jobRepository) {
 		this.jobRepository = jobRepository;
 	}
 
-	/**
-	 * Setter for the job explorer.
-	 * @param jobExplorer the job explorer to set
-	 */
-	public void setJobExplorer(JobExplorer jobExplorer) {
-		this.jobExplorer = jobExplorer;
-	}
-
 	/**
 	 * Setter for the job parameters converter.
 	 * @param jobParametersConverter the job parameters converter to set
@@ -166,7 +155,6 @@ public JobOperator getObject() throws Exception {
 	private SimpleJobOperator getTarget() throws Exception {
 		SimpleJobOperator simpleJobOperator = new SimpleJobOperator();
 		simpleJobOperator.setJobRegistry(this.jobRegistry);
-		simpleJobOperator.setJobExplorer(this.jobExplorer);
 		simpleJobOperator.setJobRepository(this.jobRepository);
 		simpleJobOperator.setJobLauncher(this.jobLauncher);
 		simpleJobOperator.setJobParametersConverter(this.jobParametersConverter);

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java

@@ -93,8 +93,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
 
 	private ListableJobLocator jobRegistry;
 
-	private JobExplorer jobExplorer;
-
 	private JobLauncher jobLauncher;
 
 	private JobRepository jobRepository;
@@ -112,7 +110,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		Assert.state(jobLauncher != null, "JobLauncher must be provided");
 		Assert.state(jobRegistry != null, "JobLocator must be provided");
-		Assert.state(jobExplorer != null, "JobExplorer must be provided");
 		Assert.state(jobRepository != null, "JobRepository must be provided");
 	}
 
@@ -132,14 +129,6 @@ public void setJobRegistry(ListableJobLocator jobRegistry) {
 		this.jobRegistry = jobRegistry;
 	}
 
-	/**
-	 * Public setter for the {@link JobExplorer}.
-	 * @param jobExplorer the {@link JobExplorer} to set
-	 */
-	public void setJobExplorer(JobExplorer jobExplorer) {
-		this.jobExplorer = jobExplorer;
-	}
-
 	public void setJobRepository(JobRepository jobRepository) {
 		this.jobRepository = jobRepository;
 	}
@@ -154,12 +143,12 @@ public void setJobLauncher(JobLauncher jobLauncher) {
 
 	@Override
 	public List<Long> getExecutions(long instanceId) throws NoSuchJobInstanceException {
-		JobInstance jobInstance = jobExplorer.getJobInstance(instanceId);
+		JobInstance jobInstance = jobRepository.getJobInstance(instanceId);
 		if (jobInstance == null) {
 			throw new NoSuchJobInstanceException(String.format("No job instance with id=%d", instanceId));
 		}
 		List<Long> list = new ArrayList<>();
-		for (JobExecution jobExecution : jobExplorer.getJobExecutions(jobInstance)) {
+		for (JobExecution jobExecution : jobRepository.getJobExecutions(jobInstance)) {
 			list.add(jobExecution.getId());
 		}
 		return list;
@@ -173,7 +162,7 @@ public Set<String> getJobNames() {
 	@Override
 	public List<Long> getJobInstances(String jobName, int start, int count) throws NoSuchJobException {
 		List<Long> list = new ArrayList<>();
-		List<JobInstance> jobInstances = jobExplorer.getJobInstances(jobName, start, count);
+		List<JobInstance> jobInstances = jobRepository.getJobInstances(jobName, start, count);
 		for (JobInstance jobInstance : jobInstances) {
 			list.add(jobInstance.getId());
 		}
@@ -186,7 +175,7 @@ public List<Long> getJobInstances(String jobName, int start, int count) throws N
 	@Override
 	@Nullable
 	public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
-		return this.jobExplorer.getJobInstance(jobName, jobParameters);
+		return this.jobRepository.getJobInstance(jobName, jobParameters);
 	}
 
 	@Override
@@ -201,7 +190,7 @@ public String getParameters(long executionId) throws NoSuchJobExecutionException
 	@Override
 	public Set<Long> getRunningExecutions(String jobName) throws NoSuchJobException {
 		Set<Long> set = new LinkedHashSet<>();
-		for (JobExecution jobExecution : jobExplorer.findRunningJobExecutions(jobName)) {
+		for (JobExecution jobExecution : jobRepository.findRunningJobExecutions(jobName)) {
 			set.add(jobExecution.getId());
 		}
 		if (set.isEmpty() && !jobRegistry.getJobNames().contains(jobName)) {
@@ -299,7 +288,7 @@ public Long startNextInstance(String jobName)
 		}
 
 		Job job = jobRegistry.getJob(jobName);
-		JobParameters parameters = new JobParametersBuilder(jobExplorer).getNextJobParameters(job).toJobParameters();
+		JobParameters parameters = new JobParametersBuilder(jobRepository).getNextJobParameters(job).toJobParameters();
 		if (logger.isInfoEnabled()) {
 			logger.info(String.format("Attempting to launch job with name=%s and parameters=%s", jobName, parameters));
 		}
@@ -389,7 +378,7 @@ public JobExecution abandon(long jobExecutionId)
 	}
 
 	private JobExecution findExecutionById(long executionId) throws NoSuchJobExecutionException {
-		JobExecution jobExecution = jobExplorer.getJobExecution(executionId);
+		JobExecution jobExecution = jobRepository.getJobExecution(executionId);
 
 		if (jobExecution == null) {
 			throw new NoSuchJobExecutionException("No JobExecution found for id: [" + executionId + "]");

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBeanTests.java

@@ -57,7 +57,6 @@ public void testJobOperatorCreation() throws Exception {
 		JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
 		jobOperatorFactoryBean.setTransactionManager(this.transactionManager);
 		jobOperatorFactoryBean.setJobLauncher(this.jobLauncher);
-		jobOperatorFactoryBean.setJobExplorer(this.jobExplorer);
 		jobOperatorFactoryBean.setJobRegistry(this.jobRegistry);
 		jobOperatorFactoryBean.setJobRepository(this.jobRepository);
 		jobOperatorFactoryBean.setJobParametersConverter(this.jobParametersConverter);
@@ -80,7 +79,6 @@ public void testCustomTransactionAttributesSource() throws Exception {
 		JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
 		jobOperatorFactoryBean.setTransactionManager(this.transactionManager);
 		jobOperatorFactoryBean.setJobLauncher(this.jobLauncher);
-		jobOperatorFactoryBean.setJobExplorer(this.jobExplorer);
 		jobOperatorFactoryBean.setJobRegistry(this.jobRegistry);
 		jobOperatorFactoryBean.setJobRepository(this.jobRepository);
 		jobOperatorFactoryBean.setJobParametersConverter(this.jobParametersConverter);