From bc1905247a598ce131bfe846ce64085cd44852dd Mon Sep 17 00:00:00 2001 From: lucasward Date: Wed, 16 Jan 2008 11:48:44 +0000 Subject: [PATCH] Misc. Name changes. (Mostly as a result of JobConfiguration -> job) --- .../execution/job/DefaultJobExecutor.java | 4 ++-- .../launch/SimpleJobExecutorFacade.java | 8 ++++---- .../execution/launch/SimpleJobLauncher.java | 4 ++-- .../execution/repository/dao/JdbcJobDao.java | 8 ++++---- .../resource/BatchResourceFactoryBean.java | 2 +- .../runtime/DefaultJobIdentifier.java | 2 +- .../runtime/ScheduledJobIdentifier.java | 2 +- .../step/simple/SimpleStepExecutor.java | 2 +- .../job/DefaultJobExecutorTests.java | 4 ++-- .../launch/SimpleJobExecutorFacadeTests.java | 4 ++-- .../execution/launch/SimpleJobTests.java | 6 +++--- .../repository/SimpleJobRepositoryTests.java | 20 +++++++++---------- .../repository/dao/AbstractJobDaoTests.java | 2 +- .../simple/StepExecutorInterruptionTests.java | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java index 9e09d9abb..e8d65d851 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java @@ -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); diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java index bc4d97b40..64470fa54 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java @@ -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();) { diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java index aa419b01a..577156033 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java @@ -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; } diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java index c3e21bb01..2b5af1a83 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java @@ -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."); } /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java index 96717ae32..44eed420e 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java @@ -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(); } /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java index 466f3be2b..e2189de70 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java @@ -56,7 +56,7 @@ public class DefaultJobIdentifier extends SimpleJobIdentifier implements } public String getJobKey() { - return getRuntimeParameters().getString(JOB_KEY); + return getJobInstanceProperties().getString(JOB_KEY); } } diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java index 357af97a1..18d0b880a 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java @@ -51,6 +51,6 @@ public class ScheduledJobIdentifier extends DefaultJobIdentifier implements JobI } public Date getScheduleDate() { - return getRuntimeParameters().getDate(SCHEDULE_DATE); + return getJobInstanceProperties().getDate(SCHEDULE_DATE); } } diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java index 3b33288e4..64db79abc 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java @@ -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())); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java index c672c0ed9..231b15c27 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java @@ -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()); } diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java index c6b8e5981..0a77d65ca 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java @@ -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(); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java index 427d110f2..e8f5ebc5a 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java @@ -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"); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java index 9fbc6d966..7b0926526 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java @@ -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(); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java index adb02f29c..f43cf600e 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java @@ -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)); } diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java index 9a04509f4..ae04d672e 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java @@ -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(); }