Refine contribution #4715

- Deprecate stop method
- Fix imports
- Update Javadocs

Author: fmbenhassine

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

@@ -367,7 +367,9 @@ public boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningExce
 			}
 		}
 		catch (NoSuchJobException e) {
-			logger.warn("Cannot find Job object in the job registry. StoppableTasklet#stop(StepExecution stepExecution) 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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.
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.step.tasklet;
 
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.step.StepContribution;
 
@@ -38,17 +38,20 @@ public interface StoppableTasklet extends Tasklet {
 	/**
 	 * Used to signal that the job this {@link Tasklet} is executing within has been
 	 * requested to stop.
+	 * @deprecated Since 6.0, use {@link #stop(StepExecution)} instead.
 	 */
+	@Deprecated(since = "6.0", forRemoval = true)
 	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
+	 * @param stepExecution the current {@link StepExecution} context in which the job is
+	 * being executed
+	 * @since 6.0
 	 */
 	default void stop(StepExecution stepExecution) {
 		stop();
 	}
+
 }

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

@@ -279,17 +279,21 @@ public void stop() {
 	/**
 	 * 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.
-	 *
+	 * stopping specific step executions, ensuring that only the intended command is
+	 * halted.
+	 * <p>
+	 * This method will interrupt the thread executing the system command only if
+	 * {@link #setInterruptOnCancel(boolean)} has been set to true. Otherwise, the
+	 * underlying command will be allowed to finish before the tasklet ends.
 	 * @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;
+		if (stepExecution.equals(this.execution)) {
+			this.stopped = true;
 		}
 	}