IN PROGRESS - BATCH-830: DelegatingItemReader should be removed

replaced ValidatingItemReader with ValidatingItemProcessor

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java

@@ -19,27 +19,27 @@ import org.springframework.util.Assert;
 @SuppressWarnings("unchecked")
 public class CompositeItemProcessor<I, O> implements ItemProcessor<I, O>, InitializingBean {
 
-	private List<ItemProcessor> itemTransformers;
+	private List<ItemProcessor> itemProcessors;
 
 	public O process(I item) throws Exception {
 		Object result = item;
 	
-		for(ItemProcessor transformer: itemTransformers){
+		for(ItemProcessor transformer: itemProcessors){
 			result = transformer.process(result);
 		}
 		return (O) result;
 	}
 
 	public void afterPropertiesSet() throws Exception {
-		Assert.notEmpty(itemTransformers);
+		Assert.notEmpty(itemProcessors);
 	}
 
 	/**
-	 * @param itemTransformers will be chained to produce a composite
+	 * @param itemProcessors will be chained to produce a composite
 	 * transformation.
 	 */
-	public void setItemTransformers(List<ItemProcessor> itemTransformers) {
-		this.itemTransformers = itemTransformers;
+	public void setItemProcessors(List<ItemProcessor> itemProcessors) {
+		this.itemProcessors = itemProcessors;
 	}
 
 }

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java

@@ -0,0 +1,42 @@
+package org.springframework.batch.item.validator;
+
+import org.springframework.batch.item.ItemProcessor;
+import org.springframework.util.Assert;
+
+/**
+ * Simple implementation of {@link ItemProcessor} validates and input and
+ * returns it without modifications.
+ * 
+ * @author Robert Kasanicky
+ * 
+ */
+public class ValidatingItemProcessor<T> implements ItemProcessor<T, T> {
+
+	private Validator validator;
+	
+	public ValidatingItemProcessor(Validator validator){
+		Assert.notNull(validator, "Validator must not be null.");
+		this.validator = validator;
+	}
+
+	/**
+	 * Set the validator used to validate each item.
+	 * 
+	 * @param validator
+	 */
+	public void setValidator(Validator validator) {
+		this.validator = validator;
+	}
+
+	/**
+	 * Validate the item and return it unmodified
+	 * 
+	 * @return the input item
+	 * @throws ValidationException if validation fails
+	 */
+	public T process(T item) throws ValidationException {
+		validator.validate(item);
+		return item;
+	}
+
+}

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemReader.java

@@ -1,59 +0,0 @@
-/*
- * Copyright 2006-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.item.validator;
-
-import org.springframework.batch.item.support.DelegatingItemReader;
-import org.springframework.util.Assert;
-
-/**
- * Simple extension of {@link DelegatingItemReader} that provides for
- * validation before returning input.
- *
- * @author Lucas Ward
- *
- */
-public class ValidatingItemReader<T> extends DelegatingItemReader<T> {
-
-	private Validator validator;
-
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.reader.DelegatingItemReader#afterPropertiesSet()
-	 */
-	public void afterPropertiesSet() throws Exception {
-		super.afterPropertiesSet();
-		Assert.notNull(validator, "Validator must not be null.");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.reader.DelegatingItemReader#read()
-	 */
-	public T read() throws Exception {
-		T input = super.read();
-		if(input != null){
-			validator.validate(input);
-		}
-		return input;
-	}
-
-	/**
-	 * Set the validator used to validate each item.
-	 *
-	 * @param validator
-	 */
-	public void setValidator(Validator validator) {
-		this.validator = validator;
-	}
-}