From 23ffd045731e61352cbeab6594c2a611ef4b5e7e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 3 Oct 2017 17:58:32 +0100
Subject: [PATCH] Add type parameter for Accept/Reject-all validators

---
 .../org/iay/incommon/mda/validate/AcceptAllValidator.java   | 6 ++++--
 .../org/iay/incommon/mda/validate/RejectAllValidator.java   | 6 ++++--
 .../iay/incommon/mda/validate/AcceptAllValidatorTest.java   | 2 +-
 .../iay/incommon/mda/validate/RejectAllValidatorTest.java   | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
index 2c7e4b4..3157eb8 100644
--- a/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
+++ b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
@@ -24,11 +24,13 @@
  * A {@link Validator} which accepts any value, returning
  * {@link net.shibboleth.metadata.validate.Validator.Action#DONE}
  * to terminate any validator sequence.
+ *
+ * @param <V> type of the object to be validated
  */
-public class AcceptAllValidator extends BaseValidator implements Validator<Object> {
+public class AcceptAllValidator<V> extends BaseValidator implements Validator<V> {
 
     @Override
-    public Action validate(@Nonnull final Object e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+    public Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
         return Action.DONE;
     }
 
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
index 378c382..716cd90 100644
--- a/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
+++ b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
@@ -29,8 +29,10 @@
  *
  * An error status is added using the value of the given property as a format string.
  * The message defaults to a simple rejection message including the object's string value.
+ *
+ * @param <V> type of the object to be validated
  */
-public class RejectAllValidator extends BaseValidator implements Validator<Object> {
+public class RejectAllValidator<V> extends BaseValidator implements Validator<V> {
 
     /**
      * Message format string.
@@ -66,7 +68,7 @@ public void setMessage(@Nonnull final String newMessage) {
     }
 
     @Override
-    public Action validate(@Nonnull final Object e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+    public Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
         final String mess = String.format(message, e);
         addError(mess, item, stageId);
         return Action.DONE;
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
index 83f3b5c..11e1a79 100644
--- a/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
@@ -16,7 +16,7 @@ public class AcceptAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final AcceptAllValidator v = new AcceptAllValidator();
+        final AcceptAllValidator<String> v = new AcceptAllValidator<>();
         v.setId("comp");
         v.initialize();
 
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
index 7a23bc5..ba0a254 100644
--- a/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
@@ -16,7 +16,7 @@ public class RejectAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final RejectAllValidator v = new RejectAllValidator();
+        final RejectAllValidator<String> v = new RejectAllValidator<>();
         v.setId("comp");
         v.initialize();
 
@@ -34,7 +34,7 @@ public void validate() throws Exception {
 
     @Test
     public void validateWithMessage() throws Exception {
-        final RejectAllValidator v = new RejectAllValidator();
+        final RejectAllValidator<Double> v = new RejectAllValidator<>();
         v.setId("comp");
         v.setMessage("decimal %.2f");
         v.initialize();