Update graceful shutdown sample

Author: fmbenhassine

spring-batch-samples/src/main/java/org/springframework/batch/samples/shutdown/README.md

@@ -12,6 +12,8 @@ gracefully, allowing it to complete its current processing before shutting down.
 
 ## Run the sample
 
+### 1. Start the job
+
 First, you need to start the database server of the job repository. In a terminal, run:
 
 ```
@@ -26,12 +28,16 @@ Get the process id from the first line of logs (needed for the stop):
 Process id = 73280
 ```
 
+### 2. Stop the job
+
 In a second terminal, Gracefully stop the app by running:
 
 ```
 $>kill -15 73280
 ```
 
+You can otherwise run the `org.springframework.batch.samples.shutdown.StopJobExecutionApp` class in your IDE with no arguments.
+
 You should see the shutdown hook being called:
 
 ```
@@ -50,6 +56,8 @@ $>docker exec postgres psql -U postgres -c 'select * from batch_step_execution;'
 
 Both the job and the step should have a `STOPPED` status.
 
+### 3. Restart the job
+
 Now, you can restart the job by running the `org.springframework.batch.samples.shutdown.RestartJobExecutionApp` class in your IDE.
 
 You should see that the job is restarted from the last commit point and completes successfully.

spring-batch-samples/src/main/java/org/springframework/batch/samples/shutdown/StopJobExecutionApp.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.samples.shutdown;
+
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+/**
+ * Application to stop a job execution.
+ *
+ * @author Mahmoud Ben Hassine
+ */
+public class StopJobExecutionApp {
+
+	public static void main(String[] args) throws Exception {
+		ApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
+		JobOperator jobOperator = context.getBean(JobOperator.class);
+		JobRepository jobRepository = context.getBean(JobRepository.class);
+		JobExecution jobExecution = jobRepository.getJobExecution(1);
+		jobOperator.stop(jobExecution);
+	}
+
+}

spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 the original author or authors.
+ * Copyright 2006-present 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.
@@ -16,19 +16,37 @@
 
 package org.springframework.batch.samples.restart.stop;
 
+import java.util.List;
+
+import javax.sql.DataSource;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.job.parameters.JobParameters;
-import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.batch.core.launch.JobOperator;
-import org.springframework.batch.test.JobOperatorTestUtils;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.builder.ChunkOrientedStepBuilder;
+import org.springframework.batch.infrastructure.item.support.ListItemReader;
+import org.springframework.batch.infrastructure.item.support.ListItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.jdbc.support.JdbcTransactionManager;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -44,26 +62,15 @@
  * @author Mahmoud Ben Hassine
  *
  */
-@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml" })
-@Disabled
-// FIXME passes in the IDE but not on the CLI - needs investigation
+@ExtendWith(SpringExtension.class)
 class GracefulShutdownFunctionalTests {
 
 	/** Logger */
 	private final Log logger = LogFactory.getLog(getClass());
 
-	@Autowired
-	private JobOperatorTestUtils jobOperatorTestUtils;
-
-	@Autowired
-	private JobOperator jobOperator;
-
 	@Test
-	void testLaunchJob() throws Exception {
-		final JobParameters jobParameters = new JobParametersBuilder().addLong("timestamp", System.currentTimeMillis())
-			.toJobParameters();
-
-		JobExecution jobExecution = jobOperatorTestUtils.startJob(jobParameters);
+	void testStopJob(@Autowired Job job, @Autowired JobOperator jobOperator) throws Exception {
+		JobExecution jobExecution = jobOperator.start(job, new JobParameters());
 
 		Thread.sleep(1000);
 
@@ -83,4 +90,51 @@ void testLaunchJob() throws Exception {
 		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 	}
 
+	@Configuration
+	@EnableBatchProcessing(taskExecutorRef = "batchTaskExecutor")
+	@EnableJdbcJobRepository
+	static class JobConfiguration {
+
+		@Bean
+		public Job job(JobRepository jobRepository, Step step) {
+			return new JobBuilder(jobRepository).start(step).build();
+		}
+
+		@Bean
+		public Step chunkOrientedStep(JobRepository jobRepository, JdbcTransactionManager transactionManager) {
+			return new ChunkOrientedStepBuilder<String, String>(jobRepository, 2)
+				.reader(new ListItemReader<>(List.of("item1", "item2", "item3", "item4", "item5")))
+				.processor(item -> {
+					// Simulate processing time
+					Thread.sleep(500);
+					return item.toUpperCase();
+				})
+				.writer(new ListItemWriter<>())
+				.transactionManager(transactionManager)
+				.build();
+		}
+
+		@Bean
+		public DataSource dataSource() {
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
+				.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
+				.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
+				.generateUniqueName(true)
+				.build();
+		}
+
+		@Bean
+		public JdbcTransactionManager transactionManager(DataSource dataSource) {
+			return new JdbcTransactionManager(dataSource);
+		}
+
+		@Bean
+		public AsyncTaskExecutor batchTaskExecutor() {
+			SimpleAsyncTaskExecutor asyncTaskExecutor = new SimpleAsyncTaskExecutor("batch-executor");
+			asyncTaskExecutor.setConcurrencyLimit(1);
+			return asyncTaskExecutor;
+		}
+
+	}
+
 }