Replace explicit type with diamond operator in test module

drumonii · fmbenhassine · commit 42c0614742e0 · 2018-11-06T21:30:36.000+01:00
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
@@ -150,7 +150,7 @@ protected JobExecution launchJob(JobParameters jobParameters) throws Exception {
 	 * current timestamp, to ensure that the job instance will be unique.
 	 */
 	protected JobParameters getUniqueJobParameters() {
-		Map<String, JobParameter> parameters = new HashMap<String, JobParameter>();
+		Map<String, JobParameter> 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
@@ -44,7 +44,7 @@ public static <T> T getValueFromJob(JobExecution jobExecution, String key) {
 	@Nullable
 	public static <T> T getValueFromStepInJob(JobExecution jobExecution, String stepName, String key) {
 		StepExecution stepExecution = null;
-		List<String> stepNames = new ArrayList<String>();
+		List<String> 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
@@ -159,7 +159,7 @@ public JobExecution launchJob(JobParameters jobParameters) throws Exception {
 	 * current timestamp, to ensure that the job instance will be unique.
 	 */
 	public JobParameters getUniqueJobParameters() {
-		Map<String, JobParameter> parameters = new HashMap<String, JobParameter>();
+		Map<String, JobParameter> 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
@@ -135,7 +135,7 @@ public void setJobRepository(JobRepository jobRepository) {
 	 */
 	public List<JobExecution> createJobExecutions(String jobName, String[] stepNames, int count)
 			throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException {
-		List<JobExecution> list = new ArrayList<JobExecution>();
+		List<JobExecution> 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
@@ -136,7 +136,7 @@ public JobExecution launchStep(Step step, JobParameters jobParameters, @Nullable
 		job.setName("TestJob");
 		job.setJobRepository(this.jobRepository);
 
-		List<Step> stepsToExecute = new ArrayList<Step>();
+		List<Step> stepsToExecute = new ArrayList<>();
 		stepsToExecute.add(step);
 		job.setSteps(stepsToExecute);
 
@@ -190,7 +190,7 @@ private JobExecution launchJob(Job job, JobParameters jobParameters) {
 	 * current timestamp, to ensure that the job instance will be unique
 	 */
 	private JobParameters makeUniqueJobParameters() {
-		Map<String, JobParameter> parameters = new HashMap<String, JobParameter>();
+		Map<String, JobParameter> 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
@@ -94,7 +94,7 @@ public void testCreateJobExecutions() throws Exception {
 	@Test
 	public void testRemoveJobExecutionsWithSameJobInstance() throws Exception {
 		utils = new JobRepositoryTestUtils(jobRepository, dataSource);
-		List<JobExecution> list = new ArrayList<JobExecution>();
+		List<JobExecution> 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
@@ -66,7 +66,7 @@ public static class StatefulItemReader implements ItemReader<String> {
 
 		@BeforeStep
 		public void initializeState(StepExecution stepExecution) {
-			this.list = new ArrayList<String>();
+			this.list = new ArrayList<>();
 		}
 
 		@AfterStep

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ protected JobExecution launchJob(JobParameters jobParameters) throws Exception {`
`150`	`150`	`* current timestamp, to ensure that the job instance will be unique.`
`151`	`151`	`*/`
`152`	`152`	`protected JobParameters getUniqueJobParameters() {`
`153`		`- Map<String, JobParameter> parameters = new HashMap<String, JobParameter>();`
	`153`	`+ Map<String, JobParameter> parameters = new HashMap<>();`
`154`	`154`	`parameters.put("timestamp", new JobParameter(new Date().getTime()));`
`155`	`155`	`return new JobParameters(parameters);`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public JobExecution launchJob(JobParameters jobParameters) throws Exception {`
`159`	`159`	`* current timestamp, to ensure that the job instance will be unique.`
`160`	`160`	`*/`
`161`	`161`	`public JobParameters getUniqueJobParameters() {`
`162`		`- Map<String, JobParameter> parameters = new HashMap<String, JobParameter>();`
	`162`	`+ Map<String, JobParameter> parameters = new HashMap<>();`
`163`	`163`	`parameters.put("random", new JobParameter((long) (Math.random() * JOB_PARAMETER_MAXIMUM)));`
`164`	`164`	`return new JobParameters(parameters);`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static class StatefulItemReader implements ItemReader<String> {`
`66`	`66`
`67`	`67`	`@BeforeStep`
`68`	`68`	`public void initializeState(StepExecution stepExecution) {`
`69`		`- this.list = new ArrayList<String>();`
	`69`	`+ this.list = new ArrayList<>();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@AfterStep`