GH 4755: Fix RecordFieldSetMapper for empty record

commit 3b4322b
Author: Seungyong Hong <[email protected]>
Date:   Sat Aug 16 15:37:35 2025 +0900

    Fix RecordFieldSetMapper for empty record

    - Update test casese.

    Signed-off-by: Seungyong Hong <[email protected]>

commit dde6cbe
Author: Seungyong Hong <[email protected]>
Date:   Sat Aug 16 14:44:25 2025 +0900

    Fix RecordFieldSetMapper for empty record

    - formatting.

    Signed-off-by: Seungyong Hong <[email protected]>

commit 0ce9de6
Author: Seungyong Hong <[email protected]>
Date:   Fri Aug 15 23:04:26 2025 +0900

    Fix wrong behavior of JobRepository with empty identifying job parameters

    - simplify brackets.

    Signed-off-by: Seungyong Hong <[email protected]>

commit 45efc57
Author: Seungyong Hong <[email protected]>
Date:   Fri Aug 15 20:43:39 2025 +0900

    Fix wrong behavior of JobRepository with empty identifying job parameters

    - Job has to be not completed whether empty identifying job parameters or not.

    Signed-off-by: Seungyong Hong <[email protected]>

Author: isanghaessi

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

@@ -54,6 +54,7 @@
  * @author Baris Cubukcuoglu
  * @author Parikshit Dutta
  * @author Mark John Moreno
+ * @author Seungyong Hong
  * @see JobRepository
  * @see JobInstanceDao
  * @see JobExecutionDao
@@ -109,10 +110,9 @@ public JobExecution createJobExecution(String jobName, JobParameters jobParamete
 							+ "The last execution ended with a failure that could not be rolled back, "
 							+ "so it may be dangerous to proceed. Manual intervention is probably necessary.");
 				}
