Skip to content

Commit daaa001

Browse files
committed
Fetch step executions in SimpleJobRepository#findJobExecutions
Resolves #4242
1 parent 622ed36 commit daaa001

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Diff for: spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ public List<JobInstance> findJobInstancesByName(String jobName, int start, int c
100100

101101
@Override
102102
public List<JobExecution> findJobExecutions(JobInstance jobInstance) {
103-
return this.jobExecutionDao.findJobExecutions(jobInstance);
103+
List<JobExecution> jobExecutions = this.jobExecutionDao.findJobExecutions(jobInstance);
104+
for (JobExecution jobExecution : jobExecutions) {
105+
this.stepExecutionDao.addStepExecutions(jobExecution);
106+
}
107+
return jobExecutions;
104108
}
105109

106110
@Override

Diff for: spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,15 @@ public JobParameters getNext(@Nullable JobParameters parameters) {
139139
void testRemoveJobExecutions() throws Exception {
140140
// given
141141
utils = new JobRepositoryTestUtils(jobRepository);
142-
utils.createJobExecutions("foo", new String[] {}, 2);
143-
assertEquals(2, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
142+
utils.createJobExecutions("foo", new String[] { "step1", "step2" }, 1);
143+
assertEquals(1, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
144+
assertEquals(2, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));
144145

145146
// when
146147
utils.removeJobExecutions();
147148

148149
// then
150+
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));
149151
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
150152
}
151153

0 commit comments

Comments
 (0)