Assert that a step execution has an id before execution

Author: fmbenhassine

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

@@ -201,6 +201,8 @@ public final void execute(StepExecution stepExecution)
 			throws JobInterruptedException, UnexpectedJobExecutionException {
 
 		Assert.notNull(stepExecution, "stepExecution must not be null");
+		Assert.state(stepExecution.getId() != null,
+				"StepExecution has no id. It must be saved before it can be executed.");
 		stepExecution.getExecutionContext().put(SpringBatchVersion.BATCH_VERSION_KEY, SpringBatchVersion.getVersion());
 
 		if (logger.isDebugEnabled()) {

spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java

@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 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.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -77,6 +78,7 @@ void testBatchVersionInExecutionContext() throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	static class TestConfiguration {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java

@@ -98,6 +98,7 @@ private void testJob(String jobName, BatchStatus status, int stepExecutionCount,
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	@Import(DataSourceConfiguration.class)
 	public static class TestConfiguration {
 
@@ -165,6 +166,7 @@ protected Step step3(JobRepository jobRepository) throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	@Import(DataSourceConfiguration.class)
 	public static class BeansConfigurer {
 

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java

@@ -86,7 +86,7 @@ void testDefaultInfrastructureBeansRegistration() {
 	}
 
 	@Configuration
-	static class MyJobConfiguration extends DefaultBatchConfiguration {
+	static class MyJobConfiguration extends JdbcDefaultBatchConfiguration {
 
 		@Bean
 		public Step myStep(JobRepository jobRepository, PlatformTransactionManager transactionManager) {

spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.JobInterruptedException;
@@ -390,6 +391,7 @@ void testBuildWithJobScopedStep() throws Exception {
 
 	@EnableBatchProcessing
 	@Configuration
+	@EnableJdbcJobRepository
 	static class JobConfiguration {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java

@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.listener.JobExecutionListener;
@@ -67,6 +68,7 @@ void testListeners() throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	static class MyJobConfiguration {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -127,6 +128,7 @@ void testOnProcessError() throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	public static class BatchConfiguration {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java

@@ -30,6 +30,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -248,6 +249,7 @@ void testBatchMetrics() throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	static class MyJobConfiguration {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/observability/ObservabilitySampleStepTests.java

@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -110,6 +111,7 @@ public SampleTestRunnerConsumer yourCode() {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableBatchProcessing
+	@EnableJdbcJobRepository
 	static class TestConfig {
 
 		@Bean

spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java

@@ -38,7 +38,7 @@ class AbstractStepTests {
 	void testEndTimeInListener() throws Exception {
 		// given
 		StepExecution execution = new StepExecution("step",
-				new JobExecution(new JobInstance(1L, "job"), new JobParameters()));
+				new JobExecution(new JobInstance(1L, "job"), 0L, new JobParameters()), 0L);
 		AbstractStep tested = new AbstractStep() {
 			@Override
 			protected void doExecute(StepExecution stepExecution) {