-				JobParameters allJobParameters = execution.getJobParameters();
-				JobParameters identifyingJobParameters = new JobParameters(allJobParameters.getIdentifyingParameters());
-				if (!identifyingJobParameters.isEmpty()
-						&& (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED)) {
+				if (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED) {
+					JobParameters identifyingJobParameters = new JobParameters(
+							execution.getJobParameters().getIdentifyingParameters());
 					throw new JobInstanceAlreadyCompleteException(
 							"A job instance already exists and is complete for identifying parameters="
 									+ identifyingJobParameters + ".  If you want to run this job again, "

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.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.
@@ -25,7 +25,7 @@
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
-import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +35,7 @@
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
- *
+ * @author Seungyong Hong
  */
 @SpringJUnitConfig
 class JobStepParserTests {
@@ -54,7 +54,8 @@ class JobStepParserTests {
 	@Test
 	void testFlowStep() throws Exception {
 		assertNotNull(job1);
-		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters());
+		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(),
+				new JobParametersBuilder().addString("name", "foo").toJobParameters());
 		job1.execute(jobExecution);
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		List<String> stepNames = getStepNames(jobExecution);
@@ -65,7 +66,8 @@ void testFlowStep() throws Exception {
 	@Test
 	void testFlowExternalStep() throws Exception {
 		assertNotNull(job2);
-		JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(), new JobParameters());
+		JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(),
+				new JobParametersBuilder().addString("name", "bar").toJobParameters());
 		job2.execute(jobExecution);
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		List<String> stepNames = getStepNames(jobExecution);

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

@@ -38,6 +38,7 @@
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
 import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.observability.BatchJobObservation;
@@ -49,12 +50,7 @@
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.support.JdbcTransactionManager;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -64,6 +60,7 @@
  * @author Will Schipp
  * @author Mahmoud Ben Hassine
  * @author Jinwoo Bae
+ * @author Seungyong Hong
  */
 class SimpleJobTests {
 
@@ -343,11 +340,9 @@ void testStepAlreadyComplete() throws Exception {
 		jobExecution.setEndTime(LocalDateTime.now());
 		jobExecution.setStatus(BatchStatus.COMPLETED);
 		jobRepository.update(jobExecution);
-		jobExecution = jobRepository.createJobExecution(job.getName(), jobParameters);
-		job.execute(jobExecution);
-		assertEquals(0, jobExecution.getFailureExceptions().size());
-		assertEquals(1, jobExecution.getStepExecutions().size());
-		assertEquals(stepExecution2.getStepName(), jobExecution.getStepExecutions().iterator().next().getStepName());
+		assertThrows(JobInstanceAlreadyCompleteException.class, () -> {
+			jobExecution = jobRepository.createJobExecution(job.getName(), jobParameters);
+		});
 	}
 
 	@Test

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java

@@ -46,6 +46,7 @@
  * @author Robert Kasanicky
  * @author Dimitrios Liapis
  * @author Mahmoud Ben Hassine
+ * @author Seungyong Hong
  */
 @SpringJUnitConfig(locations = "/org/springframework/batch/core/repository/dao/jdbc/sql-dao-test.xml")
 class SimpleJobRepositoryIntegrationTests {
@@ -100,7 +101,7 @@ void testCreateAndFindWithNoStartDate() throws Exception {
 		LocalDateTime now = LocalDateTime.now();
 		firstExecution.setStartTime(now);
 		firstExecution.setEndTime(now.plus(1, ChronoUnit.SECONDS));
-		firstExecution.setStatus(BatchStatus.COMPLETED);
+		firstExecution.setStatus(BatchStatus.STOPPED);
 		jobRepository.update(firstExecution);
 		JobExecution secondExecution = jobRepository.createJobExecution(job.getName(), jobParameters);
 
@@ -203,18 +204,23 @@ void testGetLastJobExecution() throws Exception {
 	}
 
 	/*
-	 * Create two job executions for the same job+parameters tuple. Should ignore
-	 * non-identifying job parameters when identifying the job instance.
+	 * Create two job executions for the same identifying job+parameters tuple. Should
+	 * ignore non-identifying job parameters when identifying the job instance.
 	 */
 	@Transactional
 	@Test
 	void testReExecuteWithSameJobParameters() throws Exception {
-		JobParameters jobParameters = new JobParametersBuilder().addString("name", "foo", false).toJobParameters();
-		JobExecution jobExecution1 = jobRepository.createJobExecution(job.getName(), jobParameters);
+		JobParameters jobParameters1 = new JobParametersBuilder().addString("name", "foo", true)
+			.addString("age", "13", false)
+			.toJobParameters();
+		JobExecution jobExecution1 = jobRepository.createJobExecution(job.getName(), jobParameters1);
 		jobExecution1.setStatus(BatchStatus.COMPLETED);
 		jobExecution1.setEndTime(LocalDateTime.now());
 		jobRepository.update(jobExecution1);
-		JobExecution jobExecution2 = jobRepository.createJobExecution(job.getName(), jobParameters);
+		JobParameters jobParameters2 = new JobParametersBuilder().addString("name", "bar", true)
+			.addString("age", "13", false)
+			.toJobParameters();
+		JobExecution jobExecution2 = jobRepository.createJobExecution(job.getName(), jobParameters2);
 		assertNotNull(jobExecution1);
 		assertNotNull(jobExecution2);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 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.
@@ -33,6 +33,8 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.JobInstance;
@@ -61,6 +63,7 @@
  * @author Baris Cubukcuoglu
  * @author Mahmoud Ben Hassine
  * @author Parikshit Dutta
+ * @author Seungyong Hong
  *
  */
 class SimpleJobRepositoryTests {
@@ -103,7 +106,7 @@ void setUp() {
 
 		jobRepository = new SimpleJobRepository(jobInstanceDao, jobExecutionDao, stepExecutionDao, ecDao);
 
-		jobParameters = new JobParametersBuilder().addString("bar", "test").toJobParameters();
+		jobParameters = new JobParametersBuilder().addString("bar", "test", false).toJobParameters();
 
 		job = new JobSupport();
 		job.setBeanName("RepositoryTest");
@@ -289,9 +292,10 @@ void testCreateJobExecutionStatusUnknown() {
 		assertThrows(JobRestartException.class, () -> jobRepository.createJobExecution("foo", new JobParameters()));
 	}
 
-	@Test
-	void testCreateJobExecutionAlreadyComplete() {
-		jobExecution.setStatus(BatchStatus.COMPLETED);
+	@ParameterizedTest
+	@EnumSource(mode = EnumSource.Mode.INCLUDE, names = { "COMPLETED", "ABANDONED" })
+	void testCreateJobExecutionAlreadyComplete(BatchStatus batchStatus) {
+		jobExecution.setStatus(batchStatus);
 		jobExecution.setEndTime(LocalDateTime.now());
 
 		when(jobInstanceDao.getJobInstance("foo", new JobParameters())).thenReturn(jobInstance);

spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 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.
@@ -39,6 +39,7 @@
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author Seungyong Hong
  *
  */
 @SpringJUnitConfig(locations = "/simple-job-launcher-context.xml")
@@ -81,12 +82,14 @@ void testCreateJobExecutions() throws Exception {
 	void testRemoveJobExecutionsWithSameJobInstance() throws Exception {
 		utils = new JobRepositoryTestUtils(jobRepository);
 		List<JobExecution> list = new ArrayList<>();
-		JobExecution jobExecution = jobRepository.createJobExecution("job", new JobParameters());
+		JobExecution jobExecution = jobRepository.createJobExecution("job",
+				new JobParametersBuilder().addString("name", "foo").toJobParameters());
 		jobExecution.setEndTime(LocalDateTime.now());
 		jobExecution.setStatus(BatchStatus.COMPLETED);
 		list.add(jobExecution);
 		jobRepository.update(jobExecution);
-		jobExecution = jobRepository.createJobExecution("job", new JobParameters());
+		jobExecution = jobRepository.createJobExecution("job",
+				new JobParametersBuilder().addString("name", "bar").toJobParameters());
 		list.add(jobExecution);
 		assertEquals(beforeJobs + 2, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
 		utils.removeJobExecutions(list);