Skip to content

Commit 212b80a

Browse files
committed
Merge pull request #38327 from cachescrubber
* pr/38327: Update JobLauncherApplicationRunner to use getIdentifyingParameters Closes gh-38327
2 parents 4d21760 + adb841c commit 212b80a

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Arrays;
2020
import java.util.Collection;
2121
import java.util.Collections;
22-
import java.util.HashMap;
2322
import java.util.LinkedHashMap;
2423
import java.util.Map;
2524
import java.util.Properties;
@@ -230,7 +229,8 @@ private JobParameters getNextJobParameters(Job job, JobParameters jobParameters)
230229
private JobParameters getNextJobParametersForExisting(Job job, JobParameters jobParameters) {
231230
JobExecution lastExecution = this.jobRepository.getLastJobExecution(job.getName(), jobParameters);
232231
if (isStoppedOrFailed(lastExecution) && job.isRestartable()) {
233-
JobParameters previousIdentifyingParameters = getGetIdentifying(lastExecution.getJobParameters());
232+
JobParameters previousIdentifyingParameters = new JobParameters(
233+
lastExecution.getJobParameters().getIdentifyingParameters());
234234
return merge(previousIdentifyingParameters, jobParameters);
235235
}
236236
return jobParameters;
@@ -241,16 +241,6 @@ private boolean isStoppedOrFailed(JobExecution execution) {
241241
return (status == BatchStatus.STOPPED || status == BatchStatus.FAILED);
242242
}
243243

244-
private JobParameters getGetIdentifying(JobParameters parameters) {
245-
HashMap<String, JobParameter<?>> nonIdentifying = new LinkedHashMap<>(parameters.getParameters().size());
246-
parameters.getParameters().forEach((key, value) -> {
247-
if (value.isIdentifying()) {
248-
nonIdentifying.put(key, value);
249-
}
250-
});
251-
return new JobParameters(nonIdentifying);
252-
}
253-
254244
private JobParameters merge(JobParameters parameters, JobParameters additionals) {
255245
Map<String, JobParameter<?>> merged = new LinkedHashMap<>();
256246
merged.putAll(parameters.getParameters());

0 commit comments

Comments
 (0)