diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java index 28c3eaacf..086c2537d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java @@ -30,14 +30,14 @@ import org.springframework.validation.Errors; * @author Tomas Slanina * @author Robert Kasanicky */ -public class SpringValidator implements Validator, InitializingBean { +public class SpringValidator implements Validator, InitializingBean { private org.springframework.validation.Validator validator; /** * @see Validator#validate(Object) */ - public void validate(Object item) throws ValidationException { + public void validate(T item) throws ValidationException { if (!validator.supports(item.getClass())) { throw new ValidationException("Validation failed for " + item + ": " + item.getClass().getName() diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java index dc1e8fa67..66d2d4376 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java @@ -28,9 +28,9 @@ import org.springframework.util.Assert; */ public class ValidatingItemProcessor implements ItemProcessor { - private Validator validator; + private Validator validator; - public ValidatingItemProcessor(Validator validator){ + public ValidatingItemProcessor(Validator validator){ Assert.notNull(validator, "Validator must not be null."); this.validator = validator; } @@ -40,7 +40,7 @@ public class ValidatingItemProcessor implements ItemProcessor { * * @param validator */ - public void setValidator(Validator validator) { + public void setValidator(Validator validator) { this.validator = validator; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java index dafcbb98e..167fa0cc7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java @@ -23,12 +23,12 @@ package org.springframework.batch.item.validator; * @author tomas.slanina * */ -public interface Validator { +public interface Validator { /** * Method used to validate if the value is valid. * * @param value object to be validated * @throws ValidationException if value is not valid. */ - void validate(Object value) throws ValidationException; + void validate(T value) throws ValidationException; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java index 473436d9d..de5f549b6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java @@ -1,15 +1,20 @@ package org.springframework.batch.item.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertSame; + import org.junit.Test; -import static org.junit.Assert.*; -import static org.easymock.EasyMock.*; /** * Tests for {@link ValidatingItemProcessor}. */ public class ValidatingItemProcessorTests { - private Validator validator = createMock(Validator.class); + @SuppressWarnings("unchecked") + private Validator validator = createMock(Validator.class); private ValidatingItemProcessor tested = new ValidatingItemProcessor(validator);