Skip to content

JobLauncherApplicationRunner returns a success exit code even when no jobs have been run #36060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

JobLauncherApplicationRunner returns a success exit code even when no jobs have been run #36060

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c725b3
refactor: #35940 Refactor exception handling
itsAkshayDubey Jun 24, 2023
65f2df6
test: #35940 Add unit tests
itsAkshayDubey Jun 24, 2023
b7427c1
fix: Add validate method, remove thrown exception
itsAkshayDubey Jul 5, 2023
e4ecb9c
test: Fix unit test according to validate method
itsAkshayDubey Jul 5, 2023
bee0c22
refactor: Remove try catch block
itsAkshayDubey Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
* @author Jean-Pierre Bergamin
* @author Mahmoud Ben Hassine
* @author Stephane Nicoll
* @author Akshay Dubey
* @since 2.3.0
*/
public class JobLauncherApplicationRunner implements ApplicationRunner, Ordered, ApplicationEventPublisherAware {
Expand Down Expand Up @@ -187,6 +188,9 @@ private void executeRegisteredJobs(JobParameters jobParameters) throws JobExecut
}
catch (NoSuchJobException ex) {
logger.debug(LogMessage.format("No job found in registry for job name: %s", jobName));
if(this.jobExplorer != null && this.jobExplorer.getLastJobInstance(jobName) == null) {
throw ex;
}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...c/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
Expand Down Expand Up @@ -71,6 +72,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;

/**
Expand All @@ -80,6 +82,7 @@
* @author Stephane Nicoll
* @author Vedran Pavic
* @author Kazuki Shimizu
* @author Akshay Dubey
*/
@ExtendWith(OutputCaptureExtension.class)
class BatchAutoConfigurationTests {
Expand Down Expand Up @@ -374,6 +377,21 @@ void whenTheUserDefinesTheirOwnDatabaseInitializerThenTheAutoConfiguredBatchInit
.hasBean("customInitializer"));
}

@Test
void testExecuteLocalAndNonConfiguredJob() {
this.contextRunner
.withUserConfiguration(NamedJobConfigurationWithLocalJob.class, EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.batch.job.names:discreteLocalJob,nonConfiguredJob")
.run((context) -> {
assertThat(context).hasSingleBean(JobLauncher.class);
assertThrows(NoSuchJobException.class,()->{
Copy link
Contributor

@scottfrederick scottfrederick Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Spring Boot style rules don't allow JUnit assertThrows(). Please use the AssertJ assertThatIllegalArgumentException() or assertThatExceptionOfType() instead.

context.getBean(JobLauncherApplicationRunner.class).run();
});
assertThat(context.getBean(JobRepository.class)
.getLastJobExecution("discreteLocalJob", new JobParameters())).isNotNull();
});
}

@Configuration(proxyBeanMethods = false)
protected static class BatchDataSourceConfiguration {

Expand Down