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

Misc. Name changes. (Mostly as a result of JobConfiguration -> job)

Browse Source
This commit is contained in:
lucasward
2008-01-16 11:48:44 +00:00
parent c0bf35b959
commit bc1905247a
14 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java
View File

@@ -67,7 +67,7 @@ public class DefaultJobExecutor implements JobExecutor {
public ExitStatus run(Job job, JobExecution execution)
throws BatchCriticalException {
JobInstance jobInstance = execution.getJob();
JobInstance jobInstance = execution.getJobInstance();
updateStatus(execution, BatchStatus.STARTING);
List stepInstances = jobInstance.getStepInstances();
@@ -127,7 +127,7 @@ public class DefaultJobExecutor implements JobExecutor {
}
private void updateStatus(JobExecution jobExecution, BatchStatus status) {
JobInstance job = jobExecution.getJob();
JobInstance job = jobExecution.getJobInstance();
jobExecution.setStatus(status);
job.setStatus(status);
jobRepository.update(job);

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java
View File

@@ -185,7 +185,7 @@ class SimpleJobExecutorFacade implements JobExecutorFacade,
throws NoSuchJobException {
Job job = jobLocator
.getJob(execution.getJob().getIdentifier()
.getJob(execution.getJobInstance().getIdentifier()
.getName());
this.before(execution);
@@ -209,7 +209,7 @@ class SimpleJobExecutorFacade implements JobExecutorFacade,
public void before(JobExecution execution) {
synchronized (mutex) {
running++;
jobExecutionRegistry.put(execution.getJob().getIdentifier(),
jobExecutionRegistry.put(execution.getJobInstance().getIdentifier(),
execution);
}
for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
@@ -254,7 +254,7 @@ class SimpleJobExecutorFacade implements JobExecutorFacade,
synchronized (mutex) {
// assume execution is synchronous so when we get to here we are
// not running any more
jobExecutionRegistry.remove(execution.getJob().getIdentifier());
jobExecutionRegistry.remove(execution.getJobInstance().getIdentifier());
running--;
}
}
@@ -299,7 +299,7 @@ class SimpleJobExecutorFacade implements JobExecutorFacade,
JobExecution element = (JobExecution) iter.next();
i++;
String runtime = "job" + i;
props.setProperty(runtime, "" + element.getJob().getIdentifier());
props.setProperty(runtime, "" + element.getJobInstance().getIdentifier());
int j = 0;
for (Iterator iterator = element.getStepContexts().iterator(); iterator
.hasNext();) {

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
View File

@@ -237,7 +237,7 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean,
protected final void runInternal(JobExecution execution)
throws NoSuchJobException {
JobIdentifier jobIdentifier = execution.getJob().getIdentifier();
JobIdentifier jobIdentifier = execution.getJobInstance().getIdentifier();
if (getJobExecution(jobIdentifier)==null) {
logger.info("Job already stopped (not launching): "+jobIdentifier);
@@ -465,7 +465,7 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean,
private JobExecutionHolder register(JobExecution execution) {
JobExecutionHolder jobExecutionHolder = new JobExecutionHolder(execution);
synchronized (registry) {
registry.put(execution.getJob().getIdentifier(), jobExecutionHolder);
registry.put(execution.getJobInstance().getIdentifier(), jobExecutionHolder);
}
return jobExecutionHolder;
}

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java
View File

@@ -129,11 +129,11 @@ public class JdbcJobDao implements JobDao, InitializingBean {
validateJobIdentifier(jobIdentifier);
Long jobId = new Long(jobIncrementer.nextLongValue());
Object[] parameters = new Object[] { jobId, jobIdentifier.getName(), createJobKey(jobIdentifier.getRuntimeParameters()) };
Object[] parameters = new Object[] { jobId, jobIdentifier.getName(), createJobKey(jobIdentifier.getJobInstanceProperties()) };
jdbcTemplate.update(getCreateJobQuery(), parameters, new int[] {
Types.INTEGER, Types.VARCHAR, Types.VARCHAR});
insertJobParameters(jobId, jobIdentifier.getRuntimeParameters());
insertJobParameters(jobId, jobIdentifier.getJobInstanceProperties());
JobInstance job = new JobInstance(jobIdentifier, jobId);
return job;
@@ -174,7 +174,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
validateJobIdentifier(jobIdentifier);
Object[] parameters = new Object[] { jobIdentifier.getName(),
createJobKey(jobIdentifier.getRuntimeParameters()) };
createJobKey(jobIdentifier.getJobInstanceProperties()) };
RowMapper rowMapper = new RowMapper() {
public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -456,7 +456,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
Assert.notNull(jobIdentifier, "JobIdentifier cannot be null.");
Assert.notNull(jobIdentifier.getName(),
"JobIdentifier name cannot be null.");
Assert.notNull(jobIdentifier.getRuntimeParameters(), "JobIdentifier runtime parameters must not be null.");
Assert.notNull(jobIdentifier.getJobInstanceProperties(), "JobIdentifier runtime parameters must not be null.");
}
/**

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java
View File

@@ -129,7 +129,7 @@ public class BatchResourceFactoryBean extends AbstractFactoryBean implements
StepExecution execution = context.getStepExecution();
stepName = execution.getStep().getName();
jobName = execution.getStep().getJob().getName();
jobIdentifier = execution.getJobExecution().getJob().getIdentifier();
jobIdentifier = execution.getJobExecution().getJobInstance().getIdentifier();
}
/**

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java
View File

@@ -56,7 +56,7 @@ public class DefaultJobIdentifier extends SimpleJobIdentifier implements
}
public String getJobKey() {
return getRuntimeParameters().getString(JOB_KEY);
return getJobInstanceProperties().getString(JOB_KEY);
}
}

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java
View File

@@ -51,6 +51,6 @@ public class ScheduledJobIdentifier extends DefaultJobIdentifier implements JobI
}
public Date getScheduleDate() {
return getRuntimeParameters().getDate(SCHEDULE_DATE);
return getJobInstanceProperties().getDate(SCHEDULE_DATE);
}
}

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java
View File

@@ -158,7 +158,7 @@ public class SimpleStepExecutor implements StepExecutor {
stepScopeContext.setStepExecution(stepExecution);
// Add the job identifier so that it can be used to identify
// the conversation in StepScope
stepScopeContext.setAttribute(StepScope.ID_KEY, stepExecution.getJobExecution().getJob().getIdentifier());
stepScopeContext.setAttribute(StepScope.ID_KEY, stepExecution.getJobExecution().getJobInstance().getIdentifier());
try {
stepExecution.setStartTime(new Date(System.currentTimeMillis()));

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java
View File

@@ -129,7 +129,7 @@ public class DefaultJobExecutorTests extends TestCase {
jobIdentifer = new SimpleJobIdentifier("TestJob");
jobExecution = jobRepository.findOrCreateJob(jobConfiguration, jobIdentifer);
job = jobExecution.getJob();
job = jobExecution.getJobInstance();
List steps = job.getStepInstances();
step1 = (StepInstance) steps.get(0);
@@ -179,7 +179,7 @@ public class DefaultJobExecutorTests extends TestCase {
public void testExecutionContextIsSet() throws Exception {
testRunNormally();
assertEquals(job, jobExecution.getJob());
assertEquals(job, jobExecution.getJobInstance());
assertEquals(step1, stepExecution1.getStep());
assertEquals(step2, stepExecution2.getStep());
}

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java
View File

@@ -80,7 +80,7 @@ public class SimpleJobExecutorFacadeTests extends TestCase {
JobInstance job = setUpFacadeForNormalStart();
jobExecution = jobExecutorFacade.createExecutionFrom(jobIdentifier);
assertEquals(job, jobExecution.getJob());
assertEquals(job, jobExecution.getJobInstance());
jobRepositoryControl.verify();
}
@@ -90,7 +90,7 @@ public class SimpleJobExecutorFacadeTests extends TestCase {
JobInstance job = setUpFacadeForNormalStart();
jobExecution = jobExecutorFacade.createExecutionFrom(jobIdentifier);
jobExecutorFacade.start(jobExecution);
assertEquals(job, jobExecution.getJob());
assertEquals(job, jobExecution.getJobInstance());
assertEquals("bar", job.getName());
jobRepositoryControl.verify();

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
View File

@@ -119,7 +119,7 @@ public class SimpleJobTests extends TestCase {
jobConfiguration.addStep(new SimpleStep(getTasklet("foo", "bar")));
jobConfiguration.addStep(new SimpleStep(getTasklet("spam")));
JobInstance job = repository.findOrCreateJob(jobConfiguration, runtimeInformation).getJob();
JobInstance job = repository.findOrCreateJob(jobConfiguration, runtimeInformation).getJobInstance();
assertEquals(job.getName(), "real.job");
@@ -174,7 +174,7 @@ public class SimpleJobTests extends TestCase {
JobExecution jobExecution = repository.findOrCreateJob(jobConfiguration, runtimeInformation);
jobExecutor.run(jobConfiguration, jobExecution);
assertEquals(BatchStatus.COMPLETED, jobExecution.getJob().getStatus());
assertEquals(BatchStatus.COMPLETED, jobExecution.getJobInstance().getStatus());
assertEquals(0, processed.size());
// provider should be exhausted
assertEquals(null, provider.read());
@@ -196,7 +196,7 @@ public class SimpleJobTests extends TestCase {
jobConfiguration.addStep(step);
JobExecution jobExecution = repository.findOrCreateJob(jobConfiguration, runtimeInformation);
JobInstance job = jobExecution.getJob();
JobInstance job = jobExecution.getJobInstance();
try {
jobExecutor.run(jobConfiguration, jobExecution);
fail("Expected RuntimeException");

20
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
View File

@@ -134,7 +134,7 @@ public class SimpleJobRepositoryTests extends TestCase {
jobDao.save(new JobExecution(databaseJob));
jobDaoControl.setMatcher(new ArgumentsMatcher(){
public boolean matches(Object[] expected, Object[] actual) {
return ((JobExecution) actual[0]).getJob().equals(databaseJob);
return ((JobExecution) actual[0]).getJobInstance().equals(databaseJob);
}
public String toString(Object[] arguments) {
return ""+arguments[0];
@@ -142,7 +142,7 @@ public class SimpleJobRepositoryTests extends TestCase {
});
stepDaoControl.replay();
jobDaoControl.replay();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJob();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJobInstance();
assertTrue(job.equals(databaseJob));
List jobSteps = job.getStepInstances();
Iterator it = jobSteps.iterator();
@@ -181,7 +181,7 @@ public class SimpleJobRepositoryTests extends TestCase {
jobDaoControl.setMatcher(new ArgumentsMatcher(){
public boolean matches(Object[] expected, Object[] actual) {
JobExecution execution = (JobExecution) actual[0];
return execution.getJob().equals(databaseJob);
return execution.getJobInstance().equals(databaseJob);
}
public String toString(Object[] arguments) {
return ""+arguments[0];
@@ -189,7 +189,7 @@ public class SimpleJobRepositoryTests extends TestCase {
});
jobDaoControl.setVoidCallable();
jobDaoControl.replay();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJob();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJobInstance();
assertTrue(job.equals(databaseJob));
List jobSteps = job.getStepInstances();
Iterator it = jobSteps.iterator();
@@ -270,7 +270,7 @@ public class SimpleJobRepositoryTests extends TestCase {
jobDao.save(new JobExecution(databaseJob));
jobDaoControl.setMatcher(new ArgumentsMatcher(){
public boolean matches(Object[] expected, Object[] actual) {
return ((JobExecution) actual[0]).getJob().equals(databaseJob);
return ((JobExecution) actual[0]).getJobInstance().equals(databaseJob);
}
public String toString(Object[] arguments) {
return ""+arguments[0];
@@ -278,7 +278,7 @@ public class SimpleJobRepositoryTests extends TestCase {
});
stepDaoControl.replay();
jobDaoControl.replay();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJob();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJobInstance();
assertTrue(job.equals(databaseJob));
List jobSteps = job.getStepInstances();
Iterator it = jobSteps.iterator();
@@ -411,7 +411,7 @@ public class SimpleJobRepositoryTests extends TestCase {
jobDao.save(new JobExecution(databaseJob));
jobDaoControl.setMatcher(new ArgumentsMatcher(){
public boolean matches(Object[] expected, Object[] actual) {
return ((JobExecution) actual[0]).getJob().equals(databaseJob);
return ((JobExecution) actual[0]).getJobInstance().equals(databaseJob);
}
public String toString(Object[] arguments) {
return ""+arguments[0];
@@ -419,7 +419,7 @@ public class SimpleJobRepositoryTests extends TestCase {
});
stepDaoControl.replay();
jobDaoControl.replay();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJob();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJobInstance();
List jobSteps = job.getStepInstances();
Iterator it = jobSteps.iterator();
StepInstance step = (StepInstance) it.next();
@@ -455,14 +455,14 @@ public class SimpleJobRepositoryTests extends TestCase {
jobDao.save(new JobExecution(databaseJob));
jobDaoControl.setMatcher(new ArgumentsMatcher(){
public boolean matches(Object[] expected, Object[] actual) {
return ((JobExecution) actual[0]).getJob().equals(databaseJob);
return ((JobExecution) actual[0]).getJobInstance().equals(databaseJob);
}
public String toString(Object[] arguments) {
return ""+arguments[0];
}
});
jobDaoControl.replay();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJob();
JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation).getJobInstance();
assertTrue(job.equals(databaseJob));
List jobSteps = job.getStepInstances();
Iterator it = jobSteps.iterator();

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
View File

@@ -268,7 +268,7 @@ public abstract class AbstractJobDaoTests extends
assertEquals(1, jobs.size());
assertEquals(job.getName(), ((JobInstance) jobs.get(0)).getName());
assertEquals(jobIdentifier.getJobKey(), ((JobInstance) jobs.get(0)).
getIdentifier().getRuntimeParameters().getString(DefaultJobIdentifier.JOB_KEY));
getIdentifier().getJobInstanceProperties().getString(DefaultJobIdentifier.JOB_KEY));
}

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java
View File

@@ -65,7 +65,7 @@ public class StepExecutorInterruptionTests extends TestCase {
jobConfiguration.addStep(stepConfiguration);
JobIdentifier runtimeInformation = new SimpleJobIdentifier("TestJob");
jobConfiguration.setBeanName("testJob");
job = jobRepository.findOrCreateJob(jobConfiguration, runtimeInformation).getJob();
job = jobRepository.findOrCreateJob(jobConfiguration, runtimeInformation).getJobInstance();
executor = new SimpleStepExecutor();
}