From 42c0614742e0f05969631240fe6bed774924b83d Mon Sep 17 00:00:00 2001 From: Drummond Dawson Date: Tue, 9 Oct 2018 19:55:46 -0400 Subject: [PATCH] Replace explicit type with diamond operator in test module --- .../java/org/springframework/batch/test/AbstractJobTests.java | 2 +- .../springframework/batch/test/ExecutionContextTestUtils.java | 2 +- .../org/springframework/batch/test/JobLauncherTestUtils.java | 2 +- .../springframework/batch/test/JobRepositoryTestUtils.java | 2 +- .../main/java/org/springframework/batch/test/StepRunner.java | 4 ++-- .../batch/test/JobRepositoryTestUtilsTests.java | 2 +- .../test/StepScopeAnnotatedListenerIntegrationTests.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java b/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java index 846ea6da5..d54403063 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java @@ -150,7 +150,7 @@ public abstract class AbstractJobTests implements ApplicationContextAware { * current timestamp, to ensure that the job instance will be unique. */ protected JobParameters getUniqueJobParameters() { - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put("timestamp", new JobParameter(new Date().getTime())); return new JobParameters(parameters); } diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java index 178334421..f5820fbb2 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java @@ -44,7 +44,7 @@ public class ExecutionContextTestUtils { @Nullable public static T getValueFromStepInJob(JobExecution jobExecution, String stepName, String key) { StepExecution stepExecution = null; - List stepNames = new ArrayList(); + List stepNames = new ArrayList<>(); for (StepExecution candidate : jobExecution.getStepExecutions()) { String name = candidate.getStepName(); stepNames.add(name); diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java index 96c8879f3..375188ab9 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java @@ -159,7 +159,7 @@ public class JobLauncherTestUtils { * current timestamp, to ensure that the job instance will be unique. */ public JobParameters getUniqueJobParameters() { - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put("random", new JobParameter((long) (Math.random() * JOB_PARAMETER_MAXIMUM))); return new JobParameters(parameters); } diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java index ba0a0f73c..22217563d 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java @@ -135,7 +135,7 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme */ public List createJobExecutions(String jobName, String[] stepNames, int count) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException { - List list = new ArrayList(); + List list = new ArrayList<>(); JobParameters jobParameters = new JobParameters(); for (int i = 0; i < count; i++) { JobExecution jobExecution = jobRepository.createJobExecution(jobName, jobParametersIncrementer diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java index 34e7935d7..632fe019a 100755 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java @@ -136,7 +136,7 @@ public class StepRunner { job.setName("TestJob"); job.setJobRepository(this.jobRepository); - List stepsToExecute = new ArrayList(); + List stepsToExecute = new ArrayList<>(); stepsToExecute.add(step); job.setSteps(stepsToExecute); @@ -190,7 +190,7 @@ public class StepRunner { * current timestamp, to ensure that the job instance will be unique */ private JobParameters makeUniqueJobParameters() { - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put("timestamp", new JobParameter(new Date().getTime())); return new JobParameters(parameters); } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java index 701aaad24..031c96e73 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java @@ -94,7 +94,7 @@ public class JobRepositoryTestUtilsTests { @Test public void testRemoveJobExecutionsWithSameJobInstance() throws Exception { utils = new JobRepositoryTestUtils(jobRepository, dataSource); - List list = new ArrayList(); + List list = new ArrayList<>(); JobExecution jobExecution = jobRepository.createJobExecution("job", new JobParameters()); jobExecution.setEndTime(new Date()); list.add(jobExecution); diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java index 7d301b51a..c25808328 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java @@ -66,7 +66,7 @@ public class StepScopeAnnotatedListenerIntegrationTests { @BeforeStep public void initializeState(StepExecution stepExecution) { - this.list = new ArrayList(); + this.list = new ArrayList<>(); } @AfterStep