diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java index 7cafd7627..f762bb405 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ColumnRangePartitioner.java @@ -82,7 +82,7 @@ public class ColumnRangePartitioner implements Partitioner { int max = jdbcTemplate.queryForObject("SELECT MAX(" + column + ") from " + table, Integer.class); int targetSize = (max - min) / gridSize + 1; - Map result = new HashMap(); + Map result = new HashMap<>(); int number = 0; int start = min; int end = start + targetSize - 1; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java index a70cf070a..160d147ec 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java @@ -123,7 +123,7 @@ InitializingBean, DisposableBean { } }, id); - return new ProcessIndicatorItemWrapper(id, result); + return new ProcessIndicatorItemWrapper<>(id, result); } @Override diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java index a25f878a4..d5e7546e5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java @@ -61,6 +61,6 @@ public class RetrySampleConfiguration { @Bean protected ItemWriter writer() { - return new RetrySampleItemWriter(); + return new RetrySampleItemWriter<>(); } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailErrorHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailErrorHandler.java index 5e1db742f..edab294c8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailErrorHandler.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailErrorHandler.java @@ -37,7 +37,7 @@ import org.springframework.mail.MailMessage; public class TestMailErrorHandler implements MailErrorHandler { private static final Log LOGGER = LogFactory.getLog(TestMailErrorHandler.class); - private List failedMessages = new ArrayList(); + private List failedMessages = new ArrayList<>(); @Override public void handle(MailMessage failedMessage, Exception ex) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java index 5ba36eca2..ae276ead2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java @@ -96,7 +96,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper(delegate.mapFieldSet(fieldSet)); + return new AggregateItem<>(delegate.mapFieldSet(fieldSet)); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java index ae7732a05..3dcebfaa6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java @@ -105,7 +105,7 @@ public class AggregateItemReader implements ItemReader> { * */ private class ResultHolder { - private List records = new ArrayList(); + private List records = new ArrayList<>(); private boolean exhausted = false; public List getRecords() { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java index 8a38df6fb..b6f17b63b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java @@ -137,7 +137,7 @@ public class OrderItemReader implements ItemReader { else if (LineItem.LINE_ID_ITEM.equals(lineId)) { log.debug("MAPPING LINE ITEM"); if (order.getLineItems() == null) { - order.setLineItems(new ArrayList()); + order.setLineItems(new ArrayList<>()); } order.getLineItems().add(itemMapper.mapFieldSet(fieldSet)); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java index 5b66d519b..323ab6f9f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java @@ -32,9 +32,9 @@ import org.springframework.validation.Validator; public class OrderValidator implements Validator { - private static final List CARD_TYPES = new ArrayList(); - private static final List SHIPPER_IDS = new ArrayList(); - private static final List SHIPPER_TYPES = new ArrayList(); + private static final List CARD_TYPES = new ArrayList<>(); + private static final List SHIPPER_IDS = new ArrayList<>(); + private static final List SHIPPER_TYPES = new ArrayList<>(); private static final long MAX_ID = 9999999999L; private static final BigDecimal BD_MIN = new BigDecimal("0.0"); private static final BigDecimal BD_MAX = new BigDecimal("99999999.99"); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java index 75bc01c03..8f00e5567 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java @@ -27,7 +27,7 @@ public class Person { private String last_name = ""; private int age = 0; private Address address = new Address(); - private List children = new ArrayList(); + private List children = new ArrayList<>(); public Person() { children.add(new Child()); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java index e647ebfb0..2c61b1201 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java @@ -43,7 +43,7 @@ public class PersonService { Person person = new Person(); Address address = new Address(); Child child = new Child(); - List children = new ArrayList(1); + List children = new ArrayList<>(1); children.add(child); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java index 74d58b8a8..392870327 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerOperation.java @@ -37,7 +37,7 @@ public enum CustomerOperation { } static{ - CODE_MAP = new HashMap(); + CODE_MAP = new HashMap<>(); for(CustomerOperation operation:values()){ CODE_MAP.put(operation.getCode(), operation); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java index 6b4c51507..bdd702628 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java @@ -34,7 +34,7 @@ public class HibernateCreditDao implements CustomerCreditDao, RepeatListener { private int failOnFlush = -1; - private List errors = new ArrayList(); + private List errors = new ArrayList<>(); private SessionFactory sessionFactory; public void setSessionFactory(SessionFactory sessionFactory) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java index ae0922ed0..24e5cb70a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java @@ -43,7 +43,7 @@ public class TradeWriter extends ItemStreamSupport implements ItemWriter private TradeDao dao; - private List failingCustomers = new ArrayList(); + private List failingCustomers = new ArrayList<>(); private BigDecimal totalPrice = BigDecimal.ZERO; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java index d4ca18fab..db6486742 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java @@ -36,7 +36,7 @@ public class DefaultJobLoader implements JobLoader, ApplicationContextAware { private ApplicationContext applicationContext; - private Map configurations = new HashMap(); + private Map configurations = new HashMap<>(); @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { @@ -49,7 +49,7 @@ public class DefaultJobLoader implements JobLoader, ApplicationContextAware { @Override public Map getConfigurations() { - Map result = new HashMap(configurations); + Map result = new HashMap<>(configurations); for (String jobName : registry.getJobNames()) { try { Job configuration = registry.getJob(jobName); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java index 98f7ab0ea..f26b1fe4f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java @@ -47,7 +47,7 @@ public class CustomerFilterJobFunctionalTests { private List customers; private int activeRow = 0; private JdbcOperations jdbcTemplate; - private Map credits = new HashMap(); + private Map credits = new HashMap<>(); @Autowired private JobLauncherTestUtils jobLauncherTestUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index 80824beed..91e65db7d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -154,7 +154,7 @@ public class HibernateFailureJobFunctionalTests { * Credit was increased by CREDIT_INCREASE */ protected void validatePostConditions() throws Exception { - final List matches = new ArrayList(); + final List matches = new ArrayList<>(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java index 8eb4cadb5..2f34bb714 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java @@ -69,7 +69,7 @@ public class PartitionFileJobFunctionalTests implements ApplicationContextAware .containsBeanDefinition("outputTestReader")); open(inputReader); - List inputs = new ArrayList(getCredits(inputReader)); + List inputs = new ArrayList<>(getCredits(inputReader)); close(inputReader); JobExecution jobExecution = jobLauncherTestUtils.launchJob(); @@ -79,7 +79,7 @@ public class PartitionFileJobFunctionalTests implements ApplicationContextAware ItemReader outputReader = (ItemReader) applicationContext .getBean("outputTestReader"); open(outputReader); - List outputs = new ArrayList(getCredits(outputReader)); + List outputs = new ArrayList<>(getCredits(outputReader)); close(outputReader); assertEquals(inputs.size(), outputs.size()); @@ -98,7 +98,7 @@ public class PartitionFileJobFunctionalTests implements ApplicationContextAware */ private Set getCredits(ItemReader reader) throws Exception { CustomerCredit credit; - Set result = new LinkedHashSet(); + Set result = new LinkedHashSet<>(); while ((credit = reader.read()) != null) { result.add(credit); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java index 492b26396..1ac781811 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java @@ -69,7 +69,7 @@ public class PartitionJdbcJobFunctionalTests implements ApplicationContextAware .containsBeanDefinition("outputTestReader")); open(inputReader); - List inputs = new ArrayList(getCredits(inputReader)); + List inputs = new ArrayList<>(getCredits(inputReader)); close(inputReader); JobExecution jobExecution = jobLauncherTestUtils.launchJob(); @@ -79,7 +79,7 @@ public class PartitionJdbcJobFunctionalTests implements ApplicationContextAware ItemReader outputReader = (ItemReader) applicationContext .getBean("outputTestReader"); open(outputReader); - List outputs = new ArrayList(getCredits(outputReader)); + List outputs = new ArrayList<>(getCredits(outputReader)); close(outputReader); assertEquals(inputs.size(), outputs.size()); @@ -98,7 +98,7 @@ public class PartitionJdbcJobFunctionalTests implements ApplicationContextAware */ private Set getCredits(ItemReader reader) throws Exception { CustomerCredit credit; - Set result = new LinkedHashSet(); + Set result = new LinkedHashSet<>(); while ((credit = reader.read()) != null) { result.add(credit); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java index 9d05cb736..ec73f0161 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java @@ -53,7 +53,7 @@ public class TradeJobFunctionalTests { private List trades; private int activeRow = 0; private JdbcOperations jdbcTemplate; - private Map credits = new HashMap(); + private Map credits = new HashMap<>(); @Autowired private JobLauncherTestUtils jobLauncherTestUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java index 1867121c9..74ba4f2a4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java @@ -43,12 +43,12 @@ public class CustomItemReaderTests { */ @Before public void setUp() throws Exception { - List items = new ArrayList(); + List items = new ArrayList<>(); items.add("1"); items.add("2"); items.add("3"); - itemReader = new CustomItemReader(items); + itemReader = new CustomItemReader<>(items); } @Test @@ -65,11 +65,11 @@ public class CustomItemReaderTests { ((ItemStream)itemReader).open(executionContext); assertEquals("1", itemReader.read()); ((ItemStream)itemReader).update(executionContext); - List items = new ArrayList(); + List items = new ArrayList<>(); items.add("1"); items.add("2"); items.add("3"); - itemReader = new CustomItemReader(items); + itemReader = new CustomItemReader<>(items); ((ItemStream)itemReader).open(executionContext); assertEquals("2", itemReader.read()); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java index 58824750f..845a8dd5d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java @@ -36,7 +36,7 @@ import org.springframework.batch.support.transaction.TransactionAwareProxyFactor public class CustomItemWriterTests { @Test public void testFlush() throws Exception { - CustomItemWriter itemWriter = new CustomItemWriter(); + CustomItemWriter itemWriter = new CustomItemWriter<>(); itemWriter.write(Collections.singletonList("1")); assertEquals(1, itemWriter.getOutput().size()); itemWriter.write(Arrays.asList("2","3")); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java index bc74a2eb1..d1452575b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java @@ -43,8 +43,8 @@ public class ExceptionThrowingItemReaderProxyTests { public void testProcess() throws Exception { //create module and set item processor and iteration count - ExceptionThrowingItemReaderProxy itemReader = new ExceptionThrowingItemReaderProxy(); - itemReader.setDelegate(new ListItemReader(new ArrayList() {{ + ExceptionThrowingItemReaderProxy itemReader = new ExceptionThrowingItemReaderProxy<>(); + itemReader.setDelegate(new ListItemReader<>(new ArrayList() {{ add("a"); add("b"); add("c"); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java index 91b52f09b..3575395b1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java @@ -90,7 +90,7 @@ public class StagingItemReaderTests { String item = wrapper.getItem(); assertEquals("FOO", item); - StagingItemProcessor updater = new StagingItemProcessor(); + StagingItemProcessor updater = new StagingItemProcessor<>(); updater.setJdbcTemplate(jdbcTemplate); updater.process(wrapper); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java index bf893198c..d4ccc703f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; public class AggregateItemFieldSetMapperTests { - private AggregateItemFieldSetMapper mapper = new AggregateItemFieldSetMapper(); + private AggregateItemFieldSetMapper mapper = new AggregateItemFieldSetMapper<>(); @Test public void testDefaultBeginRecord() throws Exception { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java index db3a84e13..0af4299f4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java @@ -39,7 +39,7 @@ public class AggregateItemReaderTests { case 1: case 2: case 3: - return new AggregateItem("line"); + return new AggregateItem<>("line"); case 4: return AggregateItem.getFooter(); default: @@ -49,7 +49,7 @@ public class AggregateItemReaderTests { }; - provider = new AggregateItemReader(); + provider = new AggregateItemReader<>(); provider.setItemReader(input); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java index cd86e858a..46faa110f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java @@ -70,7 +70,7 @@ public class OrderValidatorTests { order.setOrderId(-5); order.setOrderDate(new Date(new Date().getTime() + 1000000000L)); order.setTotalLines(10); - order.setLineItems(new ArrayList()); + order.setLineItems(new ArrayList<>()); Errors errors = new BeanPropertyBindingResult(order, "validOrder"); @@ -85,7 +85,7 @@ public class OrderValidatorTests { order.setOrderId(Long.MAX_VALUE); order.setOrderDate(new Date(new Date().getTime() - 1000)); order.setTotalLines(0); - List items = new ArrayList(); + List items = new ArrayList<>(); items.add(new LineItem()); order.setLineItems(items); @@ -101,7 +101,7 @@ public class OrderValidatorTests { order.setOrderId(5L); order.setOrderDate(new Date(new Date().getTime() - 1000)); order.setTotalLines(1); - items = new ArrayList(); + items = new ArrayList<>(); items.add(new LineItem()); order.setLineItems(items); @@ -307,7 +307,7 @@ public class OrderValidatorTests { @Test public void testValidLineItems() { Order order = new Order(); - List lineItems = new ArrayList(); + List lineItems = new ArrayList<>(); lineItems.add(buildLineItem(-5, 5.00, 0, 0, 2, 3, 3, 30)); lineItems.add(buildLineItem(Long.MAX_VALUE, 5.00, 0, 0, 2, 3, 3, 30)); lineItems.add(buildLineItem(6, -5.00, 0, 0, 2, 3, 3, 0)); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java index c85532dde..ee57acd19 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/ItemTrackingTradeItemWriter.java @@ -27,7 +27,7 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; public class ItemTrackingTradeItemWriter implements ItemWriter { - private List items = new ArrayList(); + private List items = new ArrayList<>(); private String writeFailureISIN; private JdbcOperations jdbcTemplate; @@ -45,7 +45,7 @@ public class ItemTrackingTradeItemWriter implements ItemWriter { @Override public void write(List items) throws Exception { - List newItems = new ArrayList(); + List newItems = new ArrayList<>(); for (Trade t : items) { if (t.getIsin().equals(this.writeFailureISIN)) { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java index e849bf2bf..d43f728a6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java @@ -103,7 +103,7 @@ public abstract class AbstractIoSampleTests { */ private List getCredits(ItemReader reader) throws Exception { CustomerCredit credit; - List result = new ArrayList(); + List result = new ArrayList<>(); while ((credit = reader.read()) != null) { result.add(credit); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java index c1ddabd55..4c98dcdaf 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java @@ -35,7 +35,7 @@ public class MultiLineTradeItemWriter implements ItemWriter, ItemStream { @Override public void write(List items) throws Exception { - List lines = new ArrayList(); + List lines = new ArrayList<>(); for (Trade t : items) { lines.add("BEGIN"); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java index 39617b982..92df0a7db 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java @@ -37,7 +37,7 @@ public class JobExecutionNotificationPublisherTests { @Test public void testRepeatOperationsOpenUsed() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); publisher.setNotificationPublisher(new NotificationPublisher() { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java index 7bf50d911..91a599dbe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java @@ -44,7 +44,7 @@ import org.springframework.jmx.support.MBeanServerConnectionFactoryBean; */ public class RemoteLauncherTests { private static Log logger = LogFactory.getLog(RemoteLauncherTests.class); - private static List errors = new ArrayList(); + private static List errors = new ArrayList<>(); private static JobOperator launcher; private static JobLoader loader; static private Thread thread; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java index 8478f3bf4..d742c4a0f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java @@ -50,7 +50,7 @@ import org.springframework.batch.core.repository.JobRestartException; public class JobLauncherDetailsTests { private JobLauncherDetails details = new JobLauncherDetails(); private TriggerFiredBundle firedBundle; - private List list = new ArrayList(); + private List list = new ArrayList<>(); @Before public void setUp() throws Exception { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java index fe68a7ee6..e3407af9c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java @@ -30,7 +30,7 @@ import org.junit.Test; */ public class RetrySampleItemWriterTests { - private RetrySampleItemWriter processor = new RetrySampleItemWriter(); + private RetrySampleItemWriter processor = new RetrySampleItemWriter<>(); /* * Processing throws exception on 2nd and 3rd call.