Commit 250bfff

committed

GH-4755: Fix RecordFieldSetMapper for empty record

commit dde6cbe Author: Seungyong Hong <jesse1231@naver.com> Date: Sat Aug 16 14:44:25 2025 +0900 Fix RecordFieldSetMapper for empty record - formatting. Signed-off-by: Seungyong Hong <jesse1231@naver.com> commit 0ce9de6 Author: Seungyong Hong <jesse1231@naver.com> 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 <jesse1231@naver.com> commit 45efc57 Author: Seungyong Hong <jesse1231@naver.com> 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 <jesse1231@naver.com>

1 parent 3bcc525 commit 250bfffCopy full SHA for 250bfff

File tree

2 files changed

+13

-9

lines changed

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

2 files changed

+13

-9

lines changed

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

Lines changed: 4 additions & 4 deletions

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

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

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2023 the original author or authors.`
	`2`	`+ * Copyright 2006-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -33,6 +33,8 @@`
`33`	`33`
`34`	`34`	`import org.junit.jupiter.api.BeforeEach;`
`35`	`35`	`import org.junit.jupiter.api.Test;`
	`36`	`+import org.junit.jupiter.params.ParameterizedTest;`
	`37`	`+import org.junit.jupiter.params.provider.EnumSource;`
`36`	`38`	`import org.springframework.batch.core.BatchStatus;`
`37`	`39`	`import org.springframework.batch.core.job.JobExecution;`
`38`	`40`	`import org.springframework.batch.core.job.JobInstance;`
`@@ -61,6 +63,7 @@`
`61`	`63`	`* @author Baris Cubukcuoglu`
`62`	`64`	`* @author Mahmoud Ben Hassine`
`63`	`65`	`* @author Parikshit Dutta`
	`66`	`+ * @author Seungyong Hong`
`64`	`67`	`*`
`65`	`68`	`*/`
`66`	`69`	`class SimpleJobRepositoryTests {`
`@@ -103,7 +106,7 @@ void setUp() {`
`103`	`106`
`104`	`107`	`jobRepository = new SimpleJobRepository(jobInstanceDao, jobExecutionDao, stepExecutionDao, ecDao);`
`105`	`108`
`106`		`- jobParameters = new JobParametersBuilder().addString("bar", "test").toJobParameters();`
	`109`	`+ jobParameters = new JobParametersBuilder().addString("bar", "test", false).toJobParameters();`
`107`	`110`
`108`	`111`	`job = new JobSupport();`
`109`	`112`	`job.setBeanName("RepositoryTest");`
`@@ -289,9 +292,10 @@ void testCreateJobExecutionStatusUnknown() {`
`289`	`292`	`assertThrows(JobRestartException.class, () -> jobRepository.createJobExecution("foo", new JobParameters()));`
`290`	`293`	`}`
`291`	`294`
`292`		`- @Test`
`293`		`- void testCreateJobExecutionAlreadyComplete() {`
`294`		`- jobExecution.setStatus(BatchStatus.COMPLETED);`
	`295`	`+ @ParameterizedTest`
	`296`	`+ @EnumSource(mode = EnumSource.Mode.INCLUDE, names = { "COMPLETED", "ABANDONED" })`
	`297`	`+ void testCreateJobExecutionAlreadyComplete(BatchStatus batchStatus) {`
	`298`	`+ jobExecution.setStatus(batchStatus);`
`295`	`299`	`jobExecution.setEndTime(LocalDateTime.now());`
`296`	`300`
`297`	`301`	`when(jobInstanceDao.getJobInstance("foo", new JobParameters())).thenReturn(jobInstance);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 250bfff

File tree

2 files changed

2 files changed

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

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

0 commit comments