diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java index c08cd4d9b..c0562dac9 100644 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java +++ b/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java @@ -45,7 +45,7 @@ public interface JobDao { * Identifier are found, then a list of size 0 will be returned. * * @param jobIdentifier - * @return List of jobs matching JobIdentifier + * @return List of {@link JobInstance} objects matching {@link JobIdentifier} */ public List findJobs(JobIdentifier jobIdentifier); diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java index f52854066..f0bde9da6 100644 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java +++ b/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java @@ -109,7 +109,7 @@ public class SqlJobDao implements JobDao, InitializingBean { * @throws IllegalArgumentException if any JobRuntimeInformation fields are * null. */ - public List findJobs(JobIdentifier jobIdentifier) { + public List findJobs(final JobIdentifier jobIdentifier) { ScheduledJobIdentifier defaultJobId = (ScheduledJobIdentifier) jobIdentifier; validateJobRuntimeInformation(defaultJobId); @@ -122,6 +122,7 @@ public class SqlJobDao implements JobDao, InitializingBean { JobInstance job = new JobInstance(new Long(rs.getLong(1))); job.setStatus(BatchStatus.getStatus(rs.getString(2))); + job.setIdentifier(jobIdentifier); return job; } diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java index 07d7e2daa..c6ac36c5e 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java @@ -98,6 +98,7 @@ public class SqlJobDaoTests extends AbstractTransactionalDataSourceSpringContext assertTrue(jobs.size() == 1); JobInstance tempJob = (JobInstance) jobs.get(0); assertTrue(job.equals(tempJob)); + assertEquals(jobRuntimeInformation, tempJob.getIdentifier()); } public void testFindJobWithNullRuntime(){