From 604c408fc40d4e32f42499a877ba3f4ead84232b Mon Sep 17 00:00:00 2001 From: Marten Deinum Date: Thu, 12 Oct 2017 11:17:46 +0200 Subject: [PATCH] Polish JobLauncherCommandLineRunner The JobLauncherCommandLineRunner reassigned method arguments inside the merge method. Instead of reassigning the method argument just return the new instance directly. Also some minor cleanup (unnesseccary null check and continue keyword). --- .../batch/JobLauncherCommandLineRunner.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java index a0ce64156261..3913b010e770 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -180,8 +180,7 @@ private JobParameters merge(JobParameters parameters, Map merged = new HashMap<>(); merged.putAll(parameters.getParameters()); merged.putAll(additionals); - parameters = new JobParameters(merged); - return parameters; + return new JobParameters(merged); } private void executeRegisteredJobs(JobParameters jobParameters) @@ -198,7 +197,6 @@ private void executeRegisteredJobs(JobParameters jobParameters) } catch (NoSuchJobException ex) { logger.debug("No job found in registry for job name: " + jobName); - continue; } } } @@ -209,11 +207,9 @@ protected void execute(Job job, JobParameters jobParameters) JobInstanceAlreadyCompleteException, JobParametersInvalidException, JobParametersNotFoundException { JobParameters nextParameters = getNextJobParameters(job, jobParameters); - if (nextParameters != null) { - JobExecution execution = this.jobLauncher.run(job, nextParameters); - if (this.publisher != null) { - this.publisher.publishEvent(new JobExecutionEvent(execution)); - } + JobExecution execution = this.jobLauncher.run(job, nextParameters); + if (this.publisher != null) { + this.publisher.publishEvent(new JobExecutionEvent(execution)); } }