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

infrastructure and core should have no more generics warnings (remaining are easymock deprecations)

Browse Source
This commit is contained in:
robokaso
2008-07-24 10:48:13 +00:00
parent a07daf3d3a
commit 66736f2ac2
23 changed files with 176 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java
View File

@@ -72,8 +72,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase {
};
writer.setSql("SQL");
writer.setJdbcTemplate(jdbcTemplate);
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() {
public void setValues(Object item, PreparedStatement ps) throws SQLException {
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter<String>() {
public void setValues(String item, PreparedStatement ps) throws SQLException {
list.add(item);
}
});
@@ -193,8 +193,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase {
public void testWriteAndFlushWithFailure() throws Exception {
final RuntimeException ex = new RuntimeException("bar");
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() {
public void setValues(Object item, PreparedStatement ps) throws SQLException {
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter<String>() {
public void setValues(String item, PreparedStatement ps) throws SQLException {
list.add(item);
throw ex;
}
@@ -213,8 +213,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase {
}
assertFalse(TransactionSynchronizationManager.hasResource(writer.getResourceKey()));
assertEquals(2, list.size());
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() {
public void setValues(Object item, PreparedStatement ps) throws SQLException {
writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter<String>() {
public void setValues(String item, PreparedStatement ps) throws SQLException {
list.add(item);
}
});

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

@@ -25,7 +25,7 @@ import org.springframework.batch.item.file.mapping.FieldSet;
*/
public class LineAggregatorItemTransformerTests extends TestCase {
private LineAggregatorItemTransformer transformer = new LineAggregatorItemTransformer();
private LineAggregatorItemTransformer<String[]> transformer = new LineAggregatorItemTransformer<String[]>();
/**
* Test method for {@link org.springframework.batch.item.file.transform.LineAggregatorItemTransformer#setAggregator(org.springframework.batch.item.file.transform.LineAggregator)}.
@@ -50,17 +50,4 @@ public class LineAggregatorItemTransformerTests extends TestCase {
assertTrue("Wrong value: "+value, value.startsWith("a,b"));
}
/**
* Test method for {@link org.springframework.batch.item.file.transform.LineAggregatorItemTransformer#transform(java.lang.Object)}.
* @throws Exception
*/
public void testTransformWrongType() throws Exception {
try {
transformer.transform("foo");
fail("Expected ConversionException");
} catch (ConversionException e) {
// Expected
}
}
}

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

@@ -16,6 +16,7 @@
package org.springframework.batch.item.file.transform;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import junit.framework.TestCase;
@@ -39,8 +40,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase {
* @throws Exception
*/
public void testSetDelegate() throws Exception {
transformer.setDelegate(new ItemTransformer() {
public Object transform(Object item) throws Exception {
transformer.setDelegate(new ItemTransformer<Object, String>() {
public String transform(Object item) throws Exception {
return "bar";
}
});
@@ -53,8 +54,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase {
* @throws Exception
*/
public void testSetDelegateAndPassInString() throws Exception {
transformer.setDelegate(new ItemTransformer() {
public Object transform(Object item) throws Exception {
transformer.setDelegate(new ItemTransformer<Object, String>() {
public String transform(Object item) throws Exception {
return "bar";
}
});
@@ -67,8 +68,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase {
* @throws Exception
*/
public void testSetDelegateReturnsList() throws Exception {
transformer.setDelegate(new ItemTransformer() {
public Object transform(Object item) throws Exception {
transformer.setDelegate(new ItemTransformer<Object, Collection<String>>() {
public Collection<String> transform(Object item) throws Exception {
return Collections.singletonList("bar");
}
});

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

@@ -79,11 +79,11 @@ public class DelegatingItemWriterTests extends TestCase {
assertTrue(writer.isDoProcessCalled());
}
private class ProcessingWriter extends DelegatingItemWriter{
private class ProcessingWriter<I,O> extends DelegatingItemWriter<I,O>{
boolean doProcessCalled = false;
protected Object doProcess(Object item) throws Exception {
protected O doProcess(I item) throws Exception {
doProcessCalled = true;
return super.doProcess(item);
}

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

@@ -13,17 +13,17 @@ import org.easymock.MockControl;
*/
public class CompositeItemTransformerTests extends TestCase {
private CompositeItemTransformer composite = new CompositeItemTransformer();
private CompositeItemTransformer<Object, Object> composite = new CompositeItemTransformer<Object, Object>();
private ItemTransformer transformer1;
private ItemTransformer transformer2;
private ItemTransformer<Object, Object> transformer1;
private ItemTransformer<Object, Object> transformer2;
private MockControl tControl1 = MockControl.createControl(ItemTransformer.class);
private MockControl tControl2 = MockControl.createControl(ItemTransformer.class);
private MockControl<ItemTransformer> tControl1 = MockControl.createControl(ItemTransformer.class);
private MockControl<ItemTransformer> tControl2 = MockControl.createControl(ItemTransformer.class);
protected void setUp() throws Exception {
transformer1 = (ItemTransformer) tControl1.getMock();
transformer2 = (ItemTransformer) tControl2 .getMock();
transformer1 = tControl1.getMock();
transformer2 = tControl2 .getMock();
composite.setItemTransformers(new ArrayList<ItemTransformer>() {{
add(transformer1); add(transformer2);

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

@@ -35,20 +35,22 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
public void testTransform() throws Exception{
ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter();
ItemTransformerItemWriter<Foo, Bar> itemTransformerItemWriter = new ItemTransformerItemWriter<Foo, Bar>();
itemTransformerItemWriter.setItemTransformer(new FooTransformer());
itemTransformerItemWriter.setDelegate(new BarWriter());
itemTransformerItemWriter.write(new Foo());
}
public void testComposite() throws Exception{
CompositeItemTransformer compositeTransformer = new CompositeItemTransformer();
List<ItemTransformer> itemTransformers = new ArrayList<ItemTransformer>();
CompositeItemTransformer<Foo, Foobar> compositeTransformer = new CompositeItemTransformer<Foo, Foobar>();
@SuppressWarnings("unchecked") List<ItemTransformer> itemTransformers = new ArrayList<ItemTransformer>();
itemTransformers.add(new FooTransformer());
itemTransformers.add(new BarTransformer());
compositeTransformer.setItemTransformers(itemTransformers);
ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter();
ItemTransformerItemWriter<Foo, Foobar> itemTransformerItemWriter = new ItemTransformerItemWriter<Foo, Foobar>();
itemTransformerItemWriter.setItemTransformer(compositeTransformer);
itemTransformerItemWriter.setDelegate(new FoobarWriter());
itemTransformerItemWriter.write(new Foo());
@@ -67,21 +69,18 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
public Foobar(Bar bar){}
}
public class FooTransformer implements ItemTransformer{
public class FooTransformer implements ItemTransformer<Foo, Bar>{
//Preform simple transformation, convert a Foo to a Barr
public Object transform(Object item) throws Exception {
assertTrue(item instanceof Foo);
Foo foo = (Foo)item;
public Bar transform(Foo foo) throws Exception {
return new Bar(foo);
}
}
public class BarTransformer implements ItemTransformer{
public class BarTransformer implements ItemTransformer<Bar, Foobar>{
public Object transform(Object item) throws Exception {
assertTrue(item instanceof Bar);
return new Foobar((Bar)item);
public Foobar transform(Bar bar) throws Exception {
return new Foobar(bar);
}
}

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java
View File

@@ -22,7 +22,6 @@ import java.util.Set;
import junit.framework.TestCase;
@SuppressWarnings("unchecked")
public class TransactionAwareProxyFactoryTests extends TestCase {
public void testCreateList() throws Exception {