diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java index 97be10743..38c40d5bd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java @@ -98,7 +98,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement String exitDescription = truncateExitDescription(stepExecution.getExitStatus().getExitDescription()); - stepExecution.setId(new Long(stepExecutionIncrementer.nextLongValue())); + stepExecution.setId(stepExecutionIncrementer.nextLongValue()); stepExecution.incrementVersion(); // should be 0 now Object[] parameters = new Object[] { stepExecution.getId(), stepExecution.getVersion(), stepExecution.getStepName(), stepExecution.getJobExecutionId(), stepExecution.getStartTime(), diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java index 31f87518b..fe30e1df6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java @@ -35,7 +35,7 @@ public class MapJobExecutionDao implements JobExecutionDao { public void saveJobExecution(JobExecution jobExecution) { Assert.isTrue(jobExecution.getId() == null); - Long newId = new Long(currentId++); + Long newId = currentId++; jobExecution.setId(newId); jobExecution.incrementVersion(); executionsById.put(newId, copy(jobExecution)); @@ -128,6 +128,6 @@ public class MapJobExecutionDao implements JobExecutionDao { } public void synchronizeStatus(JobExecution jobExecution) { - // TODO Auto-generated method stub + // no-op } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java index ae6c416da..416d94411 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java @@ -29,7 +29,7 @@ public class MapJobInstanceDao implements JobInstanceDao { Assert.state(getJobInstance(jobName, jobParameters) == null, "JobInstance must not already exist"); - JobInstance jobInstance = new JobInstance(new Long(currentId++), jobParameters, jobName); + JobInstance jobInstance = new JobInstance(currentId++, jobParameters, jobName); jobInstance.incrementVersion(); jobInstances.add(jobInstance); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java index b9873985b..48aa64415 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java @@ -56,7 +56,7 @@ public class MapStepExecutionDao implements StepExecutionDao { executions = TransactionAwareProxyFactory.createTransactionalMap(); executionsByJobExecutionId.put(stepExecution.getJobExecutionId(), executions); } - stepExecution.setId(new Long(currentId++)); + stepExecution.setId(currentId++); stepExecution.incrementVersion(); executions.put(stepExecution.getStepName(), copy(stepExecution)); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java index 838082b38..899dd4c29 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java @@ -103,7 +103,7 @@ public class SimpleJobRepositoryTests { job.setSteps(stepConfigurations); - jobInstance = new JobInstance(new Long(1), jobParameters, job.getName()); + jobInstance = new JobInstance(1L, jobParameters, job.getName()); databaseStep1 = "dbStep1"; databaseStep2 = "dbStep2"; @@ -112,7 +112,7 @@ public class SimpleJobRepositoryTests { steps.add(databaseStep1); steps.add(databaseStep2); - jobExecution = new JobExecution(new JobInstance(new Long(1), jobParameters, job.getName()), new Long(1)); + jobExecution = new JobExecution(new JobInstance(1L, jobParameters, job.getName()), 1L); } @Test @@ -132,7 +132,7 @@ public class SimpleJobRepositoryTests { @Test public void testUpdateValidJobExecution() throws Exception { - JobExecution jobExecution = new JobExecution(new JobInstance(new Long(1), jobParameters, job.getName()), new Long(1)); + JobExecution jobExecution = new JobExecution(new JobInstance(1L, jobParameters, job.getName()), 1L); // new execution - call update on job dao jobExecutionDao.updateJobExecution(jobExecution); replay(jobExecutionDao); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java index e356b328c..a8dcd42ae 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java @@ -61,7 +61,7 @@ public class StepExecutionResourceProxyTests extends TestCase { protected void setUp() throws Exception { - jobInstance = new JobInstance(new Long(0), new JobParameters(), "testJob"); + jobInstance = new JobInstance(0L, new JobParameters(), "testJob"); JobExecution jobExecution = new JobExecution(jobInstance); Step step = new StepSupport("bar"); stepExecution = jobExecution.createStepExecution(step.getName()); @@ -95,7 +95,7 @@ public class StepExecutionResourceProxyTests extends TestCase { public void testNonStandardFilePatternWithJobParameters() throws Exception { resource.setFilePattern("foo/data/%JOB_NAME%/%job.key%-foo"); - jobInstance = new JobInstance(new Long(0), new JobParametersBuilder().addString("job.key", "spam") + jobInstance = new JobInstance(0L, new JobParametersBuilder().addString("job.key", "spam") .toJobParameters(), "testJob"); JobExecution jobExecution = new JobExecution(jobInstance); Step step = new StepSupport("bar"); @@ -122,7 +122,7 @@ public class StepExecutionResourceProxyTests extends TestCase { public void testLongJobParameter() throws Exception { resource.setFilePattern("foo/data/%JOB_NAME%/%job.key(long)%-foo"); - jobInstance = new JobInstance(new Long(0), new JobParametersBuilder().addLong("job.key", 123L) + jobInstance = new JobInstance(0L, new JobParametersBuilder().addLong("job.key", 123L) .toJobParameters(), "testJob"); JobExecution jobExecution = new JobExecution(jobInstance); Step step = new StepSupport("bar"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java index 0e3d93b1b..400ae22b8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java @@ -51,7 +51,7 @@ public class StepExecutionSimpleCompletionPolicyTests extends TestCase { protected void setUp() throws Exception { - JobParameters jobParameters = new JobParametersBuilder().addLong("commit.interval", new Long(2L)).toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addLong("commit.interval", 2L).toJobParameters(); jobInstance = new JobInstance(new Long(0), jobParameters, "testJob"); JobExecution jobExecution = new JobExecution(jobInstance); Step step = new StepSupport("bar"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java index cf64bd2ef..3312b7f30 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java @@ -39,7 +39,7 @@ public class AbstractStepTests { */ final List events = new ArrayList(); - final StepExecution execution = new StepExecution(tested.getName(), new JobExecution(new JobInstance(new Long(1), + final StepExecution execution = new StepExecution(tested.getName(), new JobExecution(new JobInstance(1L, new JobParameters(), "jobName"))); /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListenerTests.java index bfb46b208..527e2fe58 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListenerTests.java @@ -35,7 +35,7 @@ public class NoWorkFoundStepExecutionListenerTests extends TestCase { public void testAfterStep() { StepExecution stepExecution = new StepExecution("NoProcessingStep", new JobExecution( - new JobInstance(new Long(1), new JobParameters(), "NoProcessingJob"))); + new JobInstance(1L, new JobParameters(), "NoProcessingJob"))); stepExecution.setReadCount(0); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java index 0c023bb8a..66228d487 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java @@ -66,7 +66,7 @@ public class FaultTolerantStepFactoryBeanNonBufferingTests { factory.setSkipLimit(2); factory.setIsReaderTransactionalQueue(true); - JobInstance jobInstance = new JobInstance(new Long(1), new JobParameters(), "skipJob"); + JobInstance jobInstance = new JobInstance(1L, new JobParameters(), "skipJob"); jobExecution = new JobExecution(jobInstance); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java index 6d37eca06..59c49cff8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java @@ -70,7 +70,7 @@ public class FaultTolerantStepFactoryBeanTests { factory.setSkippableExceptionClasses(skippableExceptions); factory.setSkipLimit(2); - JobInstance jobInstance = new JobInstance(new Long(1), new JobParameters(), "skipJob"); + JobInstance jobInstance = new JobInstance(1L, new JobParameters(), "skipJob"); jobExecution = new JobExecution(jobInstance); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java index e8f3fd208..0f3ebee51 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java @@ -43,7 +43,7 @@ public class RepeatOperationsStepFactoryBeanTests extends TestCase { private List list; - private JobExecution jobExecution = new JobExecution(new JobInstance(new Long(0L), new JobParameters(), "job")); + private JobExecution jobExecution = new JobExecution(new JobInstance(0L, new JobParameters(), "job")); protected void setUp() throws Exception { factory.setBeanName("RepeatOperationsStep"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java index 218596ebd..350416832 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java @@ -92,7 +92,7 @@ public class AsyncTaskletStepTests { }); JobSupport job = new JobSupport("FOO"); - jobInstance = new JobInstance(new Long(0), new JobParameters(), job.getName()); + jobInstance = new JobInstance(0L, new JobParameters(), job.getName()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java index d01f8e6c8..6ea30c6c6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java @@ -115,7 +115,7 @@ public class TaskletStepTests { step.setStepOperations(template); job = new JobSupport("FOO"); - jobInstance = new JobInstance(new Long(0), new JobParameters(), job.getName()); + jobInstance = new JobInstance(0L, new JobParameters(), job.getName()); step.setTransactionManager(transactionManager);