diff --git a/archetypes/simple-cli/src/main/java/example/ExampleItemReader.java b/archetypes/simple-cli/src/main/java/example/ExampleItemReader.java index 9e8fb06c6..2874eea75 100644 --- a/archetypes/simple-cli/src/main/java/example/ExampleItemReader.java +++ b/archetypes/simple-cli/src/main/java/example/ExampleItemReader.java @@ -15,7 +15,13 @@ public class ExampleItemReader implements ItemReader { * Reads next record from input */ public String read() throws Exception { - return input[index++]; + if (index < input.length) { + return input[index++]; + } + else { + return null; + } + } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java index 70dbe9430..c05f13336 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java @@ -240,7 +240,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea String firstLine = readRecord(); // set names in tokenizer if they haven't been set already if (tokenizer instanceof AbstractLineTokenizer && !((AbstractLineTokenizer) tokenizer).hasNames()) { - String[] names = tokenizer.tokenize(firstLine).getValues(); + String[] names = tokenizer.process(firstLine).getValues(); ((AbstractLineTokenizer) tokenizer).setNames(names); } if (headerCallback != null) { @@ -263,10 +263,10 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea if (record != null) { try { - FieldSet tokenizedLine = tokenizer.tokenize(record); - return fieldSetMapper.mapLine(tokenizedLine); + FieldSet tokenizedLine = tokenizer.process(record); + return fieldSetMapper.process(tokenizedLine); } - catch (RuntimeException ex) { + catch (Exception ex) { // add current line count to message and re-throw throw new FlatFileParseException("Parsing error at line: " + lineCount + " in resource=" + resource.getDescription() + ", input=[" + record + "]", ex, record, lineCount); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java index 4d5b6b7b7..80e88c5b0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java @@ -189,7 +189,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement StringBuilder lines = new StringBuilder(); int lineCount = 0; for (T item : items) { - lines.append(lineAggregator.aggregate(item) + lineSeparator); + lines.append(lineAggregator.process(item) + lineSeparator); lineCount++; } try { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java index 5ffa00434..8b232da86 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java @@ -102,7 +102,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar /** * The bean name (id) for an object that can be populated from the field set - * that will be passed into {@link #mapLine(FieldSet)}. Typically a + * that will be passed into {@link #process(FieldSet)}. Typically a * prototype scoped bean so that a new instance is returned for each field * set mapped. * @@ -118,7 +118,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar /** * Public setter for the type of bean to create instead of using a prototype * bean. An object of this type will be created from its default constructor - * for every call to {@link #mapLine(FieldSet)}.
+ * for every call to {@link #process(FieldSet)}.
* * Either this property or the prototype bean name must be specified, but * not both. @@ -153,10 +153,10 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar * the {@link DataBinder} from {@link #createBinder(Object)} has errors * after binding). * - * @see org.springframework.batch.item.file.mapping.FieldSetMapper#mapLine(org.springframework.batch.item.file.mapping.FieldSet) + * @see org.springframework.batch.item.file.mapping.FieldSetMapper#process(Object) */ @SuppressWarnings("unchecked") - public T mapLine(FieldSet fs) { + public T process(FieldSet fs) { T copy = getBean(); DataBinder binder = createBinder(copy); binder.bind(new MutablePropertyValues(getBeanProperties(copy, fs.getProperties()))); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/FieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/FieldSetMapper.java index d0b6c20b7..0f13ffa44 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/FieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/FieldSetMapper.java @@ -16,6 +16,8 @@ package org.springframework.batch.item.file.mapping; +import org.springframework.batch.item.ItemProcessor; + /** * Interface that is used to map data obtained from a {@link FieldSet} into an * object. @@ -24,12 +26,5 @@ package org.springframework.batch.item.file.mapping; * @author Dave Syer * */ -public interface FieldSetMapper { - - /** - * Method used to map data obtained from a {@link FieldSet} into an object. - * - * @param fs the {@link FieldSet} to map - */ - public T mapLine(FieldSet fs); +public interface FieldSetMapper extends ItemProcessor { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java index 8d8b4bef6..6a457e108 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java @@ -31,7 +31,7 @@ public class PassThroughFieldSetMapper implements FieldSetMapper
{ * org.springframework.batch.io.file.FieldSetMapper#mapLine(org.springframework * .batch.io.file.FieldSet) */ - public FieldSet mapLine(FieldSet fs) { + public FieldSet process(FieldSet fs) { return fs; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java index bbf677550..f04f80dfd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java @@ -64,7 +64,7 @@ public abstract class AbstractLineTokenizer implements LineTokenizer { * * @return the resulting tokens */ - public FieldSet tokenize(String line) { + public FieldSet process(String line) { if(line == null){ line = ""; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineAggregator.java index d7543f374..03f39702b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineAggregator.java @@ -36,7 +36,7 @@ public class DelimitedLineAggregator implements LineAggregator { /* (non-Javadoc) * @see org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.Object) */ - public String aggregate(T[] item) { + public String process(T[] item) { return StringUtils.arrayToDelimitedString(item, delimiter); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java index 8e9a7657e..5c0450c14 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java @@ -94,7 +94,7 @@ public class FormatterLineAggregator implements LineAggregator { * @param item data to be aggregated * @return aggregated string */ - public String aggregate(T item) { + public String process(T item) { Assert.notNull(item); Assert.notNull(format); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineAggregator.java index 45f06a788..014b0cb03 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineAggregator.java @@ -16,6 +16,8 @@ package org.springframework.batch.item.file.transform; +import org.springframework.batch.item.ItemProcessor; + /** @@ -23,12 +25,5 @@ package org.springframework.batch.item.file.transform; * * @author Dave Syer */ -public interface LineAggregator { - /** - * Create a string from the value provided. - * - * @param item values to be converted - * @return string - */ - public String aggregate(T item); +public interface LineAggregator extends ItemProcessor{ } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineTokenizer.java index 853e42ee2..3794fd6ec 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineTokenizer.java @@ -16,6 +16,7 @@ package org.springframework.batch.item.file.transform; +import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.file.mapping.FieldSet; @@ -26,14 +27,5 @@ import org.springframework.batch.item.file.mapping.FieldSet; * @author tomas.slanina * */ -public interface LineTokenizer { - /** - * Yields the tokens resulting from the splitting of the supplied - * line. - * - * @param line the line to be tokenized (can be null) - * - * @return the resulting tokens - */ - FieldSet tokenize(String line); +public interface LineTokenizer extends ItemProcessor { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java index dffb2fb62..442472a1a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java @@ -6,9 +6,9 @@ public class PassThroughLineAggregator implements LineAggregator { /** * Simply convert to a String with toString(). * - * @see org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.Object) + * @see org.springframework.batch.item.file.transform.LineAggregator#process(java.lang.Object) */ - public String aggregate(T item) { + public String process(T item) { return item.toString(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java index c765e7916..8804db284 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java @@ -31,7 +31,7 @@ public class PrefixMatchingCompositeLineTokenizer implements LineTokenizer { this.tokenizers = new LinkedHashMap(tokenizers); } - public FieldSet tokenize(String line) { + public FieldSet process(String line) throws Exception { if (line == null) { return new DefaultFieldSet(new String[0]); @@ -61,7 +61,7 @@ public class PrefixMatchingCompositeLineTokenizer implements LineTokenizer { throw new IllegalStateException("Could not match record to tokenizer for line=[" + line + "]"); } - return tokenizer.tokenize(line); + return tokenizer.process(line); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java index 1d5cef1c7..406f7098d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java @@ -31,10 +31,10 @@ public class RecursiveCollectionLineAggregator implements LineAggregator items) { + public String process(Collection items) throws Exception { StringBuilder builder = new StringBuilder(); for (T value : items) { - builder.append(delegate.aggregate(value) + LINE_SEPARATOR); + builder.append(delegate.process(value) + LINE_SEPARATOR); } return builder.delete(builder.length()-LINE_SEPARATOR.length(),builder.length()).toString(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java index bd98778a4..89c6989fd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java @@ -83,7 +83,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper mapLine(FieldSet fieldSet) { + public AggregateItem process(FieldSet fieldSet) throws Exception { if (fieldSet.readString(0).equals(begin)) { return AggregateItem.getHeader(); @@ -92,7 +92,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper(delegate.mapLine(fieldSet)); + return new AggregateItem(delegate.process(fieldSet)); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java index 2938a687a..f7a7448c5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java @@ -46,7 +46,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase { // simple stub instead of a realistic tokenizer private LineTokenizer tokenizer = new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { return new DefaultFieldSet(new String[] { line }); } }; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java index c71eb70ca..83f034bc7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java @@ -63,7 +63,7 @@ public class FlatFileItemReaderBasicTests { // simple stub instead of a realistic tokenizer private LineTokenizer tokenizer = new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { return new DefaultFieldSet(new String[] { line }); } }; @@ -121,7 +121,7 @@ public class FlatFileItemReaderBasicTests { @Test public void testReadWithTokenizerError() throws Exception { itemReader.setLineTokenizer(new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { throw new RuntimeException("foo"); } }); @@ -138,7 +138,7 @@ public class FlatFileItemReaderBasicTests { @Test public void testReadWithMapperError() throws Exception { itemReader.setFieldSetMapper(new FieldSetMapper
() { - public FieldSet mapLine(FieldSet fs) { + public FieldSet process(FieldSet fs) { throw new RuntimeException("foo"); } }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java index 8c2fc21f4..fc23f9166 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java @@ -21,7 +21,7 @@ public class FlatFileItemReaderCommonTests extends CommonItemStreamItemReaderTes Resource resource = new ByteArrayResource(FOOS.getBytes()); tested.setResource(resource); tested.setFieldSetMapper(new FieldSetMapper() { - public Foo mapLine(FieldSet fs) { + public Foo process(FieldSet fs) { Foo foo = new Foo(); foo.setValue(fs.readInt(0)); return foo; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index db608ead2..9f9760463 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -148,7 +148,7 @@ public class FlatFileItemWriterTests { @Test public void testWriteWithConverter() throws Exception { writer.setLineAggregator(new LineAggregator() { - public String aggregate(String item) { + public String process(String item) { return "FOO:" + item; } }); @@ -168,7 +168,7 @@ public class FlatFileItemWriterTests { @Test public void testWriteWithConverterAndString() throws Exception { writer.setLineAggregator(new LineAggregator() { - public String aggregate(String item) { + public String process(String item) { return "FOO:" + item; } }); @@ -417,7 +417,7 @@ public class FlatFileItemWriterTests { writer.setLineAggregator(new LineAggregator() { - public String aggregate(String item) { + public String process(String item) { if (item.equals("2")) { throw new RuntimeException("aggregation failed on " + item); } 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 5f24f1463..1ae99fc19 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 @@ -23,7 +23,7 @@ public class MultiResourceItemReaderFlatFileTests extends FlatFileItemReader fileReader = new FlatFileItemReader(); fileReader.setFieldSetMapper(new FieldSetMapper() { - public Foo mapLine(FieldSet fs) { + public Foo process(FieldSet fs) { Foo foo = new Foo(); foo.setValue(fs.readInt(0)); return foo; 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 1810bd37c..eb262d791 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 @@ -63,7 +63,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "true", "C" }, new String[] { "varString", "varBoolean", "varChar" }); - TestObject result = mapper.mapLine(fieldSet); + TestObject result = mapper.process(fieldSet); assertEquals("This is some dummy string", result.getVarString()); assertEquals(true, result.isVarBoolean()); assertEquals('C', result.getVarChar()); @@ -78,7 +78,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "true", "C" }, new String[] { "varString", "varBoolean", "varChar" }); - TestObject result = mapper.mapLine(fieldSet); + TestObject result = mapper.process(fieldSet); assertEquals("This is some dummy string", result.getVarString()); assertEquals(true, result.isVarBoolean()); assertEquals('C', result.getVarChar()); @@ -93,7 +93,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "true", "C" }, new String[] { "VarString", "VAR_BOOLEAN", "VAR_CHAR" }); - TestObject result = mapper.mapLine(fieldSet); + TestObject result = mapper.process(fieldSet); assertEquals("This is some dummy string", result.getVarString()); assertEquals(true, result.isVarBoolean()); assertEquals('C', result.getVarChar()); @@ -107,7 +107,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "true", "C" }, new String[] { "varString", "varBoolean", "varChar" }); - TestObject result = mapper.mapLine(fieldSet); + TestObject result = mapper.process(fieldSet); assertEquals("This is some dummy string", result.getVarString()); assertEquals(true, result.isVarBoolean()); assertEquals('C', result.getVarChar()); @@ -130,7 +130,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { new String[] { "This is some dummy string", "1", "Another dummy", "2" }, new String[] { "valueA", "valueB", "testObjectB.valueA", "testObjectB.testObjectC.value" }); - TestNestedA result = mapper.mapLine(fieldSet); + TestNestedA result = mapper.process(fieldSet); assertEquals("This is some dummy string", result.getValueA()); assertEquals(1, result.getValueB()); @@ -150,7 +150,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "1" }, new String[] { "VALUE_A", "VALUE_B" }); - TestNestedA result = (TestNestedA) mapper.mapLine(fieldSet); + TestNestedA result = (TestNestedA) mapper.process(fieldSet); assertEquals("This is some dummy string", result.getValueA()); assertEquals(1, result.getValueB()); @@ -167,7 +167,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "1" }, new String[] { "foo" }); - TestNestedC result = mapper.mapLine(fieldSet); + TestNestedC result = mapper.process(fieldSet); // "foo" is similar enough to "value" that it matches - but only because // nothing else does... @@ -189,7 +189,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "Another dummy", "2" }, new String[] { "TestObjectB.ValueA", "TestObjectB.TestObjectC.Value" }); - TestNestedA result = mapper.mapLine(fieldSet); + TestNestedA result = mapper.process(fieldSet); assertEquals("Another dummy", result.getTestObjectB().getValueA()); assertEquals(2, result.getTestObjectB().getTestObjectC().getValue()); @@ -209,7 +209,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "Another dummy" }, new String[] { "TestObjectB.foo" }); try { - mapper.mapLine(fieldSet); + mapper.process(fieldSet); fail("Expected NotWritablePropertyException"); } catch (NotWritablePropertyException e) { @@ -231,7 +231,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "2" }, new String[] { "TestObjectA.garbage" }); try { - mapper.mapLine(fieldSet); + mapper.process(fieldSet); fail("Expected NotWritablePropertyException"); } catch (NotWritablePropertyException e) { @@ -271,7 +271,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { FieldSet fieldSet = new DefaultFieldSet(new String[] { "1", "2", "3" }, new String[] { "NestedC[0].Value", "NestedC[1].Value", "NestedC[2].Value" }); - mapper.mapLine(fieldSet); + mapper.process(fieldSet); assertEquals(1, ((TestNestedC) nestedList.getNestedC().get(0)).getValue()); assertEquals(2, ((TestNestedC) nestedList.getNestedC().get(1)).getValue()); @@ -285,7 +285,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { mapper.setTargetType(TestObject.class); FieldSet fieldSet = new DefaultFieldSet(new String[] { "00009" }, new String[] { "varLong" }); - TestObject bean = (TestObject) mapper.mapLine(fieldSet); + TestObject bean = (TestObject) mapper.process(fieldSet); // since Spring 2.5.5 this is OK (before that BATCH-261) assertEquals(9, bean.getVarLong()); } @@ -299,7 +299,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { mapper.setCustomEditors(Collections.singletonMap(Long.TYPE, new CustomNumberEditor(Long.class, NumberFormat .getNumberInstance(), true))); - TestObject bean = (TestObject) mapper.mapLine(fieldSet); + TestObject bean = (TestObject) mapper.process(fieldSet); assertEquals(9, bean.getVarLong()); } @@ -313,7 +313,7 @@ public class BeanWrapperFieldSetMapperTests extends TestCase { mapper.setCustomEditors(Collections.singletonMap(Long.TYPE, new CustomNumberEditor(Long.class, NumberFormat .getNumberInstance(), true))); - TestObject bean = (TestObject) mapper.mapLine(fieldSet); + TestObject bean = (TestObject) mapper.process(fieldSet); assertEquals(9, bean.getVarLong()); assertEquals(78, bean.getVarInt()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapperTests.java index 84fa0773f..2842ad656 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapperTests.java @@ -27,11 +27,11 @@ public class PassThroughFieldSetMapperTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper#mapLine(org.springframework.batch.item.file.mapping.FieldSet)}. + * {@link org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper#process(org.springframework.batch.item.file.mapping.FieldSet)}. */ public void testMapLine() { FieldSet fieldSet = new DefaultFieldSet(new String[] { "foo", "bar" }); - assertEquals(fieldSet, mapper.mapLine(fieldSet)); + assertEquals(fieldSet, mapper.process(fieldSet)); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java index 7c10a3445..5fc325e86 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java @@ -30,12 +30,12 @@ public class DelimitedLineAggregatorTests { @Test public void testSetDelimiter() { aggregator.setDelimiter(";"); - assertEquals("foo;bar", aggregator.aggregate(new String[] { "foo", "bar" })); + assertEquals("foo;bar", aggregator.process(new String[] { "foo", "bar" })); } @Test public void testAggregate() { - assertEquals("foo,bar", aggregator.aggregate(new String[] { "foo", "bar" })); + assertEquals("foo,bar", aggregator.process(new String[] { "foo", "bar" })); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java index 925d97488..41662067a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java @@ -27,7 +27,7 @@ public class DelimitedLineTokenizerTests extends TestCase { private DelimitedLineTokenizer tokenizer = new DelimitedLineTokenizer(); public void testTokenizeRegularUse() { - FieldSet tokens = tokenizer.tokenize("sfd,\"Well,I have no idea what to do in the afternoon\",sFj, asdf,,as\n"); + FieldSet tokens = tokenizer.process("sfd,\"Well,I have no idea what to do in the afternoon\",sFj, asdf,,as\n"); assertEquals(6, tokens.getFieldCount()); assertTrue(TOKEN_MATCHES, tokens.readString(0).equals("sfd")); assertTrue(TOKEN_MATCHES, tokens.readString(1).equals("Well,I have no idea what to do in the afternoon")); @@ -36,7 +36,7 @@ public class DelimitedLineTokenizerTests extends TestCase { assertTrue(TOKEN_MATCHES, tokens.readString(4).equals("")); assertTrue(TOKEN_MATCHES, tokens.readString(5).equals("as")); - tokens = tokenizer.tokenize("First string,"); + tokens = tokenizer.process("First string,"); assertEquals(2, tokens.getFieldCount()); assertTrue(TOKEN_MATCHES, tokens.readString(0).equals("First string")); assertTrue(TOKEN_MATCHES, tokens.readString(1).equals("")); @@ -53,13 +53,13 @@ public class DelimitedLineTokenizerTests extends TestCase { } public void testDelimitedLineTokenizer() { - FieldSet line = tokenizer.tokenize("a,b,c"); + FieldSet line = tokenizer.process("a,b,c"); assertEquals(3, line.getFieldCount()); } public void testNames() { tokenizer.setNames(new String[] {"A", "B", "C"}); - FieldSet line = tokenizer.tokenize("a,b,c"); + FieldSet line = tokenizer.process("a,b,c"); assertEquals(3, line.getFieldCount()); assertEquals("a", line.readString("A")); } @@ -67,7 +67,7 @@ public class DelimitedLineTokenizerTests extends TestCase { public void testTooFewNames() { tokenizer.setNames(new String[] {"A", "B"}); try { - tokenizer.tokenize("a,b,c"); + tokenizer.process("a,b,c"); fail("Expected IncorrectTokenCountException"); } catch (IncorrectTokenCountException e) { @@ -79,7 +79,7 @@ public class DelimitedLineTokenizerTests extends TestCase { public void testTooManyNames() { tokenizer.setNames(new String[] {"A", "B", "C", "D"}); try{ - tokenizer.tokenize("a,b,c"); + tokenizer.process("a,b,c"); } catch(IncorrectTokenCountException e){ assertEquals(4, e.getExpectedCount()); @@ -90,25 +90,25 @@ public class DelimitedLineTokenizerTests extends TestCase { public void testDelimitedLineTokenizerChar() { AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer(' '); - FieldSet line = tokenizer.tokenize("a b c"); + FieldSet line = tokenizer.process("a b c"); assertEquals(3, line.getFieldCount()); } public void testTokenizeWithQuotes() { - FieldSet line = tokenizer.tokenize("a,b,\"c\""); + FieldSet line = tokenizer.process("a,b,\"c\""); assertEquals(3, line.getFieldCount()); assertEquals("c", line.readString(2)); } public void testTokenizeWithNotDefaultQuotes() { tokenizer.setQuoteCharacter('\''); - FieldSet line = tokenizer.tokenize("a,b,'c'"); + FieldSet line = tokenizer.process("a,b,'c'"); assertEquals(3, line.getFieldCount()); assertEquals("c", line.readString(2)); } public void testTokenizeWithEscapedQuotes() { - FieldSet line = tokenizer.tokenize("a,\"\"b,\"\"\"c\""); + FieldSet line = tokenizer.process("a,\"\"b,\"\"\"c\""); assertEquals(3, line.getFieldCount()); assertEquals("\"\"b", line.readString(1)); assertEquals("\"c", line.readString(2)); @@ -116,39 +116,39 @@ public class DelimitedLineTokenizerTests extends TestCase { public void testTokenizeWithUnclosedQuotes() { tokenizer.setQuoteCharacter('\''); - FieldSet line = tokenizer.tokenize("a,\"b,c"); + FieldSet line = tokenizer.process("a,\"b,c"); assertEquals(3, line.getFieldCount()); assertEquals("\"b", line.readString(1)); assertEquals("c", line.readString(2)); } public void testTokenizeWithSpaceAtEnd() { - FieldSet line = tokenizer.tokenize("a,b,c "); + FieldSet line = tokenizer.process("a,b,c "); assertEquals(3, line.getFieldCount()); assertEquals("c", line.readString(2)); } public void testTokenizeWithQuoteAndSpaceAtEnd() { - FieldSet line = tokenizer.tokenize("a,b,\"c\" "); + FieldSet line = tokenizer.process("a,b,\"c\" "); assertEquals(3, line.getFieldCount()); assertEquals("c", line.readString(2)); } public void testTokenizeWithQuoteAndSpaceBeforeDelimiter() { - FieldSet line = tokenizer.tokenize("a,\"b\" ,c"); + FieldSet line = tokenizer.process("a,\"b\" ,c"); assertEquals(3, line.getFieldCount()); assertEquals("b", line.readString(1)); } public void testTokenizeWithDelimiterAtEnd() { - FieldSet line = tokenizer.tokenize("a,b,c,"); + FieldSet line = tokenizer.process("a,b,c,"); assertEquals(4, line.getFieldCount()); assertEquals("c", line.readString(2)); assertEquals("", line.readString(3)); } public void testEmptyLine() throws Exception { - FieldSet line = tokenizer.tokenize(""); + FieldSet line = tokenizer.process(""); assertEquals(0, line.getFieldCount()); } @@ -156,7 +156,7 @@ public class DelimitedLineTokenizerTests extends TestCase { tokenizer.setNames(new String[]{"A", "B"}); try{ - tokenizer.tokenize(""); + tokenizer.process(""); } catch(IncorrectTokenCountException ex){ assertEquals(2, ex.getExpectedCount()); @@ -165,33 +165,33 @@ public class DelimitedLineTokenizerTests extends TestCase { } public void testWhitespaceLine() throws Exception { - FieldSet line = tokenizer.tokenize(" "); + FieldSet line = tokenizer.process(" "); // whitespace counts as text assertEquals(1, line.getFieldCount()); } public void testNullLine() throws Exception { - FieldSet line = tokenizer.tokenize(null); + FieldSet line = tokenizer.process(null); // null doesn't... assertEquals(0, line.getFieldCount()); } public void testMultiLineField() throws Exception { - FieldSet line = tokenizer.tokenize("a,b,c\nrap"); + FieldSet line = tokenizer.process("a,b,c\nrap"); assertEquals(3, line.getFieldCount()); assertEquals("c\nrap", line.readString(2)); } public void testMultiLineFieldWithQuotes() throws Exception { - FieldSet line = tokenizer.tokenize("a,b,\"c\nrap\""); + FieldSet line = tokenizer.process("a,b,\"c\nrap\""); assertEquals(3, line.getFieldCount()); assertEquals("c\nrap", line.readString(2)); } public void testTokenizeWithQuotesEmptyValue() { - FieldSet line = tokenizer.tokenize("\"a\",\"b\",\"\",\"d\""); + FieldSet line = tokenizer.process("\"a\",\"b\",\"\",\"d\""); assertEquals(4, line.getFieldCount()); assertEquals("", line.readString(2)); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FixedLengthTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FixedLengthTokenizerTests.java index 4583c6efb..88c325d92 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FixedLengthTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FixedLengthTokenizerTests.java @@ -36,7 +36,7 @@ public class FixedLengthTokenizerTests { public void testTokenizeEmptyString() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 10), new Range(11, 15) }); try { - tokenizer.tokenize(""); + tokenizer.process(""); fail("Expected IncorrectLineLengthException"); } catch (IncorrectLineLengthException ex) { @@ -48,14 +48,14 @@ public class FixedLengthTokenizerTests { @Test public void testEmptyStringWithNoRanges() { tokenizer.setColumns(new Range[] {}); - tokenizer.tokenize(""); + tokenizer.process(""); } @Test public void testTokenizeSmallerStringThanRanges() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 10), new Range(11, 15) }); try { - tokenizer.tokenize("12345"); + tokenizer.process("12345"); fail("Expected IncorrectLineLengthException"); } catch (IncorrectLineLengthException ex) { @@ -68,7 +68,7 @@ public class FixedLengthTokenizerTests { @Test public void testTokenizeSmallerStringThanRangesWithWhitespace() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 10) }); - FieldSet tokens = tokenizer.tokenize("12345 "); + FieldSet tokens = tokenizer.process("12345 "); assertEquals("12345", tokens.readString(0)); assertEquals("", tokens.readString(1)); } @@ -77,7 +77,7 @@ public class FixedLengthTokenizerTests { public void testTokenizeSmallerStringThanRangesNotStrict() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 10) }); tokenizer.setStrict(false); - FieldSet tokens = tokenizer.tokenize("12345"); + FieldSet tokens = tokenizer.process("12345"); assertEquals("12345", tokens.readString(0)); assertEquals("", tokens.readString(1)); } @@ -85,7 +85,7 @@ public class FixedLengthTokenizerTests { @Test public void testTokenizeSmallerStringThanRangesWithWhitespaceOpenEnded() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6) }); - FieldSet tokens = tokenizer.tokenize("12345 "); + FieldSet tokens = tokenizer.process("12345 "); assertEquals("12345", tokens.readString(0)); assertEquals("", tokens.readString(1)); } @@ -94,7 +94,7 @@ public class FixedLengthTokenizerTests { public void testTokenizeNullString() { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 10), new Range(11, 15) }); try { - tokenizer.tokenize(null); + tokenizer.process(null); fail("Expected IncorrectLineLengthException"); } catch (IncorrectLineLengthException ex) { @@ -106,7 +106,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 2), new Range(3, 7), new Range(8, 12) }); // test shorter line as defined by record descriptor line = "H11234512345"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(3, tokens.getFieldCount()); assertEquals("H1", tokens.readString(0)); assertEquals("12345", tokens.readString(1)); @@ -118,7 +118,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 10), new Range(11, 25), new Range(26, 30) }); // test shorter line as defined by record descriptor line = "H1 12345678 12345"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(3, tokens.getFieldCount()); assertEquals(line.substring(0, 10).trim(), tokens.readString(0)); assertEquals(line.substring(10, 25).trim(), tokens.readString(1)); @@ -130,7 +130,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 10), new Range(11, 25), new Range(26, 30) }); line = "H1 12345678 1234567890"; try { - tokenizer.tokenize(line); + tokenizer.process(line); fail("Expected IncorrectLineLengthException"); } catch (IncorrectLineLengthException ex) { @@ -143,7 +143,7 @@ public class FixedLengthTokenizerTests { public void testLongerLinesOpenRange() throws Exception { tokenizer.setColumns(new Range[] { new Range(1, 10), new Range(11, 25), new Range(26) }); line = "H1 12345678 1234567890"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(line.substring(0, 10).trim(), tokens.readString(0)); assertEquals(line.substring(10, 25).trim(), tokens.readString(1)); assertEquals(line.substring(25).trim(), tokens.readString(2)); @@ -154,7 +154,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 10), new Range(11, 25), new Range(26,30) }); line = "H1 12345678 1234567890"; tokenizer.setStrict(false); - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(line.substring(0, 10).trim(), tokens.readString(0)); assertEquals(line.substring(10, 25).trim(), tokens.readString(1)); assertEquals(line.substring(25, 30).trim(), tokens.readString(2)); @@ -165,7 +165,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(14, 28), new Range(34, 38), new Range(1, 10) }); // test normal length line = "H1 +++12345678 +++++12345"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(3, tokens.getFieldCount()); assertEquals(line.substring(0, 10).trim(), tokens.readString(2)); assertEquals(line.substring(13, 28).trim(), tokens.readString(0)); @@ -177,7 +177,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 5), new Range(6, 15), new Range(16, 25), new Range(26, 27) }); // test another type of record line = "H2 123456 12345 12"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(4, tokens.getFieldCount()); assertEquals(line.substring(0, 5).trim(), tokens.readString(0)); assertEquals(line.substring(5, 15).trim(), tokens.readString(1)); @@ -191,7 +191,7 @@ public class FixedLengthTokenizerTests { new Range(34) }); // test another type of record line = "H2 123456 12345 12-123456"; - FieldSet tokens = tokenizer.tokenize(line); + FieldSet tokens = tokenizer.process(line); assertEquals(5, tokens.getFieldCount()); assertEquals(line.substring(0, 5).trim(), tokens.readString(0)); assertEquals(line.substring(5, 15).trim(), tokens.readString(1)); @@ -205,7 +205,7 @@ public class FixedLengthTokenizerTests { tokenizer.setColumns(new Range[] { new Range(1, 5) }); try { - tokenizer.tokenize("12345"); + tokenizer.process("12345"); fail("Exception was expected: too few names provided"); } catch (IncorrectTokenCountException e) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java index a5f0928c1..031ab05ff 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java @@ -39,7 +39,7 @@ public class FormatterLineAggregatorTests { String[] args = { "does not matter what is here" }; try { - aggregator.aggregate(args); + aggregator.process(args); fail("should not work with no format specified"); } catch (IllegalArgumentException expected) { @@ -56,7 +56,7 @@ public class FormatterLineAggregatorTests { aggregator.setMaximumLength(3); aggregator.setFormat("%3s"); try { - aggregator.aggregate(args); + aggregator.process(args); fail("Invalid text length, exception should have been thrown"); } catch (IllegalStateException expected) { @@ -71,7 +71,7 @@ public class FormatterLineAggregatorTests { public void testAggregate() { String[] args = { "Matchsize", "Smallsize" }; aggregator.setFormat("%9s%9s"); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals("MatchsizeSmallsize", result); } @@ -82,7 +82,7 @@ public class FormatterLineAggregatorTests { public void testAggregateWithLastRangeUnbound() { String[] args = { "Matchsize", "Smallsize" }; aggregator.setFormat("%-12s%s"); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals("Matchsize Smallsize", result); } @@ -93,7 +93,7 @@ public class FormatterLineAggregatorTests { public void testAggregateFormattedRight() { String[] args = { "Matchsize", "Smallsize" }; aggregator.setFormat("%13s%10s"); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals(23, result.length()); assertEquals(" Matchsize Smallsize", result); } @@ -127,7 +127,7 @@ public class FormatterLineAggregatorTests { } }); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals(" Matchsize Smallsize ", result); } @@ -160,7 +160,7 @@ public class FormatterLineAggregatorTests { } }); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals("Matchsize....Smallsize..", result); } @@ -171,7 +171,7 @@ public class FormatterLineAggregatorTests { public void testAggregateFormattedLeft() { String[] args = { "Matchsize", "Smallsize" }; aggregator.setFormat("%-13s%-11s"); - String result = aggregator.aggregate(args); + String result = aggregator.process(args); assertEquals("Matchsize Smallsize ", result); } @@ -183,6 +183,6 @@ public class FormatterLineAggregatorTests { public void testAggregateNullArgument() { String[] args = { null }; aggregator.setFormat("%3s"); - assertEquals(" ", aggregator.aggregate(args)); + assertEquals(" ", aggregator.process(args)); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java index 5407405a2..513569400 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java @@ -9,13 +9,13 @@ public class PassThroughLineAggregatorTests extends TestCase { private LineAggregator mapper = new PassThroughLineAggregator(); - public void testUnmapItemAsFieldSet() { + public void testUnmapItemAsFieldSet() throws Exception { Object item = new Object(); - assertEquals(item.toString(), mapper.aggregate(item)); + assertEquals(item.toString(), mapper.process(item)); } - public void testUnmapItemAsString() { - assertEquals("foo", mapper.aggregate("foo")); + public void testUnmapItemAsString() throws Exception { + assertEquals("foo", mapper.process("foo")); } } 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 94cd93226..4db0d2d8f 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 @@ -32,7 +32,7 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { public void testNoTokenizers() throws Exception { try { - tokenizer.tokenize("a line"); + tokenizer.process("a line"); fail("Expected IllegalStateException"); } catch (IllegalStateException e) { // expected @@ -41,7 +41,7 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { public void testNullLine() throws Exception { tokenizer.setTokenizers(Collections.singletonMap("foo", (LineTokenizer) new DelimitedLineTokenizer())); - FieldSet fields = tokenizer.tokenize(null); + FieldSet fields = tokenizer.process(null); assertEquals(0, fields.getFieldCount()); } @@ -49,12 +49,12 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { Map map = new HashMap(); map.put("", new DelimitedLineTokenizer()); map.put("foo", new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { return null; } }); tokenizer.setTokenizers(map); - FieldSet fields = tokenizer.tokenize("abc"); + FieldSet fields = tokenizer.process("abc"); assertEquals(1, fields.getFieldCount()); } @@ -62,20 +62,20 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { Map map = new LinkedHashMap(); map.put("", new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { return null; } }); map.put("foo", new DelimitedLineTokenizer()); tokenizer.setTokenizers(map); - FieldSet fields = tokenizer.tokenize("foo,bar"); + FieldSet fields = tokenizer.process("foo,bar"); assertEquals("bar", fields.readString(1)); } public void testNoMatch() throws Exception { tokenizer.setTokenizers(Collections.singletonMap("foo", (LineTokenizer) new DelimitedLineTokenizer())); try { - tokenizer.tokenize("nomatch"); + tokenizer.process("nomatch"); fail("Expected IllegalStateException"); } catch (IllegalStateException e) { // expected @@ -84,11 +84,11 @@ public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { public void testMatchWithPrefix() throws Exception { tokenizer.setTokenizers(Collections.singletonMap("foo", (LineTokenizer) new LineTokenizer() { - public FieldSet tokenize(String line) { + public FieldSet process(String line) { return new DefaultFieldSet(new String[] {line}); } })); - FieldSet fields = tokenizer.tokenize("foo bar"); + FieldSet fields = tokenizer.process("foo bar"); assertEquals(1, fields.getFieldCount()); assertEquals("foo bar", fields.readString(0)); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java index 0b933b82f..a2e8bc8ec 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java @@ -34,15 +34,15 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { public void testSetDelegateAndPassInString() throws Exception { aggregator.setDelegate(new LineAggregator() { - public String aggregate(String item) { + public String process(String item) { return "bar"; } }); - assertEquals("bar", aggregator.aggregate(Collections.singleton("foo"))); + assertEquals("bar", aggregator.process(Collections.singleton("foo"))); } public void testTransformList() throws Exception { - String result = aggregator.aggregate(Arrays.asList(StringUtils.commaDelimitedListToStringArray("foo,bar"))); + String result = aggregator.process(Arrays.asList(StringUtils.commaDelimitedListToStringArray("foo,bar"))); String[] array = StringUtils.delimitedListToStringArray(result, LINE_SEPARATOR); assertEquals("foo", array[0]); assertEquals("bar", array[1]); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java index c106c3ace..2cd52ced3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java @@ -16,26 +16,26 @@ public class AggregateItemFieldSetMapperTests { @Test public void testDefaultBeginRecord() throws Exception { - assertTrue(mapper.mapLine(new DefaultFieldSet(new String[] { "BEGIN" })).isHeader()); - assertFalse(mapper.mapLine(new DefaultFieldSet(new String[] { "BEGIN" })).isFooter()); + assertTrue(mapper.process(new DefaultFieldSet(new String[] { "BEGIN" })).isHeader()); + assertFalse(mapper.process(new DefaultFieldSet(new String[] { "BEGIN" })).isFooter()); } @Test public void testSetBeginRecord() throws Exception { mapper.setBegin("FOO"); - assertTrue(mapper.mapLine(new DefaultFieldSet(new String[] { "FOO" })).isHeader()); + assertTrue(mapper.process(new DefaultFieldSet(new String[] { "FOO" })).isHeader()); } @Test public void testDefaultEndRecord() throws Exception { - assertFalse(mapper.mapLine(new DefaultFieldSet(new String[] { "END" })).isHeader()); - assertTrue(mapper.mapLine(new DefaultFieldSet(new String[] { "END" })).isFooter()); + assertFalse(mapper.process(new DefaultFieldSet(new String[] { "END" })).isHeader()); + assertTrue(mapper.process(new DefaultFieldSet(new String[] { "END" })).isFooter()); } @Test public void testSetEndRecord() throws Exception { mapper.setEnd("FOO"); - assertTrue(mapper.mapLine(new DefaultFieldSet(new String[] { "FOO" })).isFooter()); + assertTrue(mapper.process(new DefaultFieldSet(new String[] { "FOO" })).isFooter()); } @Test @@ -52,11 +52,11 @@ public class AggregateItemFieldSetMapperTests { @Test public void testDelegate() throws Exception { mapper.setDelegate(new FieldSetMapper() { - public String mapLine(FieldSet fs) { + public String process(FieldSet fs) { return "foo"; } }); - assertEquals("foo", mapper.mapLine(new DefaultFieldSet(new String[] { "FOO" })).getItem()); + assertEquals("foo", mapper.process(new DefaultFieldSet(new String[] { "FOO" })).getItem()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java index c7d369d09..9acf3128c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java @@ -62,7 +62,7 @@ public abstract class AbstractTradeBatchTests extends TestCase { } protected static class TradeMapper implements FieldSetMapper { - public Trade mapLine(FieldSet fs) { + public Trade process(FieldSet fs) { return new Trade(fs); } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java index cade553f2..5e5eeb0f8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java @@ -6,7 +6,7 @@ import org.springframework.batch.sample.domain.football.Game; public class GameFieldSetMapper implements FieldSetMapper { - public Game mapLine(FieldSet fs) { + public Game process(FieldSet fs) { if(fs == null){ return null; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java index 0d312a93a..68c43ee24 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java @@ -6,7 +6,7 @@ import org.springframework.batch.sample.domain.football.Player; public class PlayerFieldSetMapper implements FieldSetMapper { - public Player mapLine(FieldSet fs) { + public Player process(FieldSet fs) { if(fs == null){ return null; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java index 103e2cfee..2aed512ca 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java @@ -33,7 +33,7 @@ public class AddressFieldSetMapper implements FieldSetMapper
{ public static final String COUNTRY_COLUMN = "COUNTRY"; - public Address mapLine(FieldSet fieldSet) { + public Address process(FieldSet fieldSet) { Address address = new Address(); address.setAddressee(fieldSet.readString(ADDRESSEE_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java index da5e351ce..06e28ec1c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java @@ -27,7 +27,7 @@ public class BillingFieldSetMapper implements FieldSetMapper { public static final String PAYMENT_TYPE_ID_COLUMN = "PAYMENT_TYPE_ID"; public static final String PAYMENT_DESC_COLUMN = "PAYMENT_DESC"; - public BillingInfo mapLine(FieldSet fieldSet) { + public BillingInfo process(FieldSet fieldSet) { BillingInfo info = new BillingInfo(); info.setPaymentId(fieldSet.readString(PAYMENT_TYPE_ID_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java index 68abcdd3e..d45fed4ed 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java @@ -34,7 +34,7 @@ public class CustomerFieldSetMapper implements FieldSetMapper { public static final String REG_ID_COLUMN = "REG_ID"; public static final String VIP_COLUMN = "VIP"; - public Customer mapLine(FieldSet fieldSet) { + public Customer process(FieldSet fieldSet) { Customer customer = new Customer(); if (Customer.LINE_ID_BUSINESS_CUST.equals(fieldSet.readString(LINE_ID_COLUMN))) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java index d05fb9ba8..42eaefe3f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java @@ -27,7 +27,7 @@ public class HeaderFieldSetMapper implements FieldSetMapper { public static final String ORDER_ID_COLUMN = "ORDER_ID"; public static final String ORDER_DATE_COLUMN = "ORDER_DATE"; - public Order mapLine(FieldSet fieldSet) { + public Order process(FieldSet fieldSet) { Order order = new Order(); order.setOrderId(fieldSet.readLong(ORDER_ID_COLUMN)); order.setOrderDate(fieldSet.readDate(ORDER_DATE_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java index b2eb1dd1b..2e9946cc8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java @@ -33,7 +33,7 @@ public class OrderItemFieldSetMapper implements FieldSetMapper { public static final String ITEM_ID_COLUMN = "ITEM_ID"; - public LineItem mapLine(FieldSet fieldSet) { + public LineItem process(FieldSet fieldSet) { LineItem item = new LineItem(); item.setItemId(fieldSet.readLong(ITEM_ID_COLUMN)); 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 d24a79d56..77346dc9a 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 @@ -74,7 +74,7 @@ public class OrderItemReader implements ItemReader { return result; } - private void process(FieldSet fieldSet) { + private void process(FieldSet fieldSet) throws Exception { // finish processing if we hit the end of file if (fieldSet == null) { log.debug("FINISHED"); @@ -89,7 +89,7 @@ public class OrderItemReader implements ItemReader { // start a new Order if (Order.LINE_ID_HEADER.equals(lineId)) { log.debug("STARTING NEW RECORD"); - order = headerMapper.mapLine(fieldSet); + order = headerMapper.process(fieldSet); return; } @@ -114,7 +114,7 @@ public class OrderItemReader implements ItemReader { log.debug("MAPPING CUSTOMER"); if (order.getCustomer() == null) { - order.setCustomer(customerMapper.mapLine(fieldSet)); + order.setCustomer(customerMapper.process(fieldSet)); order.getCustomer().setBusinessCustomer(true); } @@ -125,7 +125,7 @@ public class OrderItemReader implements ItemReader { log.debug("MAPPING CUSTOMER"); if (order.getCustomer() == null) { - order.setCustomer(customerMapper.mapLine(fieldSet)); + order.setCustomer(customerMapper.process(fieldSet)); order.getCustomer().setBusinessCustomer(false); } @@ -134,25 +134,25 @@ public class OrderItemReader implements ItemReader { if (Address.LINE_ID_BILLING_ADDR.equals(lineId)) { log.debug("MAPPING BILLING ADDRESS"); - order.setBillingAddress(addressMapper.mapLine(fieldSet)); + order.setBillingAddress(addressMapper.process(fieldSet)); return; } if (Address.LINE_ID_SHIPPING_ADDR.equals(lineId)) { log.debug("MAPPING SHIPPING ADDRESS"); - order.setShippingAddress(addressMapper.mapLine(fieldSet)); + order.setShippingAddress(addressMapper.process(fieldSet)); return; } if (BillingInfo.LINE_ID_BILLING_INFO.equals(lineId)) { log.debug("MAPPING BILLING INFO"); - order.setBilling(billingMapper.mapLine(fieldSet)); + order.setBilling(billingMapper.process(fieldSet)); return; } if (ShippingInfo.LINE_ID_SHIPPING_INFO.equals(lineId)) { log.debug("MAPPING SHIPPING INFO"); - order.setShipping(shippingMapper.mapLine(fieldSet)); + order.setShipping(shippingMapper.process(fieldSet)); return; } @@ -162,7 +162,7 @@ public class OrderItemReader implements ItemReader { if (order.getLineItems() == null) { order.setLineItems(new ArrayList()); } - order.getLineItems().add(itemMapper.mapLine(fieldSet)); + order.getLineItems().add(itemMapper.process(fieldSet)); return; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderProcessor.java index 4cfa643e7..c9e9301f0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderProcessor.java @@ -44,23 +44,24 @@ public class OrderProcessor implements ItemProcessor> { /** * Converts information from an Order object to a collection of Strings for * output. + * @throws Exception */ - public List process(Order order) { + public List process(Order order) throws Exception { List result = new ArrayList(); - result.add(getAggregator("header").aggregate(OrderFormatterUtils.headerArgs(order))); - result.add(getAggregator("customer").aggregate(OrderFormatterUtils.customerArgs(order))); - result.add(getAggregator("address").aggregate(OrderFormatterUtils.billingAddressArgs(order))); - result.add(getAggregator("billing").aggregate(OrderFormatterUtils.billingInfoArgs(order))); + result.add(getAggregator("header").process(OrderFormatterUtils.headerArgs(order))); + result.add(getAggregator("customer").process(OrderFormatterUtils.customerArgs(order))); + result.add(getAggregator("address").process(OrderFormatterUtils.billingAddressArgs(order))); + result.add(getAggregator("billing").process(OrderFormatterUtils.billingInfoArgs(order))); List items = order.getLineItems(); for (LineItem lineItem : items) { - result.add(getAggregator("item").aggregate(OrderFormatterUtils.lineItemArgs(lineItem))); + result.add(getAggregator("item").process(OrderFormatterUtils.lineItemArgs(lineItem))); } - result.add(getAggregator("footer").aggregate(OrderFormatterUtils.footerArgs(order))); + result.add(getAggregator("footer").process(OrderFormatterUtils.footerArgs(order))); return result; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java index 31f30b270..bb38b85fc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java @@ -28,7 +28,7 @@ public class ShippingFieldSetMapper implements FieldSetMapper { public static final String SHIPPING_TYPE_ID_COLUMN = "SHIPPING_TYPE_ID"; public static final String SHIPPER_ID_COLUMN = "SHIPPER_ID"; - public ShippingInfo mapLine(FieldSet fieldSet) { + public ShippingInfo process(FieldSet fieldSet) { ShippingInfo info = new ShippingInfo(); info.setShipperId(fieldSet.readString(SHIPPER_ID_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java index d9ddc01f1..182a38ffe 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java @@ -23,15 +23,15 @@ public class CompositeCustomerUpdateLineTokenizer implements LineTokenizer { /* (non-Javadoc) * @see org.springframework.batch.item.file.transform.LineTokenizer#tokenize(java.lang.String) */ - public FieldSet tokenize(String line) { + public FieldSet process(String line) throws Exception { if(line.charAt(0) == 'F'){ //line starts with F, so the footer tokenizer should tokenize it. - return footerTokenizer.tokenize(line); + return footerTokenizer.process(line); } else if(line.charAt(0) == 'A' || line.charAt(0) == 'U' || line.charAt(0) == 'D'){ //line starts with A,U, or D, so it must be a customer operation. - return customerTokenizer.tokenize(line); + return customerTokenizer.process(line); } else{ //If the line doesn't start with any of the characters above, it must obviously be invalid. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java index 942952672..24368b58c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java @@ -20,7 +20,7 @@ public class CustomerUpdateFieldSetMapper extends StepExecutionListenerSupport i StepExecution stepExecution; - public CustomerUpdate mapLine(FieldSet fs) { + public CustomerUpdate process(FieldSet fs) { char code = fs.readChar(0); if(code == 'F'){ diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java index 0821e42de..ffb7f374f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java @@ -29,7 +29,7 @@ public class TradeFieldSetMapper implements FieldSetMapper { public static final int PRICE_COLUMN = 2; public static final int CUSTOMER_COLUMN = 3; - public Trade mapLine(FieldSet fieldSet) { + public Trade process(FieldSet fieldSet) { Trade trade = new Trade(); trade.setIsin(fieldSet.readString(ISIN_COLUMN)); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java index 712b1d13c..031dccd68 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java @@ -84,13 +84,13 @@ public class OrderItemReaderTests { // create mock mapper FieldSetMapper mapper = createMock(FieldSetMapper.class); // set how mapper should respond - set return values for mapper - expect(mapper.mapLine(headerFS)).andReturn(order); - expect(mapper.mapLine(customerFS)).andReturn(customer); - expect(mapper.mapLine(billingFS)).andReturn(billing); - expect(mapper.mapLine(shippingFS)).andReturn(shipping); - expect(mapper.mapLine(billingInfoFS)).andReturn(billingInfo); - expect(mapper.mapLine(shippingInfoFS)).andReturn(shippingInfo); - expect(mapper.mapLine(itemFS)).andReturn(item).times(3); + expect(mapper.process(headerFS)).andReturn(order); + expect(mapper.process(customerFS)).andReturn(customer); + expect(mapper.process(billingFS)).andReturn(billing); + expect(mapper.process(shippingFS)).andReturn(shipping); + expect(mapper.process(billingInfoFS)).andReturn(billingInfo); + expect(mapper.process(shippingInfoFS)).andReturn(shippingInfo); + expect(mapper.process(itemFS)).andReturn(item).times(3); replay(mapper); // set-up provider: set mappers diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java index 33691cd49..a53d1ce68 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java @@ -33,46 +33,46 @@ public class CompositeCustomerUpdateLineTokenizerTests { } @Test - public void testFooter(){ + public void testFooter() throws Exception{ String footerLine = "Ffjkdalsfjdaskl;f"; - FieldSet fs = compositeTokenizer.tokenize(footerLine); + FieldSet fs = compositeTokenizer.process(footerLine); assertEquals(footerFieldSet, fs); assertEquals(footerLine, footerTokenizer.getTokenizedLine()); } @Test - public void testCustomerAdd(){ + public void testCustomerAdd() throws Exception{ String customerAddLine = "AFDASFDASFDFSA"; - FieldSet fs = compositeTokenizer.tokenize(customerAddLine); + FieldSet fs = compositeTokenizer.process(customerAddLine); assertEquals(customerFieldSet, fs); assertEquals(customerAddLine, customerTokenizer.getTokenizedLine()); } @Test - public void testCustomerDelete(){ + public void testCustomerDelete() throws Exception{ String customerAddLine = "DFDASFDASFDFSA"; - FieldSet fs = compositeTokenizer.tokenize(customerAddLine); + FieldSet fs = compositeTokenizer.process(customerAddLine); assertEquals(customerFieldSet, fs); assertEquals(customerAddLine, customerTokenizer.getTokenizedLine()); } @Test - public void testCustomerUpdate(){ + public void testCustomerUpdate() throws Exception{ String customerAddLine = "UFDASFDASFDFSA"; - FieldSet fs = compositeTokenizer.tokenize(customerAddLine); + FieldSet fs = compositeTokenizer.process(customerAddLine); assertEquals(customerFieldSet, fs); assertEquals(customerAddLine, customerTokenizer.getTokenizedLine()); } @Test(expected=IllegalArgumentException.class) - public void testInvalidLine(){ + public void testInvalidLine() throws Exception{ String invalidLine = "INVALID"; - compositeTokenizer.tokenize(invalidLine); + compositeTokenizer.process(invalidLine); } @@ -85,7 +85,7 @@ public class CompositeCustomerUpdateLineTokenizerTests { this.fieldSetToReturn = fieldSetToReturn; } - public FieldSet tokenize(String line) { + public FieldSet process(String line) { this.tokenizedLine = line; return fieldSetToReturn; } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java index 774c99c00..11940f74b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java @@ -34,10 +34,11 @@ public abstract class AbstractFieldSetMapperTests { /** * Regular usage scenario. * Assumes the domain object implements sensible equals(Object other) + * @throws Exception */ @Test - public void testRegularUse() { - assertEquals(expectedDomainObject(), fieldSetMapper().mapLine(fieldSet())); + public void testRegularUse() throws Exception { + assertEquals(expectedDomainObject(), fieldSetMapper().process(fieldSet())); } }