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

RESOLVED - BATCH-571: Remove reference to Step from StepExecution and reference to Job from JobInstance

Browse Source 
JobInstance's reference to Job replaced with jobName string
This commit is contained in:
robokaso
2008-04-28 12:09:54 +00:00
parent 6ca877c1d9
commit 58375f3198
25 changed files with 72 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java
View File

@@ -26,8 +26,7 @@ import org.springframework.util.Assert;
*
* Trying to execute an existing JobIntance that has already completed
* successfully will result in error. Error will be raised also for an attempt
* to restart a failed JobInstance if the Job ({@link JobInstance#getJob()})
* is not restartable.
* to restart a failed JobInstance if the Job is not restartable.
*
* @see Job
* @see JobParameters
@@ -42,13 +41,14 @@ public class JobInstance extends Entity {
private JobParameters jobParameters;
private Job job;
private String jobName;
public JobInstance(Long id, JobParameters jobParameters, Job job) {
public JobInstance(Long id, JobParameters jobParameters, String jobName) {
super(id);
Assert.notNull(job);
Assert.hasLength(jobName);
// Assert.hasLength(job.getName());
this.jobParameters = jobParameters == null ? new JobParameters() : jobParameters;
this.job = job;
this.jobName = jobName;
}
/**
@@ -62,15 +62,11 @@ public class JobInstance extends Entity {
* @return the job name. (Equivalent to getJob().getName())
*/
public String getJobName() {
return job == null ? null : job.getName();
return jobName;
}
public String toString() {
return super.toString() + ", JobParameters=[" + jobParameters + "]" + ", Job=[" + job + "]";
}
public Job getJob() {
return job;
return super.toString() + ", JobParameters=[" + jobParameters + "]" + ", Job=[" + jobName + "]";
}
}

4
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
View File

@@ -61,7 +61,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
Long jobId = new Long(jobIncrementer.nextLongValue());
JobInstance jobInstance = new JobInstance(jobId, jobParameters, job);
JobInstance jobInstance = new JobInstance(jobId, jobParameters, job.getName());
jobInstance.incrementVersion();
Object[] parameters = new Object[] { jobId, job.getName(), createJobKey(jobParameters), jobInstance.getVersion() };
@@ -173,7 +173,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
RowMapper rowMapper = new RowMapper() {
public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
JobInstance jobInstance = new JobInstance(new Long(rs.getLong(1)), jobParameters, job);
JobInstance jobInstance = new JobInstance(new Long(rs.getLong(1)), jobParameters, job.getName());
return jobInstance;
}
};

2
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java
View File

@@ -26,7 +26,7 @@ public class MapJobInstanceDao implements JobInstanceDao {
Assert.state(getJobInstance(job, jobParameters) == null, "JobInstance must not already exist");
JobInstance jobInstance = new JobInstance(new Long(currentId++), jobParameters, job);
JobInstance jobInstance = new JobInstance(new Long(currentId++), jobParameters, job.getName());
jobInstance.incrementVersion();
jobInstances.add(jobInstance);