Commit f7a36ff

authored

Merge pull request #1 from isanghaessi/_GH-4755

Fix wrong behavior of JobRepository with empty identifying job parameters

2 parents 3bcc525 + 0ce9de6 commit f7a36ffCopy full SHA for f7a36ff

File tree

2 files changed

+12

-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

+12

-9

lines changed

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

Lines changed: 3 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,8 @@ 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(execution.getJobParameters().getIdentifyingParameters());`
`116`	`115`	`throw new JobInstanceAlreadyCompleteException(`
`117`	`116`	`"A job instance already exists and is complete for identifying parameters="`
`118`	`117`	`+ 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 f7a36ff

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