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

IN PROGRESS - BATCH-709: Change all collections to use generics

Browse Source
This commit is contained in:
robokaso
2008-07-17 12:38:03 +00:00
parent 1e56dcd4cc
commit 475dce7649
25 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java
View File

@@ -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<Resource>() {
public int compare(Resource arg0, Resource arg1) {
return 0; // preserve original ordering
}

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java
View File

@@ -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<Resource>() {
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<Resource> comp = new Comparator<Resource>() {
/**
* 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());

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java
View File

@@ -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<Resource>() {
public int compare(Resource arg0, Resource arg1) {
return 0; // preserve original ordering
}
});

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java
View File

@@ -255,7 +255,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase {
public void testNestedList() {
TestNestedList nestedList = new TestNestedList();
List nestedC = new ArrayList();
List<Object> nestedC = new ArrayList<Object>();
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<Object> nestedC;
public List getNestedC() {
public List<Object> getNestedC() {
return nestedC;
}
public void setNestedC(List nestedC) {
public void setNestedC(List<Object> nestedC) {
this.nestedC = nestedC;
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java
View File

@@ -17,7 +17,7 @@ public class CommonLineTokenizerTests extends TestCase {
*/
public void testHasNames() {
AbstractLineTokenizer tokenizer = new AbstractLineTokenizer() {
protected List doTokenize(String line) {
protected List<String> doTokenize(String line) {
return null;
}
};

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java
View File

@@ -46,7 +46,7 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase {
}
public void testEmptyKeyMatchesAnyLine() throws Exception {
Map map = new HashMap();
Map<String, LineTokenizer> map = new HashMap<String, LineTokenizer>();
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<String, LineTokenizer> map = new LinkedHashMap<String, LineTokenizer>();
map.put("", new LineTokenizer() {
public FieldSet tokenize(String line) {
return null;

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java
View File

@@ -33,7 +33,7 @@ public class Order {
private Date date;
private List lineItems;
private List<LineItem> lineItems;
private Shipper shipper;
@@ -53,11 +53,11 @@ public class Order {
this.date = date == null ? null : (Date)date.clone();
}
public List getLineItems() {
public List<LineItem> getLineItems() {
return lineItems;
}
public void setLineItems(List lineItems) {
public void setLineItems(List<LineItem> lineItems) {
this.lineItems = lineItems;
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
View File

@@ -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());
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java
View File

@@ -34,7 +34,7 @@ public class CompositeItemStreamTests extends TestCase {
private CompositeItemStream manager = new CompositeItemStream();
private List list = new ArrayList();
private List<String> list = new ArrayList<String>();
public void testRegisterAndOpen() {
ItemStreamSupport stream = new ItemStreamSupport() {

17
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java
View File

@@ -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<MockControl> controls = new ArrayList<MockControl>(NUMBER_OF_PROCESSORS);
List<ItemWriter> writers = new ArrayList<ItemWriter>(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();
}
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java
View File

@@ -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<String> list = new ArrayList<String>(Arrays.asList(new String[] { "a", "b", "c" }));
provider = new ListItemReader(list);
assertEquals("a", provider.read());
list.clear();

34
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java
View File

@@ -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<Object> taken = new ArrayList<Object>();
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<Object> taken = new ArrayList<Object>();
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<Object> taken = new ArrayList<Object>();
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"));

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java
View File

@@ -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<ItemTransformer>() {{
add(transformer1); add(transformer2);
}});
@@ -73,7 +73,7 @@ public class CompositeItemTransformerTests extends TestCase {
}
// empty list
composite.setItemTransformers(new ArrayList());
composite.setItemTransformers(new ArrayList<ItemTransformer>());
try {
composite.afterPropertiesSet();
fail();

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java
View File

@@ -44,7 +44,7 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
public void testComposite() throws Exception{
CompositeItemTransformer compositeTransformer = new CompositeItemTransformer();
List itemTransformers = new ArrayList();
List<ItemTransformer> itemTransformers = new ArrayList<ItemTransformer>();
itemTransformers.add(new FooTransformer());
itemTransformers.add(new BarTransformer());
compositeTransformer.setItemTransformers(itemTransformers);

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java
View File

@@ -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);
}

16
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
View File

@@ -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<XMLEvent> expectedAfterRestart = (List<XMLEvent>) source.read();
source = createNewInputSouce();
source.open(executionContext);
List afterRestart = (List) source.read();
List<XMLEvent> afterRestart = (List<XMLEvent>) 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<XMLEvent> first = (List<XMLEvent>) source.read();
source.mark();
List second = (List) source.read();
List<XMLEvent> second = (List<XMLEvent>) 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<XMLEvent> 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<XMLEvent> readRecordsInsideFragment(XMLEventReader eventReader) throws XMLStreamException {
XMLEvent eventInsideFragment;
List events = new ArrayList();
List<XMLEvent> events = new ArrayList<XMLEvent>();
do {
eventInsideFragment = eventReader.peek();
if (eventInsideFragment instanceof EndElement

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java
View File

@@ -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<String, String>() {
{
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;
}

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/MarshallingObjectToXmlSerializerTests.java
View File

@@ -82,6 +82,7 @@ public class MarshallingObjectToXmlSerializerTests extends TestCase {
marshalledObject = arg0;
}
@SuppressWarnings("unchecked")
public boolean supports(Class arg0) {
return false;
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java
View File

@@ -29,7 +29,7 @@ public class ItemReaderRepeatCallbackTests extends TestCase {
ItemReaderRepeatCallback callback;
List list = new ArrayList();
List<Object> list = new ArrayList<Object>();
public void testDoWithRepeat() throws Exception {
callback = new ItemReaderRepeatCallback(new ListItemReader(Arrays.asList(new String[] { "foo", "bar" })),

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java
View File

@@ -26,7 +26,7 @@ import junit.framework.TestCase;
*/
public class RepeatContextSupportTests extends TestCase {
private List list = new ArrayList();
private List<String> list = new ArrayList<String>();
/**
* Test method for {@link org.springframework.batch.repeat.context.RepeatContextSupport#registerDestructionCallback(java.lang.String, java.lang.Runnable)}.

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java
View File

@@ -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<String> 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<String, String> another = Collections.singletonMap("foo", "bar");
// Accessor and another are instances of unrelated classes, they should
// never be equal...
assertFalse(accessor.equals(another));

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java
View File

@@ -39,7 +39,7 @@ public class CompositeExceptionHandlerTests extends TestCase {
}
public void testDelegation() throws Throwable {
final List list = new ArrayList();
final List<String> list = new ArrayList<String>();
handler.setHandlers(new ExceptionHandler[] {
new ExceptionHandler() {
public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException {

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.batch.repeat.exception;
import java.util.Collections;
import java.util.Map;
import junit.framework.TestCase;

14
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java
View File

@@ -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<Throwable> throwables = new ArrayList<Throwable>() {
{
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<Throwable> throwables = new ArrayList<Throwable>() {
{
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);