diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java index a47dbcb4e..752b26d28 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java @@ -93,7 +93,7 @@ public class AsyncItemProcessor implements ItemProcessor>, In */ public Future process(final I item) throws Exception { final StepExecution stepExecution = getStepExecution(); - FutureTask task = new FutureTask(new Callable() { + FutureTask task = new FutureTask<>(new Callable() { public O call() throws Exception { if (stepExecution != null) { StepSynchronizationManager.register(stepExecution); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java index 72e652af7..4d63d5075 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java @@ -59,7 +59,7 @@ public class AsyncItemWriter implements ItemStreamWriter>, Initiali * @throws Exception The exception returned by the Future if one was thrown */ public void write(List> items) throws Exception { - List list = new ArrayList(); + List list = new ArrayList<>(); for (Future future : items) { try { T item = future.get(); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java index 25a902b67..346b2479b 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java @@ -104,7 +104,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo if (logger.isDebugEnabled()) { logger.debug("Dispatching chunk: " + request); } - messagingGateway.send(new GenericMessage>(request)); + messagingGateway.send(new GenericMessage<>(request)); localState.incrementExpected(); } @@ -171,7 +171,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo } public Collection getStepContributions() { - List contributions = new ArrayList(); + List contributions = new ArrayList<>(); for (ChunkResponse response : localState.pollChunkResponses()) { StepContribution contribution = response.getStepContribution(); if (logger.isDebugEnabled()) { @@ -274,14 +274,14 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo private StepExecution stepExecution; - private final Queue contributions = new LinkedBlockingQueue(); + private final Queue contributions = new LinkedBlockingQueue<>(); public int getExpecting() { return expected.get() - actual.get(); } public ChunkRequest getRequest(List items) { - return new ChunkRequest(current.incrementAndGet(), items, getJobId(), createStepContribution()); + return new ChunkRequest<>(current.incrementAndGet(), items, getJobId(), createStepContribution()); } public void open(int expectedValue, int actualValue) { @@ -290,7 +290,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo } public Collection pollChunkResponses() { - Collection set = new ArrayList(); + Collection set = new ArrayList<>(); synchronized (contributions) { ChunkResponse item = contributions.poll(); while (item != null) { diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java index 8c57473f9..23668bc12 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java @@ -101,7 +101,7 @@ public class ChunkProcessorChunkHandler implements ChunkHandler, Initializ */ private Throwable process(ChunkRequest chunkRequest, StepContribution stepContribution) throws Exception { - Chunk chunk = new Chunk(chunkRequest.getItems()); + Chunk chunk = new Chunk<>(chunkRequest.getItems()); Throwable failure = null; try { chunkProcessor.process(stepContribution, chunk); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java index 98a721c87..580e692d9 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java @@ -139,7 +139,7 @@ public class RemoteChunkHandlerFactoryBean implements FactoryBean handler = new ChunkProcessorChunkHandler(); + ChunkProcessorChunkHandler handler = new ChunkProcessorChunkHandler<>(); setNonBuffering(chunkProcessor); handler.setChunkProcessor(chunkProcessor); // TODO: create step context for the processor in case it has @@ -170,7 +170,7 @@ public class RemoteChunkHandlerFactoryBean implements FactoryBean tasklet, ItemWriter chunkWriter, final StepContributionSource stepContributionSource) { - setField(tasklet, "chunkProcessor", new SimpleChunkProcessor(new PassThroughItemProcessor(), + setField(tasklet, "chunkProcessor", new SimpleChunkProcessor(new PassThroughItemProcessor<>(), chunkWriter) { @Override protected void write(StepContribution contribution, Chunk inputs, Chunk outputs) throws Exception { diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java index 851903dfc..a491c10d6 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java @@ -237,7 +237,7 @@ public class MessageChannelPartitionHandler implements PartitionHandler, Initial } private Collection pollReplies(final StepExecution masterStepExecution, final Set split) throws Exception { - final Collection result = new ArrayList(split.size()); + final Collection result = new ArrayList<>(split.size()); Callable> callback = new Callable>() { @Override @@ -269,7 +269,7 @@ public class MessageChannelPartitionHandler implements PartitionHandler, Initial } }; - Poller> poller = new DirectPoller>(pollInterval); + Poller> poller = new DirectPoller<>(pollInterval); Future> resultsFuture = poller.poll(callback); if(timeout >= 0) { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java index 1ac30d931..5e2a2c649 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java @@ -25,7 +25,7 @@ public class SmokeTests { @Autowired private PollableChannel smokeout; - + @Test public void testDummyWithSimpleAssert() throws Exception { assertTrue(true); @@ -33,7 +33,7 @@ public class SmokeTests { @Test public void testVanillaSendAndReceive() throws Exception { - smokein.send(new GenericMessage("foo")); + smokein.send(new GenericMessage<>("foo")); @SuppressWarnings("unchecked") Message message = (Message) smokeout.receive(100); String result = message == null ? null : message.getPayload(); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java index 1a3fa2efd..79dc11105 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java @@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration public class AsyncItemProcessorMessagingGatewayTests { - private final AsyncItemProcessor processor = new AsyncItemProcessor(); + private final AsyncItemProcessor processor = new AsyncItemProcessor<>(); private final StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters());; @@ -82,7 +82,7 @@ public class AsyncItemProcessorMessagingGatewayTests { public void testMultiExecution() throws Exception { processor.setDelegate(delegate); processor.setTaskExecutor(new SimpleAsyncTaskExecutor()); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (int count = 0; count < 10; count++) { list.add(processor.process("foo" + count)); } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java index 9636d870a..8d4867c43 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java @@ -33,7 +33,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; public class AsyncItemProcessorTests { - private AsyncItemProcessor processor = new AsyncItemProcessor(); + private AsyncItemProcessor processor = new AsyncItemProcessor<>(); private ItemProcessor delegate = new ItemProcessor() { public String process(String item) throws Exception { @@ -75,7 +75,7 @@ public class AsyncItemProcessorTests { public void testMultiExecution() throws Exception { processor.setDelegate(delegate); processor.setTaskExecutor(new SimpleAsyncTaskExecutor()); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (int count = 0; count < 10; count++) { list.add(processor.process("foo" + count)); } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java index 0af171cc8..9ddf97919 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java @@ -50,23 +50,23 @@ public class AsyncItemWriterTests { @Before public void setup() { taskExecutor = new SimpleAsyncTaskExecutor(); - writtenItems = new ArrayList(); - writer = new AsyncItemWriter(); + writtenItems = new ArrayList<>(); + writer = new AsyncItemWriter<>(); } @Test public void testRoseyScenario() throws Exception { writer.setDelegate(new ListItemWriter(writtenItems)); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { return "foo"; } })); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { return "bar"; @@ -87,16 +87,16 @@ public class AsyncItemWriterTests { @Test public void testFilteredItem() throws Exception { writer.setDelegate(new ListItemWriter(writtenItems)); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { return "foo"; } })); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { return null; @@ -116,16 +116,16 @@ public class AsyncItemWriterTests { @Test public void testException() throws Exception { writer.setDelegate(new ListItemWriter(writtenItems)); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { return "foo"; } })); - processedItems.add(new FutureTask(new Callable() { + processedItems.add(new FutureTask<>(new Callable() { @Override public String call() throws Exception { throw new RuntimeException("This was expected"); @@ -149,7 +149,7 @@ public class AsyncItemWriterTests { public void testExecutionException() { ListItemWriter delegate = new ListItemWriter(writtenItems); writer.setDelegate(delegate); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); processedItems.add(new Future() { @@ -194,7 +194,7 @@ public class AsyncItemWriterTests { ListItemStreamWriter itemWriter = new ListItemStreamWriter(writtenItems); writer.setDelegate(itemWriter); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); ExecutionContext executionContext = new ExecutionContext(); writer.open(executionContext); @@ -212,7 +212,7 @@ public class AsyncItemWriterTests { ListItemWriter itemWriter = new ListItemWriter(writtenItems); writer.setDelegate(itemWriter); - List> processedItems = new ArrayList>(); + List> processedItems = new ArrayList<>(); ExecutionContext executionContext = new ExecutionContext(); writer.open(executionContext); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java index ce525b884..68bf1f36c 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; @ContextConfiguration public class PollingAsyncItemProcessorMessagingGatewayTests { - private AsyncItemProcessor processor = new AsyncItemProcessor(); + private AsyncItemProcessor processor = new AsyncItemProcessor<>(); private StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters());; @@ -83,7 +83,7 @@ public class PollingAsyncItemProcessorMessagingGatewayTests { public void testMultiExecution() throws Exception { processor.setDelegate(delegate); processor.setTaskExecutor(new SimpleAsyncTaskExecutor()); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (int count = 0; count < 10; count++) { list.add(processor.process("foo" + count)); } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java index 009bb7fb8..30e934a85 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) public class ChunkMessageItemWriterIntegrationTests { - private final ChunkMessageChannelItemWriter writer = new ChunkMessageChannelItemWriter(); + private final ChunkMessageChannelItemWriter writer = new ChunkMessageChannelItemWriter<>(); @Autowired @Qualifier("requests") @@ -57,7 +57,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Qualifier("replies") private PollableChannel replies; - private final SimpleStepFactoryBean factory = new SimpleStepFactoryBean(); + private final SimpleStepFactoryBean factory = new SimpleStepFactoryBean<>(); private SimpleJobRepository jobRepository; @@ -115,7 +115,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testVanillaIteration() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = factory.getObject(); @@ -133,7 +133,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestart() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = factory.getObject(); @@ -158,7 +158,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestartWithBadMessagesFromAnotherJob() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = factory.getObject(); @@ -192,14 +192,14 @@ public class ChunkMessageItemWriterIntegrationTests { StepContribution stepContribution = new JobExecution(new JobInstance(0L, "job"), new JobParameters()) .createStepExecution("step").createStepContribution(); ChunkRequest chunk = new ChunkRequest(0, StringUtils.commaDelimitedListToSet(string), jobId, stepContribution); - GenericMessage message = new GenericMessage(chunk); + GenericMessage message = new GenericMessage<>(chunk); return message; } @Test public void testEarlyCompletionSignalledInHandler() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,fail,3,4,5,6")))); factory.setCommitInterval(2); @@ -226,7 +226,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestartWithNoBacklog() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = factory.getObject(); @@ -262,7 +262,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testFailureInStepListener() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils .commaDelimitedListToStringArray("wait,fail,3,4,5,6")))); Step step = factory.getObject(); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java index 549e249a2..2b729ee7a 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java @@ -12,7 +12,7 @@ import org.springframework.util.StringUtils; public class ChunkProcessorChunkHandlerTests { - private ChunkProcessorChunkHandler handler = new ChunkProcessorChunkHandler(); + private ChunkProcessorChunkHandler handler = new ChunkProcessorChunkHandler<>(); protected int count = 0; @@ -24,7 +24,7 @@ public class ChunkProcessorChunkHandlerTests { } }); StepContribution stepContribution = MetaDataInstanceFactory.createStepExecution().createStepContribution(); - ChunkResponse response = handler.handleChunk(new ChunkRequest(0, StringUtils + ChunkResponse response = handler.handleChunk(new ChunkRequest<>(0, StringUtils .commaDelimitedListToSet("foo,bar"), 12L, stepContribution)); assertEquals(stepContribution, response.getStepContribution()); assertEquals(12, response.getJobId().longValue()); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java index 898fd0cc5..c21f379ac 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java @@ -30,7 +30,7 @@ import org.springframework.util.SerializationUtils; */ public class ChunkRequestTests { - private ChunkRequest request = new ChunkRequest(0, Arrays.asList("foo", "bar"), + private ChunkRequest request = new ChunkRequest<>(0, Arrays.asList("foo", "bar"), 111L, MetaDataInstanceFactory.createStepExecution().createStepContribution()); @Test diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java index d319f4bc8..a2d5a167b 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java @@ -48,7 +48,7 @@ public class MessageSourcePollerInterceptorTests { } public Message receive() { - return new GenericMessage(payload); + return new GenericMessage<>(payload); } } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemReader.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemReader.java index 1da3c4255..132ff0841 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemReader.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemReader.java @@ -30,7 +30,7 @@ public class TestItemReader implements ItemReader { */ public static final String WAIT_ON = "wait"; - private List items = new ArrayList(); + private List items = new ArrayList<>(); /** * @param items the items to set diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java index e89cdf342..3a4d36408 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java @@ -70,7 +70,7 @@ public class ResourceSplitterIntegrationTests { @Ignore //FIXME // This broke with Integration 2.0 in a milestone, so watch out when upgrading... public void testVanillaConversion() throws Exception { - resources.send(new GenericMessage("classpath:*-context.xml")); + resources.send(new GenericMessage<>("classpath:*-context.xml")); Message message = (Message) requests.receive(200L); assertNotNull(message); message = (Message) requests.receive(100L); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java index 955df82a7..7e1c31e9c 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java @@ -86,7 +86,7 @@ public class JobLaunchingGatewayIntegrationTests { @DirtiesContext @SuppressWarnings("unchecked") public void testNoReply() { - GenericMessage trigger = new GenericMessage(new JobLaunchRequest(job, + GenericMessage trigger = new GenericMessage<>(new JobLaunchRequest(job, new JobParameters())); try { requestChannel.send(trigger); @@ -107,10 +107,10 @@ public class JobLaunchingGatewayIntegrationTests { public void testReply() { JobParametersBuilder builder = new JobParametersBuilder(); builder.addString("dontclash", "12"); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(MessageHeaders.REPLY_CHANNEL, "response"); MessageHeaders headers = new MessageHeaders(map); - GenericMessage trigger = new GenericMessage(new JobLaunchRequest(job, + GenericMessage trigger = new GenericMessage<>(new JobLaunchRequest(job, builder.toJobParameters()), headers); requestChannel.send(trigger); Message executionMessage = (Message) responseChannel.receive(1000); @@ -149,10 +149,10 @@ public class JobLaunchingGatewayIntegrationTests { JobParametersBuilder builder = new JobParametersBuilder(); builder.addString("dontclash", "12"); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(MessageHeaders.REPLY_CHANNEL, "response"); MessageHeaders headers = new MessageHeaders(map); - GenericMessage trigger = new GenericMessage(new JobLaunchRequest(testJob, + GenericMessage trigger = new GenericMessage<>(new JobLaunchRequest(testJob, builder.toJobParameters()), headers); requestChannel.send(trigger); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java index e67c3a73a..fb8ea90c6 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java @@ -52,7 +52,7 @@ public class JobLaunchingMessageHandlerIntegrationTests { @DirtiesContext @SuppressWarnings("unchecked") public void testNoReply() { - GenericMessage trigger = new GenericMessage(new JobLaunchRequest(job, + GenericMessage trigger = new GenericMessage<>(new JobLaunchRequest(job, new JobParameters())); try { requestChannel.send(trigger); @@ -72,10 +72,10 @@ public class JobLaunchingMessageHandlerIntegrationTests { public void testReply() { JobParametersBuilder builder = new JobParametersBuilder(); builder.addString("dontclash", "12"); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(MessageHeaders.REPLY_CHANNEL, "response"); MessageHeaders headers = new MessageHeaders(map); - GenericMessage trigger = new GenericMessage(new JobLaunchRequest(job, + GenericMessage trigger = new GenericMessage<>(new JobLaunchRequest(job, builder.toJobParameters()), headers); requestChannel.send(trigger); Message executionMessage = (Message) responseChannel.receive(1000); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java index 180110462..6500d017e 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java @@ -41,9 +41,9 @@ public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContext private static class StubJobLauncher implements JobLauncher { - List jobs = new ArrayList(); + List jobs = new ArrayList<>(); - List parameters = new ArrayList(); + List parameters = new ArrayList<>(); AtomicLong jobId = new AtomicLong(); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java index c8fdc2ef2..b25e69836 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java @@ -29,13 +29,13 @@ public class RepeatTransactionalPollingIntegrationTests implements ApplicationCo private Log logger = LogFactory.getLog(getClass()); - private static List processed = new ArrayList(); + private static List processed = new ArrayList<>(); private static List expected; - private static List handled = new ArrayList(); + private static List handled = new ArrayList<>(); - private static List list = new ArrayList(); + private static List list = new ArrayList<>(); private Lifecycle bus; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java index a999c5bc5..d42be7cbe 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java @@ -30,7 +30,7 @@ public class RetryRepeatTransactionalPollingIntegrationTests implements Applicat private Log logger = LogFactory.getLog(getClass()); - private volatile static List list = new ArrayList(); + private volatile static List list = new ArrayList<>(); @Autowired private SimpleRecoverer recoverer; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java index cc91f05e5..4d22c27d8 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java @@ -28,7 +28,7 @@ public class RetryTransactionalPollingIntegrationTests implements ApplicationCon private Log logger = LogFactory.getLog(getClass()); - private static List list = new ArrayList(); + private static List list = new ArrayList<>(); @Autowired private SimpleRecoverer recoverer; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java index 7a5c34e66..681899abb 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java @@ -15,7 +15,7 @@ public final class SimpleRecoverer implements MethodInvocationRecoverer private Log logger = LogFactory.getLog(getClass()); - private final List recovered = new ArrayList(); + private final List recovered = new ArrayList<>(); /** * Public getter for the recovered. diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java index 22d75adf3..8b9ca679a 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java @@ -14,9 +14,9 @@ public class SimpleService implements Service { private Log logger = LogFactory.getLog(getClass()); - private List processed = new CopyOnWriteArrayList(); + private List processed = new CopyOnWriteArrayList<>(); - private List expected = new ArrayList(); + private List expected = new ArrayList<>(); private int count = 0; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java index dae719a92..e57fd7ceb 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java @@ -30,13 +30,13 @@ public class TransactionalPollingIntegrationTests implements ApplicationContextA private Log logger = LogFactory.getLog(getClass()); - private static List processed = new ArrayList(); + private static List processed = new ArrayList<>(); - private static List handled = new ArrayList(); + private static List handled = new ArrayList<>(); - private static List expected = new ArrayList(); + private static List expected = new ArrayList<>(); - private static List list = new ArrayList(); + private static List list = new ArrayList<>(); private Lifecycle bus;