From 475dce764904dfe0c469cbf319f844cbd4f82c67 Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 17 Jul 2008 12:38:03 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../SimpleLimitExceptionHandler.java | 2 +- .../MultiResourceItemReaderFlatFileTests.java | 4 +-- ...ltiResourceItemReaderIntegrationTests.java | 8 ++--- .../file/MultiResourceItemReaderXmlTests.java | 4 +-- .../BeanWrapperFieldSetMapperTests.java | 8 ++--- .../transform/CommonLineTokenizerTests.java | 2 +- ...ixMatchingCompositeLineTokenizerTests.java | 4 +-- .../batch/item/sample/Order.java | 6 ++-- .../support/AggregateItemReaderTests.java | 4 +-- .../support/CompositeItemStreamTests.java | 2 +- .../support/CompositeItemWriterTests.java | 17 ++++------ .../item/support/ListItemReaderTests.java | 2 +- .../TransactionAwareListItemReaderTests.java | 34 +++++++++---------- .../CompositeItemTransformerTests.java | 4 +-- ...mTransformerItemWriterFunctionalTests.java | 2 +- .../item/validator/SpringValidatorTests.java | 1 + .../item/xml/StaxEventItemReaderTests.java | 16 +++++---- .../item/xml/StaxEventItemWriterTests.java | 4 ++- ...MarshallingObjectToXmlSerializerTests.java | 1 + .../ItemReaderRepeatCallbackTests.java | 2 +- .../context/RepeatContextSupportTests.java | 2 +- .../SynchronizedAttributeAccessorTests.java | 4 +-- .../CompositeExceptionHandlerTests.java | 2 +- ...throwOnThresholdExceptionHandlerTests.java | 1 - .../SimpleLimitExceptionHandlerTests.java | 14 +++----- 25 files changed, 74 insertions(+), 76 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java index f0663872b..968b4a7b7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java @@ -131,7 +131,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler { * handler uses single counter that is incremented when one of the * recognized exception exceptionClasses is handled. */ - public void setExceptionClasses(Class[] classes) { + public void setExceptionClasses(Class[] classes) { this.exceptionClasses = classes; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java index ef876bd71..d41c27054 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java @@ -37,8 +37,8 @@ public class MultiResourceItemReaderFlatFileTests extends multiReader.setResources(new Resource[] { r1, r2, r3, r4 }); multiReader.setSaveState(true); - multiReader.setComparator(new Comparator() { - public int compare(Object arg0, Object arg1) { + multiReader.setComparator(new Comparator() { + public int compare(Resource arg0, Resource arg1) { return 0; // preserve original ordering } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java index af66fcd4b..9164f151c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java @@ -40,8 +40,8 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { itemReader.setFieldSetMapper(new PassThroughFieldSetMapper()); tested.setDelegate(itemReader); - tested.setComparator(new Comparator() { - public int compare(Object o1, Object o2) { + tested.setComparator(new Comparator() { + public int compare(Resource o1, Resource o2) { return 0; // do not change ordering }}); tested.setResources(new Resource[] { r1, r2, r3, r4, r5 }); @@ -155,12 +155,12 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { Resource[] resources = new Resource[] {r1, r2, r3}; - Comparator comp = new Comparator() { + Comparator comp = new Comparator() { /** * Reversed ordering by filename. */ - public int compare(Object o1, Object o2) { + public int compare(Resource o1, Resource o2) { Resource r1 = (Resource) o1; Resource r2 = (Resource) o2; return -r1.getDescription().compareTo(r2.getDescription()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java index 5a34f4ff2..c8d545b83 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java @@ -51,8 +51,8 @@ public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderT multiReader.setDelegate(reader); multiReader.setResources(new Resource[] { r1, r2, r3, r4 }); multiReader.setSaveState(true); - multiReader.setComparator(new Comparator() { - public int compare(Object arg0, Object arg1) { + multiReader.setComparator(new Comparator() { + public int compare(Resource arg0, Resource arg1) { return 0; // preserve original ordering } }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java index 2ddabe3ec..77ac7d932 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java @@ -255,7 +255,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { public void testNestedList() { TestNestedList nestedList = new TestNestedList(); - List nestedC = new ArrayList(); + List nestedC = new ArrayList(); nestedC.add(new TestNestedC()); nestedC.add(new TestNestedC()); nestedC.add(new TestNestedC()); @@ -320,13 +320,13 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { private static class TestNestedList { - List nestedC; + List nestedC; - public List getNestedC() { + public List getNestedC() { return nestedC; } - public void setNestedC(List nestedC) { + public void setNestedC(List nestedC) { this.nestedC = nestedC; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java index 420603e59..4ad3e525f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java @@ -17,7 +17,7 @@ public class CommonLineTokenizerTests extends TestCase { */ public void testHasNames() { AbstractLineTokenizer tokenizer = new AbstractLineTokenizer() { - protected List doTokenize(String line) { + protected List doTokenize(String line) { return null; } }; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java index 8501aaf78..94cd93226 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java @@ -46,7 +46,7 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { } public void testEmptyKeyMatchesAnyLine() throws Exception { - Map map = new HashMap(); + Map map = new HashMap(); map.put("", new DelimitedLineTokenizer()); map.put("foo", new LineTokenizer() { public FieldSet tokenize(String line) { @@ -60,7 +60,7 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { public void testEmptyKeyDoesNotMatchWhenAlternativeAvailable() throws Exception { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap(); map.put("", new LineTokenizer() { public FieldSet tokenize(String line) { return null; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java index b28df20c9..ed847cbe3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java @@ -33,7 +33,7 @@ public class Order { private Date date; - private List lineItems; + private List lineItems; private Shipper shipper; @@ -53,11 +53,11 @@ public class Order { this.date = date == null ? null : (Date)date.clone(); } - public List getLineItems() { + public List getLineItems() { return lineItems; } - public void setLineItems(List lineItems) { + public void setLineItems(List lineItems) { this.lineItems = lineItems; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java index 54a8f8eab..062bb6f9e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java @@ -44,10 +44,10 @@ public class AggregateItemReaderTests extends TestCase { //it should be collection of 3 strings "line" assertTrue(result instanceof Collection); - Collection lines = (Collection)result; + Collection lines = (Collection)result; assertEquals(3, lines.size()); - for (Iterator i = lines.iterator(); i.hasNext();) { + for (Iterator i = lines.iterator(); i.hasNext();) { assertEquals("line", i.next()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java index f28039052..7af1f1a35 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java @@ -34,7 +34,7 @@ public class CompositeItemStreamTests extends TestCase { private CompositeItemStream manager = new CompositeItemStream(); - private List list = new ArrayList(); + private List list = new ArrayList(); public void testRegisterAndOpen() { ItemStreamSupport stream = new ItemStreamSupport() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java index fa648177a..22c174d80 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java @@ -1,14 +1,12 @@ package org.springframework.batch.item.support; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.support.CompositeItemWriter; /** * Tests for {@link CompositeItemWriter} @@ -29,26 +27,25 @@ public class CompositeItemWriterTests extends TestCase { final int NUMBER_OF_PROCESSORS = 10; Object data = new Object(); - List controls = new ArrayList(NUMBER_OF_PROCESSORS); - List processors = new ArrayList(NUMBER_OF_PROCESSORS); + List controls = new ArrayList(NUMBER_OF_PROCESSORS); + List writers = new ArrayList(NUMBER_OF_PROCESSORS); for (int i = 0; i < NUMBER_OF_PROCESSORS; i++) { MockControl control = MockControl.createStrictControl(ItemWriter.class); - ItemWriter processor = (ItemWriter) control.getMock(); + ItemWriter writer = (ItemWriter) control.getMock(); - processor.write(data); + writer.write(data); control.setVoidCallable(); control.replay(); - processors.add(processor); + writers.add(writer); controls.add(control); } - itemProcessor.setDelegates(processors); + itemProcessor.setDelegates(writers); itemProcessor.write(data); - for (Iterator iterator = controls.iterator(); iterator.hasNext();) { - MockControl control = (MockControl) iterator.next(); + for (MockControl control : controls) { control.verify(); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java index 93d8a0965..9bafedf20 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java @@ -36,7 +36,7 @@ public class ListItemReaderTests extends TestCase { } public void testChangeList() throws Exception { - List list = new ArrayList(Arrays.asList(new String[] { "a", "b", "c" })); + List list = new ArrayList(Arrays.asList(new String[] { "a", "b", "c" })); provider = new ListItemReader(list); assertEquals("a", provider.read()); list.clear(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java index c7e653d21..703d44dde 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java @@ -35,29 +35,29 @@ public class TransactionAwareListItemReaderTests extends TestCase { // TransactionAwareListItemProvider provider = new // TransactionAwareListItemProvider(Arrays.asList(new String[] { "a", // "b", "c" })); - ListItemReader provider; + ListItemReader reader; protected void setUp() throws Exception { super.setUp(); TransactionAwareProxyFactory factory = new TransactionAwareProxyFactory(Arrays.asList(new String[] { "a", "b", "c" })); - provider = new ListItemReader((List) factory.createInstance()); + reader = new ListItemReader((List) factory.createInstance()); } public void testNext() throws Exception { - assertEquals("a", provider.read()); - assertEquals("b", provider.read()); - assertEquals("c", provider.read()); - assertEquals(null, provider.read()); + assertEquals("a", reader.read()); + assertEquals("b", reader.read()); + assertEquals("c", reader.read()); + assertEquals(null, reader.read()); } public void testCommit() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus status) { - taken.add(provider.read()); + taken.add(reader.read()); return null; } }); @@ -69,10 +69,10 @@ public class TransactionAwareListItemReaderTests extends TestCase { assertEquals(1, taken.size()); assertEquals("a", taken.get(0)); taken.clear(); - Object next = provider.read(); + Object next = reader.read(); while (next != null) { taken.add(next); - next = provider.read(); + next = reader.read(); } // System.err.println(taken); assertFalse(taken.contains("a")); @@ -80,13 +80,13 @@ public class TransactionAwareListItemReaderTests extends TestCase { public void testTransactionalExhausted() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus status) { - Object next = provider.read(); + Object next = reader.read(); while (next != null) { taken.add(next); - next = provider.read(); + next = reader.read(); } return null; } @@ -97,11 +97,11 @@ public class TransactionAwareListItemReaderTests extends TestCase { public void testRollback() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus status) { - taken.add(provider.read()); + taken.add(reader.read()); throw new RuntimeException("Rollback!"); } }); @@ -113,10 +113,10 @@ public class TransactionAwareListItemReaderTests extends TestCase { assertEquals(1, taken.size()); assertEquals("a", taken.get(0)); taken.clear(); - Object next = provider.read(); + Object next = reader.read(); while (next != null) { taken.add(next); - next = provider.read(); + next = reader.read(); } System.err.println(taken); assertTrue(taken.contains("a")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java index 358b6e698..4e8ba86a3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java @@ -25,7 +25,7 @@ public class CompositeItemTransformerTests extends TestCase { transformer1 = (ItemTransformer) tControl1.getMock(); transformer2 = (ItemTransformer) tControl2 .getMock(); - composite.setItemTransformers(new ArrayList() {{ + composite.setItemTransformers(new ArrayList() {{ add(transformer1); add(transformer2); }}); @@ -73,7 +73,7 @@ public class CompositeItemTransformerTests extends TestCase { } // empty list - composite.setItemTransformers(new ArrayList()); + composite.setItemTransformers(new ArrayList()); try { composite.afterPropertiesSet(); fail(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java index 955109755..614ad1ff3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java @@ -44,7 +44,7 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase { public void testComposite() throws Exception{ CompositeItemTransformer compositeTransformer = new CompositeItemTransformer(); - List itemTransformers = new ArrayList(); + List itemTransformers = new ArrayList(); itemTransformers.add(new FooTransformer()); itemTransformers.add(new BarTransformer()); compositeTransformer.setItemTransformers(itemTransformers); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java index 5d1844811..62309a87c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java @@ -110,6 +110,7 @@ public class SpringValidatorTests extends TestCase { public static final TestBean REJECT_MULTI_VALUE = new TestBean("foo", "bar"); + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return clazz.isAssignableFrom(TestBean.class); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index 5664da8bf..1e95bf572 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -111,17 +111,18 @@ public class StaxEventItemReaderTests extends TestCase { /** * Save restart data and restore from it. */ + @SuppressWarnings("unchecked") public void testRestart() throws Exception { source.open(executionContext); source.read(); source.update(executionContext); System.out.println(executionContext); assertEquals(1, executionContext.getLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".read.count")); - List expectedAfterRestart = (List) source.read(); + List expectedAfterRestart = (List) source.read(); source = createNewInputSouce(); source.open(executionContext); - List afterRestart = (List) source.read(); + List afterRestart = (List) source.read(); assertEquals(expectedAfterRestart.size(), afterRestart.size()); } @@ -149,12 +150,13 @@ public class StaxEventItemReaderTests extends TestCase { /** * Rollback to last commited record. */ + @SuppressWarnings("unchecked") public void testRollback() throws Exception{ source.open(executionContext); // rollback between deserializing records - List first = (List) source.read(); + List first = (List) source.read(); source.mark(); - List second = (List) source.read(); + List second = (List) source.read(); assertFalse(first.equals(second)); source.reset(); @@ -289,7 +291,7 @@ public class StaxEventItemReaderTests extends TestCase { * @return list of the events from fragment body */ public Object deserializeFragment(XMLEventReader eventReader) { - List fragmentContent; + List fragmentContent; try { // first event should be StartDocument XMLEvent event1 = eventReader.nextEvent(); @@ -321,9 +323,9 @@ public class StaxEventItemReaderTests extends TestCase { /** * Skips the XML fragment contents. */ - private List readRecordsInsideFragment(XMLEventReader eventReader) throws XMLStreamException { + private List readRecordsInsideFragment(XMLEventReader eventReader) throws XMLStreamException { XMLEvent eventInsideFragment; - List events = new ArrayList(); + List events = new ArrayList(); do { eventInsideFragment = eventReader.peek(); if (eventInsideFragment instanceof EndElement diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java index bf7d8cec4..681db1562 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java @@ -208,7 +208,7 @@ public class StaxEventItemWriterTests extends TestCase { */ public void testOpenAndClose() throws Exception { writer.setRootTagName("testroot"); - writer.setRootElementAttributes(new HashMap() { + writer.setRootElementAttributes(new HashMap() { { put("attribute", "value"); } @@ -236,6 +236,7 @@ public class StaxEventItemWriterTests extends TestCase { assertSame(item, graph); } + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return true; } @@ -257,6 +258,7 @@ public class StaxEventItemWriterTests extends TestCase { } } + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return true; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/MarshallingObjectToXmlSerializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/MarshallingObjectToXmlSerializerTests.java index 35de43a4d..e967024d4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/MarshallingObjectToXmlSerializerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/MarshallingObjectToXmlSerializerTests.java @@ -82,6 +82,7 @@ public class MarshallingObjectToXmlSerializerTests extends TestCase { marshalledObject = arg0; } + @SuppressWarnings("unchecked") public boolean supports(Class arg0) { return false; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java index 7bff97462..8906fb889 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java @@ -29,7 +29,7 @@ public class ItemReaderRepeatCallbackTests extends TestCase { ItemReaderRepeatCallback callback; - List list = new ArrayList(); + List list = new ArrayList(); public void testDoWithRepeat() throws Exception { callback = new ItemReaderRepeatCallback(new ListItemReader(Arrays.asList(new String[] { "foo", "bar" })), diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java index c9dca170e..eafe4e089 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; */ public class RepeatContextSupportTests extends TestCase { - private List list = new ArrayList(); + private List list = new ArrayList(); /** * Test method for {@link org.springframework.batch.repeat.context.RepeatContextSupport#registerDestructionCallback(java.lang.String, java.lang.Runnable)}. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java index f0d3f2bdb..ef08153ef 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java @@ -50,7 +50,7 @@ public class SynchronizedAttributeAccessorTests extends TestCase { public void testAttributeNames() { accessor.setAttribute("foo", "bar"); accessor.setAttribute("spam", "bucket"); - List list = Arrays.asList(accessor.attributeNames()); + List list = Arrays.asList(accessor.attributeNames()); assertEquals(2, list.size()); assertTrue(list.contains("foo")); } @@ -69,7 +69,7 @@ public class SynchronizedAttributeAccessorTests extends TestCase { public void testEqualsWrongType() { accessor.setAttribute("foo", "bar"); - Map another = Collections.singletonMap("foo", "bar"); + Map another = Collections.singletonMap("foo", "bar"); // Accessor and another are instances of unrelated classes, they should // never be equal... assertFalse(accessor.equals(another)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java index 2418b8466..1c77901b7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java @@ -39,7 +39,7 @@ public class CompositeExceptionHandlerTests extends TestCase { } public void testDelegation() throws Throwable { - final List list = new ArrayList(); + final List list = new ArrayList(); handler.setHandlers(new ExceptionHandler[] { new ExceptionHandler() { public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java index 115836063..46c1894e5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java @@ -17,7 +17,6 @@ package org.springframework.batch.repeat.exception; import java.util.Collections; -import java.util.Map; import junit.framework.TestCase; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java index 8cae73f02..1c806f579 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java @@ -17,13 +17,11 @@ package org.springframework.batch.repeat.exception; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import junit.framework.TestCase; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler; /** * Unit tests for {@link SimpleLimitExceptionHandler} @@ -63,7 +61,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase { final int MORE_THAN_ZERO = 1; handler.setLimit(MORE_THAN_ZERO); - handler.setExceptionClasses(new Class[] { IllegalArgumentException.class }); + handler.setExceptionClasses(new Class[] { IllegalArgumentException.class }); try { handler.handleException(new RepeatContextSupport(null), throwable); @@ -150,7 +148,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase { final int EXCEPTION_LIMIT = 3; handler.setLimit(EXCEPTION_LIMIT); - List throwables = new ArrayList() { + List throwables = new ArrayList() { { for (int i = 0; i < (EXCEPTION_LIMIT); i++) { add(new RuntimeException("below exception limit")); @@ -161,8 +159,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase { RepeatContextSupport context = new RepeatContextSupport(null); try { - for (Iterator iterator = throwables.iterator(); iterator.hasNext();) { - Throwable throwable = (Throwable) iterator.next(); + for (Throwable throwable : throwables) { handler.handleException(context, throwable); assertTrue("exceptions up to limit are swallowed", true); @@ -183,7 +180,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase { final int EXCEPTION_LIMIT = 3; handler.setLimit(EXCEPTION_LIMIT); - List throwables = new ArrayList() { + List throwables = new ArrayList() { { for (int i = 0; i < (EXCEPTION_LIMIT); i++) { add(new RuntimeException("below exception limit")); @@ -196,8 +193,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase { RepeatContextSupport context = new RepeatContextSupport(null); try { - for (Iterator iterator = throwables.iterator(); iterator.hasNext();) { - Throwable throwable = (Throwable) iterator.next(); + for (Throwable throwable : throwables) { handler.handleException(context, throwable); assertTrue("exceptions up to limit are swallowed", true);