Fix incorrect default constructor in AbstractStep

This commit makes it impossible to instantiate
AbstractStep without providing a job repository.

Resolves #4984

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2012 the original author or authors.
+ * Copyright 2009-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.
@@ -32,17 +32,20 @@
  * parent and one each for the flow steps).
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class FlowStep extends AbstractStep {
 
 	private Flow flow;
 
 	/**
-	 * Default constructor convenient for configuration purposes.
+	 * Create a new instance of a {@link FlowStep} with the given job repository.
+	 * @param jobRepository the job repository to use. Must not be null.
+	 * @since 6.0
 	 */
-	public FlowStep() {
-		super(null);
+	public FlowStep(JobRepository jobRepository) {
+		super(jobRepository);
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java

@@ -20,6 +20,7 @@
 import org.springframework.batch.core.job.JobExecutionException;
 import org.springframework.batch.core.observability.jfr.events.step.partition.PartitionAggregateEvent;
 import org.springframework.batch.core.observability.jfr.events.step.partition.PartitionSplitEvent;
+import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.partition.support.DefaultStepExecutionAggregator;
@@ -45,6 +46,15 @@ public class PartitionStep extends AbstractStep {
 
 	private StepExecutionAggregator stepExecutionAggregator = new DefaultStepExecutionAggregator();
 
+	/**
+	 * Create a new instance of a {@link PartitionStep} with the given job repository.
+	 * @param jobRepository the job repository to use. Must not be null.
+	 * @since 6.0
+	 */
+	public PartitionStep(JobRepository jobRepository) {
+		super(jobRepository);
+	}
+
 	/**
 	 * A {@link PartitionHandler} which can send out step executions for remote processing
 	 * and bring back the results.

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

@@ -76,10 +76,33 @@ public abstract class AbstractStep implements StoppableStep, InitializingBean, B
 	protected ObservationRegistry observationRegistry;
 
 	/**
-	 * Default constructor.
+	 * Create a new {@link AbstractStep}.
+	 * @deprecated since 6.0 for removal in 7.0. Use {@link #AbstractStep(JobRepository)}
+	 * instead.
 	 */
+	@Deprecated(since = "6.0", forRemoval = true)
 	public AbstractStep() {
-		super();
+	}
+
+	/**
+	 * Create a new {@link AbstractStep}.
+	 * @deprecated since 6.0 for removal in 7.0. Use {@link #AbstractStep(JobRepository)}
+	 * instead.
+	 */
+	@Deprecated(since = "6.0", forRemoval = true)
+	public AbstractStep(String name) {
+		Assert.notNull(name, "Step name must not be null");
+		this.name = name;
+	}
+
+	/**
+	 * Create a new {@link AbstractStep} with the given job repository.
+	 * @param jobRepository the job repository. Must not be null.
+	 * @since 6.0
+	 */
+	public AbstractStep(JobRepository jobRepository) {
+		Assert.notNull(jobRepository, "JobRepository must not be null");
+		this.jobRepository = jobRepository;
 	}
 
 	@Override
@@ -149,14 +172,6 @@ public void setAllowStartIfComplete(boolean allowStartIfComplete) {
 		this.allowStartIfComplete = allowStartIfComplete;
 	}
 
-	/**
-	 * Convenient constructor for setting only the name property.
-	 * @param name Name of the step
-	 */
-	public AbstractStep(String name) {
-		this.name = name;
-	}
-
 	/**
 	 * Extension point for subclasses to execute business logic. Subclasses should set the
 	 * {@link ExitStatus} on the {@link StepExecution} before returning.

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FlowStepBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 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.
@@ -24,6 +24,7 @@
  * nested flow composed of other steps.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.2
  */
 public class FlowStepBuilder extends StepBuilderHelper<FlowStepBuilder> {
@@ -56,7 +57,7 @@ public FlowStepBuilder flow(Flow flow) {
 	 * @return a flow step
 	 */
 	public Step build() {
-		FlowStep step = new FlowStep();
+		FlowStep step = new FlowStep(getJobRepository());
 		step.setName(getName());
 		step.setFlow(flow);
 		super.enhance(step);

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java

@@ -28,6 +28,7 @@
  * with parameters taken from the parent job or from the step execution.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.2
  */
 public class JobStepBuilder extends StepBuilderHelper<JobStepBuilder> {
@@ -84,7 +85,7 @@ public JobStepBuilder parametersExtractor(JobParametersExtractor jobParametersEx
 	 */
 	public Step build() {
 
-		JobStep step = new JobStep();
+		JobStep step = new JobStep(getJobRepository());
 		step.setName(getName());
 		super.enhance(step);
 		if (job != null) {

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 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.
@@ -159,7 +159,7 @@ public PartitionStepBuilder aggregator(StepExecutionAggregator aggregator) {
 	}
 
 	public Step build() {
-		PartitionStep step = new PartitionStep();
+		PartitionStep step = new PartitionStep(getJobRepository());
 		step.setName(getName());
 		super.enhance(step);
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedStep.java

@@ -162,11 +162,11 @@ public class ChunkOrientedStep<I, O> extends AbstractStep {
 	 */
 	public ChunkOrientedStep(String name, int chunkSize, ItemReader<I> itemReader, ItemWriter<O> itemWriter,
 			JobRepository jobRepository) {
-		super(name);
+		super(jobRepository);
 		this.chunkSize = chunkSize;
 		this.itemReader = itemReader;
 		this.itemWriter = itemWriter;
-		setJobRepository(jobRepository);
+		setName(name);
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008 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,6 +21,7 @@
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.UnexpectedJobExecutionException;
@@ -36,6 +37,7 @@
  * worker in a parallel or partitioned execution.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class JobStep extends AbstractStep {
@@ -51,6 +53,15 @@ public class JobStep extends AbstractStep {
 
 	private JobParametersExtractor jobParametersExtractor = new DefaultJobParametersExtractor();
 
+	/**
+	 * Create a new instance of a {@link JobStep} with the given job repository.
+	 * @param jobRepository the job repository to use. Must not be null.
+	 * @since 6.0
+	 */
+	public JobStep(JobRepository jobRepository) {
+		super(jobRepository);
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		super.afterPropertiesSet();

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

@@ -103,18 +103,34 @@ public boolean rollbackOn(Throwable ex) {
 
 	/**
 	 * Default constructor.
+	 * @deprecated since 6.0 for removal in 7.0. Use {@link #TaskletStep(JobRepository)}
+	 * instead.
 	 */
+	@Deprecated(since = "6.0", forRemoval = true)
 	public TaskletStep() {
-		this(null);
+		super();
 	}
 
 	/**
+	 * Create a new instance with the given name.
+	 * @deprecated since 6.0 for removal in 7.0. Use {@link #TaskletStep(JobRepository)}
+	 * instead.
 	 * @param name the name for the {@link TaskletStep}
 	 */
+	@Deprecated(since = "6.0", forRemoval = true)
 	public TaskletStep(String name) {
 		super(name);
 	}
 
+	/**
+	 * Create a new instance with the given name and job repository.
+	 * @param jobRepository the job repository to use. Must not be null.
+	 * @since 6.0
+	 */
+	public TaskletStep(JobRepository jobRepository) {
+		super(jobRepository);
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		super.afterPropertiesSet();

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java

@@ -33,7 +33,6 @@
 import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler;
 import org.springframework.batch.core.step.JobRepositorySupport;
 import org.springframework.batch.core.step.StepSupport;
-import org.springframework.batch.core.step.builder.StepBuilderException;
 import org.springframework.batch.core.step.item.ChunkOrientedTasklet;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.item.ItemStream;
@@ -63,7 +62,7 @@ class StepParserStepFactoryBeanTests {
 	@Test
 	void testNothingSet() {
 		StepParserStepFactoryBean<Object, Object> fb = new StepParserStepFactoryBean<>();
-		assertThrows(StepBuilderException.class, fb::getObject);
+		assertThrows(IllegalArgumentException.class, fb::getObject);
 	}
 
 	@Test
@@ -98,7 +97,7 @@ void testSkipLimitSet() {
 		StepParserStepFactoryBean<Object, Object> fb = new StepParserStepFactoryBean<>();
 		fb.setName("step");
 		fb.setSkipLimit(5);
-		assertThrows(StepBuilderException.class, fb::getObject);
+		assertThrows(IllegalArgumentException.class, fb::getObject);
 	}
 
 	@Test