Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace explicit type with diamond operator in integration module

Browse Source
This commit is contained in:
Drummond Dawson
2018-10-09 19:53:42 -04:00
committed by Mahmoud Ben Hassine
parent eb9e0d1466
commit 3fe5fc3427
26 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java
View File

@@ -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<String>("foo"));
smokein.send(new GenericMessage<>("foo"));
@SuppressWarnings("unchecked")
Message<String> message = (Message<String>) smokeout.receive(100);
String result = message == null ? null : message.getPayload();

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java
View File

@@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration
public class AsyncItemProcessorMessagingGatewayTests {
private final AsyncItemProcessor<String, String> processor = new AsyncItemProcessor<String, String>();
private final AsyncItemProcessor<String, String> 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<Future<String>> list = new ArrayList<Future<String>>();
List<Future<String>> list = new ArrayList<>();
for (int count = 0; count < 10; count++) {
list.add(processor.process("foo" + count));
}

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java
View File

@@ -33,7 +33,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor;
public class AsyncItemProcessorTests {
private AsyncItemProcessor<String, String> processor = new AsyncItemProcessor<String, String>();
private AsyncItemProcessor<String, String> processor = new AsyncItemProcessor<>();
private ItemProcessor<String, String> delegate = new ItemProcessor<String, String>() {
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<Future<String>> list = new ArrayList<Future<String>>();
List<Future<String>> list = new ArrayList<>();
for (int count = 0; count < 10; count++) {
list.add(processor.process("foo" + count));
}

28
spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java
View File

@@ -50,23 +50,23 @@ public class AsyncItemWriterTests {
@Before
public void setup() {
taskExecutor = new SimpleAsyncTaskExecutor();
writtenItems = new ArrayList<String>();
writer = new AsyncItemWriter<String>();
writtenItems = new ArrayList<>();
writer = new AsyncItemWriter<>();
}
@Test
public void testRoseyScenario() throws Exception {
writer.setDelegate(new ListItemWriter(writtenItems));
List<FutureTask<String>> processedItems = new ArrayList<FutureTask<String>>();
List<FutureTask<String>> processedItems = new ArrayList<>();
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@Override
public String call() throws Exception {
return "foo";
}
}));
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@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<FutureTask<String>> processedItems = new ArrayList<FutureTask<String>>();
List<FutureTask<String>> processedItems = new ArrayList<>();
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@Override
public String call() throws Exception {
return "foo";
}
}));
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@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<FutureTask<String>> processedItems = new ArrayList<FutureTask<String>>();
List<FutureTask<String>> processedItems = new ArrayList<>();
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@Override
public String call() throws Exception {
return "foo";
}
}));
processedItems.add(new FutureTask<String>(new Callable<String>() {
processedItems.add(new FutureTask<>(new Callable<String>() {
@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<Future<String>> processedItems = new ArrayList<Future<String>>();
List<Future<String>> processedItems = new ArrayList<>();
processedItems.add(new Future<String>() {
@@ -194,7 +194,7 @@ public class AsyncItemWriterTests {
ListItemStreamWriter itemWriter = new ListItemStreamWriter(writtenItems);
writer.setDelegate(itemWriter);
List<FutureTask<String>> processedItems = new ArrayList<FutureTask<String>>();
List<FutureTask<String>> 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<FutureTask<String>> processedItems = new ArrayList<FutureTask<String>>();
List<FutureTask<String>> processedItems = new ArrayList<>();
ExecutionContext executionContext = new ExecutionContext();
writer.open(executionContext);

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java
View File

@@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue;
@ContextConfiguration
public class PollingAsyncItemProcessorMessagingGatewayTests {
private AsyncItemProcessor<String, String> processor = new AsyncItemProcessor<String, String>();
private AsyncItemProcessor<String, String> 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<Future<String>> list = new ArrayList<Future<String>>();
List<Future<String>> list = new ArrayList<>();
for (int count = 0; count < 10; count++) {
list.add(processor.process("foo" + count));
}

18
spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
View File

@@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
public class ChunkMessageItemWriterIntegrationTests {
private final ChunkMessageChannelItemWriter<Object> writer = new ChunkMessageChannelItemWriter<Object>();
private final ChunkMessageChannelItemWriter<Object> writer = new ChunkMessageChannelItemWriter<>();
@Autowired
@Qualifier("requests")
@@ -57,7 +57,7 @@ public class ChunkMessageItemWriterIntegrationTests {
@Qualifier("replies")
private PollableChannel replies;
private final SimpleStepFactoryBean<Object, Object> factory = new SimpleStepFactoryBean<Object, Object>();
private final SimpleStepFactoryBean<Object, Object> factory = new SimpleStepFactoryBean<>();
private SimpleJobRepository jobRepository;
@@ -115,7 +115,7 @@ public class ChunkMessageItemWriterIntegrationTests {
@Test
public void testVanillaIteration() throws Exception {
factory.setItemReader(new ListItemReader<String>(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<String>(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<String>(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<ChunkRequest> message = new GenericMessage<ChunkRequest>(chunk);
GenericMessage<ChunkRequest> message = new GenericMessage<>(chunk);
return message;
}
@Test
public void testEarlyCompletionSignalledInHandler() throws Exception {
factory.setItemReader(new ListItemReader<String>(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<String>(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<String>(Arrays.asList(StringUtils
factory.setItemReader(new ListItemReader<>(Arrays.asList(StringUtils
.commaDelimitedListToStringArray("wait,fail,3,4,5,6"))));
Step step = factory.getObject();

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
View File

@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
public class ChunkProcessorChunkHandlerTests {
private ChunkProcessorChunkHandler<Object> handler = new ChunkProcessorChunkHandler<Object>();
private ChunkProcessorChunkHandler<Object> 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<Object>(0, StringUtils
ChunkResponse response = handler.handleChunk(new ChunkRequest<>(0, StringUtils
.commaDelimitedListToSet("foo,bar"), 12L, stepContribution));
assertEquals(stepContribution, response.getStepContribution());
assertEquals(12, response.getJobId().longValue());

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.util.SerializationUtils;
*/
public class ChunkRequestTests {
private ChunkRequest<String> request = new ChunkRequest<String>(0, Arrays.asList("foo", "bar"),
private ChunkRequest<String> request = new ChunkRequest<>(0, Arrays.asList("foo", "bar"),
111L, MetaDataInstanceFactory.createStepExecution().createStepContribution());
@Test

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java
View File

@@ -48,7 +48,7 @@ public class MessageSourcePollerInterceptorTests {
}
public Message<String> receive() {
return new GenericMessage<String>(payload);
return new GenericMessage<>(payload);
}
}

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemReader.java
View File

@@ -30,7 +30,7 @@ public class TestItemReader<T> implements ItemReader<T> {
*/
public static final String WAIT_ON = "wait";
private List<T> items = new ArrayList<T>();
private List<T> items = new ArrayList<>();
/**
* @param items the items to set

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java
View File

@@ -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<String>("classpath:*-context.xml"));
resources.send(new GenericMessage<>("classpath:*-context.xml"));
Message<Resource> message = (Message<Resource>) requests.receive(200L);
assertNotNull(message);
message = (Message<Resource>) requests.receive(100L);

10
spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java
View File

@@ -86,7 +86,7 @@ public class JobLaunchingGatewayIntegrationTests {
@DirtiesContext
@SuppressWarnings("unchecked")
public void testNoReply() {
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<JobLaunchRequest>(new JobLaunchRequest(job,
GenericMessage<JobLaunchRequest> 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<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put(MessageHeaders.REPLY_CHANNEL, "response");
MessageHeaders headers = new MessageHeaders(map);
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<JobLaunchRequest>(new JobLaunchRequest(job,
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<>(new JobLaunchRequest(job,
builder.toJobParameters()), headers);
requestChannel.send(trigger);
Message<JobExecution> executionMessage = (Message<JobExecution>) responseChannel.receive(1000);
@@ -149,10 +149,10 @@ public class JobLaunchingGatewayIntegrationTests {
JobParametersBuilder builder = new JobParametersBuilder();
builder.addString("dontclash", "12");
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put(MessageHeaders.REPLY_CHANNEL, "response");
MessageHeaders headers = new MessageHeaders(map);
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<JobLaunchRequest>(new JobLaunchRequest(testJob,
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<>(new JobLaunchRequest(testJob,
builder.toJobParameters()), headers);
requestChannel.send(trigger);

6
spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
View File

@@ -52,7 +52,7 @@ public class JobLaunchingMessageHandlerIntegrationTests {
@DirtiesContext
@SuppressWarnings("unchecked")
public void testNoReply() {
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<JobLaunchRequest>(new JobLaunchRequest(job,
GenericMessage<JobLaunchRequest> 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<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put(MessageHeaders.REPLY_CHANNEL, "response");
MessageHeaders headers = new MessageHeaders(map);
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<JobLaunchRequest>(new JobLaunchRequest(job,
GenericMessage<JobLaunchRequest> trigger = new GenericMessage<>(new JobLaunchRequest(job,
builder.toJobParameters()), headers);
requestChannel.send(trigger);
Message<JobExecution> executionMessage = (Message<JobExecution>) responseChannel.receive(1000);

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
View File

@@ -41,9 +41,9 @@ public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContext
private static class StubJobLauncher implements JobLauncher {
List<Job> jobs = new ArrayList<Job>();
List<Job> jobs = new ArrayList<>();
List<JobParameters> parameters = new ArrayList<JobParameters>();
List<JobParameters> parameters = new ArrayList<>();
AtomicLong jobId = new AtomicLong();

6
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java
View File

@@ -29,13 +29,13 @@ public class RepeatTransactionalPollingIntegrationTests implements ApplicationCo
private Log logger = LogFactory.getLog(getClass());
private static List<String> processed = new ArrayList<String>();
private static List<String> processed = new ArrayList<>();
private static List<String> expected;
private static List<String> handled = new ArrayList<String>();
private static List<String> handled = new ArrayList<>();
private static List<String> list = new ArrayList<String>();
private static List<String> list = new ArrayList<>();
private Lifecycle bus;

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java
View File

@@ -30,7 +30,7 @@ public class RetryRepeatTransactionalPollingIntegrationTests implements Applicat
private Log logger = LogFactory.getLog(getClass());
private volatile static List<String> list = new ArrayList<String>();
private volatile static List<String> list = new ArrayList<>();
@Autowired
private SimpleRecoverer recoverer;

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java
View File

@@ -28,7 +28,7 @@ public class RetryTransactionalPollingIntegrationTests implements ApplicationCon
private Log logger = LogFactory.getLog(getClass());
private static List<String> list = new ArrayList<String>();
private static List<String> list = new ArrayList<>();
@Autowired
private SimpleRecoverer recoverer;

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java
View File

@@ -15,7 +15,7 @@ public final class SimpleRecoverer implements MethodInvocationRecoverer<String>
private Log logger = LogFactory.getLog(getClass());
private final List<String> recovered = new ArrayList<String>();
private final List<String> recovered = new ArrayList<>();
/**
* Public getter for the recovered.

4
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java
View File

@@ -14,9 +14,9 @@ public class SimpleService implements Service {
private Log logger = LogFactory.getLog(getClass());
private List<String> processed = new CopyOnWriteArrayList<String>();
private List<String> processed = new CopyOnWriteArrayList<>();
private List<String> expected = new ArrayList<String>();
private List<String> expected = new ArrayList<>();
private int count = 0;

8
spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java
View File

@@ -30,13 +30,13 @@ public class TransactionalPollingIntegrationTests implements ApplicationContextA
private Log logger = LogFactory.getLog(getClass());
private static List<String> processed = new ArrayList<String>();
private static List<String> processed = new ArrayList<>();
private static List<String> handled = new ArrayList<String>();
private static List<String> handled = new ArrayList<>();
private static List<String> expected = new ArrayList<String>();
private static List<String> expected = new ArrayList<>();
private static List<String> list = new ArrayList<String>();
private static List<String> list = new ArrayList<>();
private Lifecycle bus;