Fix step execution id generation in ResourcelessJobRepository

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/ResourcelessJobRepository.java

@@ -16,7 +16,6 @@
 package org.springframework.batch.core.repository.support;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -51,6 +50,8 @@ public class ResourcelessJobRepository implements JobRepository {
 
 	private JobExecution jobExecution;
 
+	private long stepExecutionIdIncrementer = 0L;
+
 	/*
 	 * ===================================================================================
 	 * Job operations
@@ -189,6 +190,9 @@ public StepExecution getStepExecution(Long jobExecutionId, Long stepExecutionId)
 	@Override
 	@Nullable
 	public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+		if (this.jobExecution == null || !this.jobExecution.getJobInstance().getId().equals(jobInstance.getId())) {
+			return null;
+		}
 		return this.jobExecution.getStepExecutions()
 			.stream()
 			.filter(stepExecution -> stepExecution.getStepName().equals(stepName))
@@ -206,12 +210,14 @@ public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
 
 	@Override
 	public void add(StepExecution stepExecution) {
-		this.addAll(Collections.singletonList(stepExecution));
+		stepExecution.setId(this.stepExecutionIdIncrementer++);
 	}
 
 	@Override
 	public void addAll(Collection<StepExecution> stepExecutions) {
-		this.jobExecution.addStepExecutions(new ArrayList<>(stepExecutions));
+		for (StepExecution stepExecution : stepExecutions) {
+			this.add(stepExecution);
+		}
 	}
 
 	@Override

spring-batch-samples/src/main/java/org/springframework/batch/samples/helloworld/HelloWorldJobConfiguration.java

@@ -16,22 +16,17 @@
 package org.springframework.batch.samples.helloworld;
 
 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.step.Step;
 import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.batch.samples.common.DataSourceConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 @Configuration
 @EnableBatchProcessing
-@EnableJdbcJobRepository
-@Import(DataSourceConfiguration.class)
 public class HelloWorldJobConfiguration {
 
 	@Bean

spring-batch-samples/src/test/java/org/springframework/batch/samples/helloworld/HelloWorldJobFunctionalTests.java

@@ -42,6 +42,8 @@ public void testLaunchJob() throws Exception {
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		assertEquals(1, jobExecution.getStepExecutions().size());
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStepExecutions().iterator().next().getStatus());
 	}
 
 }