Rename JobLauncherTestUtils to JobOperatorTestUtils

Resolves #4920

Author: fmbenhassine

spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml

@@ -55,9 +55,12 @@
 		<property name="transactionManager" ref="transactionManager" />
 	</bean>
 
-	<bean id="jobLauncher"
-		  class="org.springframework.batch.core.launch.support.TaskExecutorJobLauncher">
+	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
+
+	<bean id="jobOperator"
+		  class="org.springframework.batch.core.launch.support.TaskExecutorJobOperator">
 		<property name="jobRepository" ref="jobRepository" />
+		<property name="jobRegistry" ref="jobRegistry" />
 	</bean>
 
 	<jdbc:embedded-database id="dataSource" generate-name="true">

spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml

@@ -75,9 +75,12 @@
 		<property name="transactionManager" ref="transactionManager" />
 	</bean>
 
-	<bean id="jobLauncher"
-		  class="org.springframework.batch.core.launch.support.TaskExecutorJobLauncher">
+	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
+
+	<bean id="jobOperator"
+		  class="org.springframework.batch.core.launch.support.TaskExecutorJobOperator">
 		<property name="jobRepository" ref="jobRepository" />
+		<property name="jobRegistry" ref="jobRegistry" />
 	</bean>
 
 	<jdbc:embedded-database id="dataSource" generate-name="true">

spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml

@@ -20,7 +20,7 @@
 	<bean id="jobRegistry"
 		  class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
 
-	<bean class="org.springframework.batch.test.JobLauncherTestUtils"/>
+	<bean class="org.springframework.batch.test.JobOperatorTestUtils"/>
 	<bean class="org.springframework.batch.test.context.BatchTestContextBeanPostProcessor"/>
 
 	<!-- The tasklet used in this job will run in an infinite loop.  This is useful for testing graceful shutdown from

spring-batch-samples/src/main/resources/simple-job-launcher-context.xml

@@ -17,7 +17,7 @@
 	<bean id="jobRegistry"
 		class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
 
-	<bean class="org.springframework.batch.test.JobLauncherTestUtils"/>
+	<bean class="org.springframework.batch.test.JobOperatorTestUtils"/>
 	<bean class="org.springframework.batch.test.context.BatchTestContextBeanPostProcessor"/>
 
 </beans>

spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2023 the original author or authors.
+ * Copyright 2007-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.
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.samples.domain.person.PersonService;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -30,14 +30,14 @@
 class DelegatingJobFunctionalTests {
 
 	@Autowired
-	private JobLauncherTestUtils jobLauncherTestUtils;
+	private JobOperatorTestUtils jobOperatorTestUtils;
 
 	@Autowired
 	private PersonService personService;
 
 	@Test
 	void testLaunchJob() throws Exception {
-		jobLauncherTestUtils.launchJob();
+		jobOperatorTestUtils.startJob();
 
 		assertTrue(personService.getReturnedCount() > 0);
 		assertEquals(personService.getReturnedCount(), personService.getReceivedCount());

spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 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.
@@ -21,7 +21,7 @@
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParametersBuilder;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -32,12 +32,12 @@
 class TaskletAdapterJobFunctionalTests {
 
 	@Autowired
-	private JobLauncherTestUtils jobLauncherTestUtils;
+	private JobOperatorTestUtils jobOperatorTestUtils;
 
 	@Test
 	void testLaunchJob() throws Exception {
-		JobExecution jobExecution = jobLauncherTestUtils
-			.launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
+		JobExecution jobExecution = jobOperatorTestUtils
+			.startJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals("yes", jobExecution.getExecutionContext().getString("done"));
 	}

spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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.
@@ -33,10 +33,10 @@
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.repository.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -70,15 +70,15 @@ class AmqpJobFunctionalTests {
 	public static RabbitMQContainer rabbitmq = new RabbitMQContainer(RABBITMQ_IMAGE);
 
 	@Autowired
-	private JobLauncherTestUtils jobLauncherTestUtils;
+	private JobOperatorTestUtils jobOperatorTestUtils;
 
 	@Autowired
 	private JobExplorer jobExplorer;
 
 	@Test
 	void testLaunchJobWithXmlConfig() throws Exception {
 		// given
-		this.jobLauncherTestUtils.launchJob();
+		this.jobOperatorTestUtils.startJob();
 
 		// when
 		int count = jobExplorer.getJobInstances("amqp-example-job", 0, 1).size();
@@ -92,11 +92,11 @@ public void testLaunchJobWithJavaConfig() throws Exception {
 		// given
 		ApplicationContext context = new AnnotationConfigApplicationContext(AmqpJobConfiguration.class,
 				AmqpConfiguration.class);
-		JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+		JobOperator jobOperator = context.getBean(JobOperator.class);
 		Job job = context.getBean(Job.class);
 
 		// when
-		jobLauncher.run(job, new JobParameters());
+		jobOperator.start(job, new JobParameters());
 
 		// then
 		JobExplorer localJobExplorer = context.getBean(JobExplorer.class);

spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 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.
@@ -20,7 +20,7 @@
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.job.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -31,12 +31,12 @@
 class BeanWrapperMapperSampleJobFunctionalTests {
 
 	@Autowired
-	private JobLauncherTestUtils jobLauncherTestUtils;
+	private JobOperatorTestUtils jobOperatorTestUtils;
 
 	@Test
 	void testJobLaunch() throws Exception {
 		// when
-		JobExecution jobExecution = this.jobLauncherTestUtils.launchJob();
+		JobExecution jobExecution = this.jobOperatorTestUtils.startJob();
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());

spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -26,7 +26,7 @@
 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.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.PropertySource;
@@ -48,7 +48,7 @@
 class RemoteChunkingJobFunctionalTests {
 
 	@Autowired
-	private JobLauncher jobLauncher;
+	private JobOperator jobOperator;
 
 	private EmbeddedActiveMQ brokerService;
 
@@ -74,7 +74,7 @@ void tearDown() throws Exception {
 	@Test
 	void testRemoteChunkingJob(@Autowired Job job) throws Exception {
 		// when
-		JobExecution jobExecution = this.jobLauncher.run(job, new JobParameters());
+		JobExecution jobExecution = this.jobOperator.start(job, new JobParameters());
 
 		// then
 		// the manager sent 2 chunks ({1, 2, 3} and {4, 5, 6}) to workers

spring-batch-samples/src/test/java/org/springframework/batch/samples/compositereader/CompositeItemReaderSampleFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-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.
@@ -28,7 +28,7 @@
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.database.JdbcBatchItemWriter;
@@ -59,11 +59,11 @@ record Person(int id, String name) {
 	void testJobLaunch() throws Exception {
 		// given
 		ApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
-		JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+		JobOperator jobOperator = context.getBean(JobOperator.class);
 		Job job = context.getBean(Job.class);
 
 		// when
-		JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+		JobExecution jobExecution = jobOperator.start(job, new JobParameters());
 
 		// then
 		Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());