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

IN PROGRESS - BATCH-712: Upgrade ItemReaders to use Parameterized types

Browse Source 
parameterized MRIR
This commit is contained in:
robokaso
2008-07-18 12:10:56 +00:00
parent af5f9165f2
commit 44ee192ee4
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,13 @@ import org.springframework.core.io.Resource;
public class MultiResourceItemReaderFlatFileTests extends
CommonItemStreamItemReaderTests {
protected ItemReader getItemReader() throws Exception {
protected ItemReader<Foo> getItemReader() throws Exception {
MultiResourceItemReader multiReader = new MultiResourceItemReader();
FlatFileItemReader fileReader = new FlatFileItemReader();
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<Foo>();
FlatFileItemReader<Foo> fileReader = new FlatFileItemReader<Foo>();
fileReader.setFieldSetMapper(new FieldSetMapper() {
public Object mapLine(FieldSet fs, int lineNum) {
fileReader.setFieldSetMapper(new FieldSetMapper<Foo>() {
public Foo mapLine(FieldSet fs, int lineNum) {
Foo foo = new Foo();
foo.setValue(fs.readInt(0));
return foo;
@@ -48,8 +48,8 @@ public class MultiResourceItemReaderFlatFileTests extends
return multiReader;
}
protected void pointToEmptyInput(ItemReader tested) throws Exception {
MultiResourceItemReader multiReader = (MultiResourceItemReader) tested;
protected void pointToEmptyInput(ItemReader<Foo> tested) throws Exception {
MultiResourceItemReader<Foo> multiReader = (MultiResourceItemReader<Foo>) tested;
multiReader.close(new ExecutionContext());
multiReader.setResources(new Resource[] { new ByteArrayResource(""
.getBytes()) });

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

@@ -15,9 +15,9 @@ import org.springframework.core.io.Resource;
*/
public class MultiResourceItemReaderIntegrationTests extends TestCase {
private MultiResourceItemReader tested = new MultiResourceItemReader();
private MultiResourceItemReader<FieldSet> tested = new MultiResourceItemReader<FieldSet>();
private FlatFileItemReader itemReader = new FlatFileItemReader();
private FlatFileItemReader<FieldSet> itemReader = new FlatFileItemReader<FieldSet>();
private ExecutionContext ctx = new ExecutionContext();

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

@@ -18,14 +18,14 @@ import org.springframework.core.io.Resource;
public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderTests {
protected ItemReader getItemReader() throws Exception {
MultiResourceItemReader multiReader = new MultiResourceItemReader();
protected ItemReader<Foo> getItemReader() throws Exception {
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<Foo>();
StaxEventItemReader reader = new StaxEventItemReader();
StaxEventItemReader<Foo> reader = new StaxEventItemReader<Foo>();
reader.setFragmentRootElementName("foo");
reader.setFragmentDeserializer(new EventReaderDeserializer() {
public Object deserializeFragment(XMLEventReader eventReader) {
reader.setFragmentDeserializer(new EventReaderDeserializer<Foo>() {
public Foo deserializeFragment(XMLEventReader eventReader) {
Attribute attr;
try {
assertTrue(eventReader.nextEvent().isStartDocument());
@@ -61,8 +61,8 @@ public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderT
return multiReader;
}
protected void pointToEmptyInput(ItemReader tested) throws Exception {
MultiResourceItemReader multiReader = (MultiResourceItemReader) tested;
protected void pointToEmptyInput(ItemReader<Foo> tested) throws Exception {
MultiResourceItemReader<Foo> multiReader = (MultiResourceItemReader<Foo>) tested;
multiReader.close(new ExecutionContext());
multiReader.setResources(new Resource[] { new ByteArrayResource("<foos />"
.getBytes()) });