Add StepExecution parameter to StoppableTasklet.stop

Resolves #4703

Author: HyunSangHan

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

@@ -82,6 +82,7 @@
  * @author Mahmoud Ben Hassine
  * @author Andrey Litvitski
  * @author Yejeong Ham
+ * @author Hyunsang Han
  * @since 2.0
  * @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for
  * removal in 6.2 or later.
@@ -348,7 +349,7 @@ public boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningExce
 								Tasklet tasklet = taskletStep.getTasklet();
 								if (tasklet instanceof StoppableTasklet stoppableTasklet) {
 									StepSynchronizationManager.register(stepExecution);
-									stoppableTasklet.stop();
+									stoppableTasklet.stop(stepExecution);
 									StepSynchronizationManager.release();
 								}
 							}
@@ -366,7 +367,7 @@ public boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningExce
 			}
 		}
 		catch (NoSuchJobException e) {
-			logger.warn("Cannot find Job object in the job registry. StoppableTasklet#stop() will not be called", e);
+			logger.warn("Cannot find Job object in the job registry. StoppableTasklet#stop(StepExecution stepExecution) will not be called", e);
 		}
 
 		return true;

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/StoppableTasklet.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.batch.core.step.tasklet;
 
+import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.step.StepContribution;
 
@@ -29,6 +30,7 @@
  * so the appropriate thread safety and visibility controls should be put in place.
  *
  * @author Will Schipp
+ * @author Hyunsang Han
  * @since 3.0
  */
 public interface StoppableTasklet extends Tasklet {
@@ -39,4 +41,14 @@ public interface StoppableTasklet extends Tasklet {
 	 */
 	void stop();
 
+	/**
+	 * Used to signal that the job should stop, providing access to the current
+	 * {@link StepExecution} context.
+	 *
+	 * @param stepExecution the current {@link StepExecution} context in which the job
+	 * is being executed
+	 */
+	default void stop(StepExecution stepExecution) {
+		stop();
+	}
 }

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java

@@ -61,6 +61,7 @@
  * @author Will Schipp
  * @author Mahmoud Ben Hassine
  * @author Injae Kim
+ * @author Hyunsang Han
  */
 public class SystemCommandTasklet implements StepExecutionListener, StoppableTasklet, InitializingBean {
 
@@ -275,4 +276,21 @@ public void stop() {
 		stopped = true;
 	}
 
+	/**
+	 * Interrupts the execution of the system command if the given {@link StepExecution}
+	 * matches the current execution context. This method allows for granular control over
+	 * stopping specific step executions, ensuring that only the intended command is halted.
+	 *
+	 * @param stepExecution the current {@link StepExecution} context; the execution is
+	 * interrupted if it matches the ongoing one.
+	 * @since 6.0
+	 * @see StoppableTasklet#stop(StepExecution)
+	 */
+	@Override
+	public void stop(StepExecution stepExecution) {
+		if (stepExecution.equals(execution)) {
+			stopped = true;
+		}
+	}
+
 }