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 7f82c26c1..d29f93d6a 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 @@ -47,10 +47,6 @@ public class CompositeCustomerUpdateLineTokenizer extends StepExecutionListenerS //line starts with A,U, or D, so it must be a customer operation. return customerTokenizer.process(line); } - else if(line.charAt(0) == 'S'){ - //header record, ignore - return null; - } else{ //If the line doesn't start with any of the characters above, it must obviously be invalid. throw new IllegalArgumentException("Invalid line encountered for tokenizing: " + line); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java index 23e052d21..b42f4eb1c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessor.java @@ -13,8 +13,8 @@ import org.springframework.batch.item.ItemProcessor; */ public class CustomerUpdateProcessor implements ItemProcessor{ - CustomerDao customerDao; - InvalidCustomerLogger invalidCustomerLogger; + private CustomerDao customerDao; + private InvalidCustomerLogger invalidCustomerLogger; public CustomerUpdate process(CustomerUpdate item) throws Exception { diff --git a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml index 08a85d052..15ec09222 100644 --- a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml @@ -10,17 +10,7 @@ - - - - - - - - - - - + @@ -35,8 +25,13 @@ - + + + + + +