Replace usage of JobLauncher with JobOperator in JobStep

Resolves #4923

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.listener.ChunkListener;
 import org.springframework.batch.core.listener.ItemProcessListener;
 import org.springframework.batch.core.listener.ItemReadListener;
@@ -33,7 +34,6 @@
 import org.springframework.batch.core.listener.StepExecutionListener;
 import org.springframework.batch.core.listener.StepListener;
 import org.springframework.batch.core.job.flow.Flow;
-import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.partition.PartitionHandler;
 import org.springframework.batch.core.partition.Partitioner;
 import org.springframework.batch.core.partition.StepExecutionAggregator;
@@ -125,7 +125,7 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
 	//
 	private Job job;
 
-	private JobLauncher jobLauncher;
+	private JobOperator jobOperator;
 
 	private JobParametersExtractor jobParametersExtractor;
 
@@ -516,7 +516,7 @@ private Step createJobStep() throws Exception {
 		JobStepBuilder builder = new StepBuilder(name, jobRepository).job(job);
 		enhanceCommonStep(builder);
 		builder.parametersExtractor(jobParametersExtractor);
-		builder.launcher(jobLauncher);
+		builder.operator(jobOperator);
 		return builder.build();
 
 	}
@@ -656,8 +656,8 @@ public void setJobParametersExtractor(JobParametersExtractor jobParametersExtrac
 		this.jobParametersExtractor = jobParametersExtractor;
 	}
 
