From 3385a19cb4ebc518652a1aa05d0cd306487feb47 Mon Sep 17 00:00:00 2001
From: Taeik Lim <sibera21@gmail.com>
Date: Fri, 18 Nov 2022 04:41:23 +0900
Subject: [PATCH] Change StepBuilderHelper#enhance parameter type to
 AbstractStep

Issue #4220
---
 .../builder/AbstractTaskletStepBuilder.java   |  6 +--
 .../core/step/builder/StepBuilderHelper.java  | 50 ++++++++-----------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
index fb18a1f76..898e63ffe 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
@@ -21,12 +21,12 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.annotation.AfterChunk;
 import org.springframework.batch.core.annotation.AfterChunkError;
 import org.springframework.batch.core.annotation.BeforeChunk;
 import org.springframework.batch.core.listener.StepListenerFactoryBean;
+import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.item.ItemStream;
@@ -78,8 +78,8 @@ public abstract class AbstractTaskletStepBuilder<B extends AbstractTaskletStepBu
 
 	/**
 	 * Build the step from the components collected by the fluent setters. Delegates first
-	 * to {@link #enhance(Step)} and then to {@link #createTasklet()} in subclasses to
-	 * create the actual tasklet.
+	 * to {@link #enhance(AbstractStep)} and then to {@link #createTasklet()} in
+	 * subclasses to create the actual tasklet.
 	 * @return a tasklet step fully configured and ready to execute
 	 */
 	public TaskletStep build() {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
index 3b0a3bba7..6a1ffaa84 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
@@ -42,6 +42,7 @@ import org.springframework.batch.support.ReflectionUtils;
  *
  * @author Dave Syer
  * @author Michael Minella
+ * @author Taeik Lim
  * @author Mahmoud Ben Hassine
  * @since 2.2
  */
@@ -128,37 +129,30 @@ public abstract class StepBuilderHelper<B extends StepBuilderHelper<B>> {
 		return properties.allowStartIfComplete != null ? properties.allowStartIfComplete : false;
 	}
 
-	protected void enhance(Step target) {
-
-		if (target instanceof AbstractStep) {
-
-			AbstractStep step = (AbstractStep) target;
-			step.setJobRepository(properties.getJobRepository());
-
-			ObservationRegistry observationRegistry = properties.getObservationRegistry();
-			if (observationRegistry != null) {
-				step.setObservationRegistry(observationRegistry);
-			}
-
-			MeterRegistry meterRegistry = properties.getMeterRegistry();
-			if (meterRegistry != null) {
-				step.setMeterRegistry(meterRegistry);
-			}
-
-			Boolean allowStartIfComplete = properties.allowStartIfComplete;
-			if (allowStartIfComplete != null) {
-				step.setAllowStartIfComplete(allowStartIfComplete);
-			}
-
-			step.setStartLimit(properties.startLimit);
-
-			List<StepExecutionListener> listeners = properties.stepExecutionListeners;
-			if (!listeners.isEmpty()) {
-				step.setStepExecutionListeners(listeners.toArray(new StepExecutionListener[0]));
-			}
+	protected void enhance(AbstractStep step) {
+		step.setJobRepository(properties.getJobRepository());
 
+		ObservationRegistry observationRegistry = properties.getObservationRegistry();
+		if (observationRegistry != null) {
+			step.setObservationRegistry(observationRegistry);
 		}
 
+		MeterRegistry meterRegistry = properties.getMeterRegistry();
+		if (meterRegistry != null) {
+			step.setMeterRegistry(meterRegistry);
+		}
+
+		Boolean allowStartIfComplete = properties.allowStartIfComplete;
+		if (allowStartIfComplete != null) {
+			step.setAllowStartIfComplete(allowStartIfComplete);
+		}
+
+		step.setStartLimit(properties.startLimit);
+
+		List<StepExecutionListener> listeners = properties.stepExecutionListeners;
+		if (!listeners.isEmpty()) {
+			step.setStepExecutionListeners(listeners.toArray(new StepExecutionListener[0]));
+		}
 	}
 
 	public static class CommonStepProperties {