Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPEN - issue BATCH-90: StepExecution and StepExecutionContext are parallel domains, and StepExecution is by comparison anaemic

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/BATCH-90

Tidy the JobInstance up a bit (no need for setter of identifier)
This commit is contained in:
dsyer
2007-09-30 11:47:49 +00:00
parent 5cafc9dfde
commit 21a4ea540e
14 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java
View File

@@ -127,7 +127,7 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsPro
.getJobConfiguration(jobRuntimeInformation.getName());
final JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation);
JobExecutionContext jobExecutionContext = jobExecutionRegistry.register(jobRuntimeInformation, job);
JobExecutionContext jobExecutionContext = jobExecutionRegistry.register(job);
ExitStatus exitStatus = ExitStatus.FAILED;
try {

5
execution/src/main/java/org/springframework/batch/execution/facade/VolatileJobExecutionRegistry.java
View File

@@ -98,7 +98,10 @@ public class VolatileJobExecutionRegistry implements JobExecutionRegistry {
* @see org.springframework.batch.container.common.executor.JobExecutionRegistry#register(org.springframework.batch.container.common.runtime.JobRuntimeInformation,
* org.springframework.batch.container.common.domain.JobExecution)
*/
public JobExecutionContext register(JobIdentifier jobIdentifier, JobInstance job) {
public JobExecutionContext register(JobInstance job) {
JobIdentifier jobIdentifier = job.getIdentifier();
if (isRegistered(jobIdentifier)) {
return get(jobIdentifier);
}

3
execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateJobDao.java
View File

@@ -51,8 +51,7 @@ public class HibernateJobDao extends HibernateDaoSupport implements JobDao {
validateJobIdentifier(jobIdentifier);
JobInstance job = new JobInstance();
job.setIdentifier(jobIdentifier);
JobInstance job = new JobInstance(jobIdentifier);
Long jobId = (Long) getHibernateTemplate().save(job);

3
execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobDao.java
View File

@@ -45,8 +45,7 @@ public class MapJobDao implements JobDao {
}
public JobInstance createJob(JobIdentifier jobIdentifier) {
JobInstance job = new JobInstance(new Long(currentId++));
job.setIdentifier(jobIdentifier);
JobInstance job = new JobInstance(jobIdentifier, new Long(currentId++));
jobsById.put(job.getId(), job);
return job;

6
execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java
View File

@@ -119,8 +119,7 @@ public class SqlJobDao implements JobDao, InitializingBean {
new Long(defaultJobId.getJobRun()) };
jdbcTemplate.update(getCreateJobQuery(), parameters);
JobInstance job = new JobInstance(jobId);
job.setIdentifier(jobIdentifier);
JobInstance job = new JobInstance(jobIdentifier, jobId);
return job;
}
@@ -145,9 +144,8 @@ public class SqlJobDao implements JobDao, InitializingBean {
RowMapper rowMapper = new RowMapper() {
public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
JobInstance job = new JobInstance(new Long(rs.getLong(1)));
JobInstance job = new JobInstance(jobIdentifier, new Long(rs.getLong(1)));
job.setStatus(BatchStatus.getStatus(rs.getString(2)));
job.setIdentifier(jobIdentifier);
return job;
}