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 8b232da86..84b7a8ba9 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 @@ -153,7 +153,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar * the {@link DataBinder} from {@link #createBinder(Object)} has errors * after binding). * - * @see org.springframework.batch.item.file.mapping.FieldSetMapper#process(Object) + * @see org.springframework.batch.item.file.mapping.FieldSetMapper#process(FieldSet) */ @SuppressWarnings("unchecked") public T process(FieldSet fs) { 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 0f13ffa44..39cebc3a8 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,7 +16,6 @@ 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 @@ -26,5 +25,7 @@ import org.springframework.batch.item.ItemProcessor; * @author Dave Syer * */ -public interface FieldSetMapper extends ItemProcessor { +public interface FieldSetMapper { + + T process(FieldSet fieldSet); } 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 014b0cb03..188557375 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,7 +16,6 @@ package org.springframework.batch.item.file.transform; -import org.springframework.batch.item.ItemProcessor; @@ -25,5 +24,7 @@ import org.springframework.batch.item.ItemProcessor; * * @author Dave Syer */ -public interface LineAggregator extends ItemProcessor{ +public interface LineAggregator { + + String process(T item); } 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 3794fd6ec..609e6f1a8 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,7 +16,6 @@ package org.springframework.batch.item.file.transform; -import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.file.mapping.FieldSet; @@ -27,5 +26,7 @@ import org.springframework.batch.item.file.mapping.FieldSet; * @author tomas.slanina * */ -public interface LineTokenizer extends ItemProcessor { +public interface LineTokenizer { + + FieldSet process(String line); } 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 8804db284..480fd089e 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 process(String line) throws Exception { + public FieldSet process(String line) { if (line == null) { return new DefaultFieldSet(new String[0]); 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 406f7098d..81cf5b5df 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,7 +31,7 @@ public class RecursiveCollectionLineAggregator implements LineAggregator items) throws Exception { + public String process(Collection items) { StringBuilder builder = new StringBuilder(); for (T value : items) { builder.append(delegate.process(value) + LINE_SEPARATOR); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java index 9c05c2fd5..7eb115148 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java @@ -83,7 +83,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper process(FieldSet fieldSet) throws Exception { + public AggregateItem process(FieldSet fieldSet) { if (fieldSet.readString(0).equals(begin)) { return AggregateItem.getHeader(); 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 d29f93d6a..be65eb97f 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 @@ -26,7 +26,7 @@ public class CompositeCustomerUpdateLineTokenizer extends StepExecutionListenerS /* (non-Javadoc) * @see org.springframework.batch.item.file.transform.LineTokenizer#tokenize(java.lang.String) */ - public FieldSet process(String line) throws Exception { + public FieldSet process(String line) { if(line.charAt(0) == 'F'){ //line starts with F, so the footer tokenizer should tokenize it.