-	public void setJobLauncher(JobLauncher jobLauncher) {
-		this.jobLauncher = jobLauncher;
+	public void setJobOperator(JobOperator jobOperator) {
+		this.jobOperator = jobOperator;
 	}
 
 	// =========================================================

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  */
 package org.springframework.batch.core.step.builder;
 
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
 import org.springframework.batch.core.step.Step;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
 import org.springframework.batch.core.step.job.JobParametersExtractor;
 import org.springframework.batch.core.step.job.JobStep;
 
@@ -33,7 +34,7 @@ public class JobStepBuilder extends StepBuilderHelper<JobStepBuilder> {
 
 	private Job job;
 
-	private JobLauncher jobLauncher;
+	private JobOperator jobOperator;
 
 	private JobParametersExtractor jobParametersExtractor;
 
@@ -57,12 +58,12 @@ public JobStepBuilder job(Job job) {
 	}
 
 	/**
-	 * Add a job launcher. Defaults to a simple job launcher.
-	 * @param jobLauncher the job launcher to use
+	 * Add a job operator. Defaults to a {@link TaskExecutorJobOperator}.
+	 * @param jobOperator the job operator to use
 	 * @return this for fluent chaining
 	 */
-	public JobStepBuilder launcher(JobLauncher jobLauncher) {
-		this.jobLauncher = jobLauncher;
+	public JobStepBuilder operator(JobOperator jobOperator) {
+		this.jobOperator = jobOperator;
 		return this;
 	}
 
@@ -92,18 +93,19 @@ public Step build() {
 		if (jobParametersExtractor != null) {
 			step.setJobParametersExtractor(jobParametersExtractor);
 		}
-		if (jobLauncher == null) {
-			TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
-			jobLauncher.setJobRepository(getJobRepository());
+		if (jobOperator == null) {
+			TaskExecutorJobOperator jobOperator = new TaskExecutorJobOperator();
+			jobOperator.setJobRepository(getJobRepository());
+			jobOperator.setJobRegistry(new MapJobRegistry());
 			try {
-				jobLauncher.afterPropertiesSet();
+				jobOperator.afterPropertiesSet();
 			}
 			catch (Exception e) {
 				throw new StepBuilderException(e);
 			}
-			this.jobLauncher = jobLauncher;
+			this.jobOperator = jobOperator;
 		}
-		step.setJobLauncher(jobLauncher);
+		step.setJobOperator(jobOperator);
 		try {
 			step.afterPropertiesSet();
 		}

spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java

@@ -20,10 +20,10 @@
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.UnexpectedJobExecutionException;
-import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.util.Assert;
@@ -47,14 +47,14 @@ public class JobStep extends AbstractStep {
 
 	private Job job;
 
-	private JobLauncher jobLauncher;
+	private JobOperator jobOperator;
 
 	private JobParametersExtractor jobParametersExtractor = new DefaultJobParametersExtractor();
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		super.afterPropertiesSet();
-		Assert.state(jobLauncher != null, "A JobLauncher must be provided");
+		Assert.state(jobOperator != null, "A JobOperator must be provided");
 		Assert.state(job != null, "A Job must be provided");
 	}
 
@@ -67,11 +67,11 @@ public void setJob(Job job) {
 	}
 
 	/**
-	 * A {@link JobLauncher} is required to be able to run the enclosed {@link Job}.
-	 * @param jobLauncher the {@link JobLauncher} to set
+	 * A {@link JobOperator} is required to be able to start the enclosed {@link Job}.
+	 * @param jobOperator the {@link JobOperator} to set
 	 */
-	public void setJobLauncher(JobLauncher jobLauncher) {
-		this.jobLauncher = jobLauncher;
+	public void setJobOperator(JobOperator jobOperator) {
+		this.jobOperator = jobOperator;
 	}
 
 	/**
@@ -86,7 +86,7 @@ public void setJobParametersExtractor(JobParametersExtractor jobParametersExtrac
 	}
 
 	/**
-	 * Execute the job provided by delegating to the {@link JobLauncher} to prevent
+	 * Execute the job provided by delegating to the {@link JobOperator} to prevent
 	 * duplicate executions. The job parameters will be generated by the
 	 * {@link JobParametersExtractor} provided (if any), otherwise empty. On a restart,
 	 * the job parameters will be the same as the last (failed) execution.
@@ -109,7 +109,7 @@ protected void doExecute(StepExecution stepExecution) throws Exception {
 			executionContext.put(JOB_PARAMETERS_KEY, jobParameters);
 		}
 
-		JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+		JobExecution jobExecution = jobOperator.start(job, jobParameters);
 
 		stepExecution.setExitStatus(determineStepExitStatus(stepExecution, jobExecution));
 

spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd

@@ -446,14 +446,14 @@
 								</xsd:appinfo>
 							</xsd:annotation>
 						</xsd:attribute>
-						<xsd:attribute name="job-launcher">
+						<xsd:attribute name="job-operator">
 							<xsd:annotation>
-								<xsd:documentation source="java:org.springframework.batch.core.launch.JobLauncher"><![CDATA[
+								<xsd:documentation source="java:org.springframework.batch.core.launch.JobOperator"><![CDATA[
 							The job that will execute in this step.
 							]]></xsd:documentation>
 								<xsd:appinfo>
 									<tool:annotation kind="ref">
-										<tool:expected-type type="java:org.springframework.batch.core.launch.JobLauncher" />
+										<tool:expected-type type="java:org.springframework.batch.core.launch.JobOperator" />
 									</tool:annotation>
 								</xsd:appinfo>
 							</xsd:annotation>

spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,13 @@
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.UnexpectedJobExecutionException;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
 import org.springframework.batch.item.ExecutionContext;
@@ -68,10 +69,11 @@ void setUp() throws Exception {
 		JobExecution jobExecution = jobRepository.createJobExecution("job", new JobParameters());
 		stepExecution = jobExecution.createStepExecution("step");
 		jobRepository.add(stepExecution);
-		TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
-		jobLauncher.setJobRepository(jobRepository);
-		jobLauncher.afterPropertiesSet();
-		step.setJobLauncher(jobLauncher);
+		TaskExecutorJobOperator jobOperator = new TaskExecutorJobOperator();
+		jobOperator.setJobRepository(jobRepository);
+		jobOperator.setJobRegistry(new MapJobRegistry());
+		jobOperator.afterPropertiesSet();
+		step.setJobOperator(jobOperator);
 	}
 
 	@Test
@@ -80,9 +82,9 @@ void testAfterPropertiesSet() {
 	}
 
 	@Test
-	void testAfterPropertiesSetWithNoLauncher() {
+	void testAfterPropertiesSetWithNoOperator() {
 		step.setJob(new JobSupport("child"));
-		step.setJobLauncher(null);
+		step.setJobOperator(null);
 		assertThrows(IllegalStateException.class, step::afterPropertiesSet);
 	}