Rename accept/reject-all validators

InCommon · Oct 3, 2017 · 4d96d49 · 4d96d49
1 parent 4769de5
commit 4d96d49
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/...n/mda/validate/AlwaysAcceptValidator.java → ...mmon/mda/validate/AcceptAllValidator.java b/...n/mda/validate/AlwaysAcceptValidator.java → ...mmon/mda/validate/AcceptAllValidator.java
@@ -25,7 +25,7 @@
  * {@link net.shibboleth.metadata.validate.Validator.Action#DONE}
  * to terminate any validator sequence.
  */
-public class AlwaysAcceptValidator extends BaseValidator implements Validator<Object> {
+public class AcceptAllValidator extends BaseValidator implements Validator<Object> {
 
     @Override
     public Action validate(@Nonnull final Object e, @Nonnull final Item<?> item, @Nonnull final String stageId) {

diff --git a/...n/mda/validate/AlwaysRejectValidator.java → ...mmon/mda/validate/RejectAllValidator.java b/...n/mda/validate/AlwaysRejectValidator.java → ...mmon/mda/validate/RejectAllValidator.java
@@ -30,7 +30,7 @@
  * 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.
  */
-public class AlwaysRejectValidator extends BaseValidator implements Validator<Object> {
+public class RejectAllValidator extends BaseValidator implements Validator<Object> {
 
     /**
      * Message format string.

diff --git a/src/main/resources/uk/org/iay/incommon/mda/beans.xml b/src/main/resources/uk/org/iay/incommon/mda/beans.xml
@@ -35,10 +35,10 @@
         Validator beans.
     -->
 
-    <bean id="inc.AlwaysAcceptValidator" abstract="true"
-        class="uk.org.iay.incommon.mda.validate.AlwaysAcceptValidator"/>
+    <bean id="inc.AcceptAllValidator" abstract="true"
+        class="uk.org.iay.incommon.mda.validate.AcceptAllValidator"/>
 
-    <bean id="inc.AlwaysRejectValidator" abstract="true"
-        class="uk.org.iay.incommon.mda.validate.AlwaysRejectValidator"/>
+    <bean id="inc.RejectAllValidator" abstract="true"
+        class="uk.org.iay.incommon.mda.validate.RejectAllValidator"/>
 
 </beans>
diff --git a/...a/validate/AlwaysAcceptValidatorTest.java → .../mda/validate/AcceptAllValidatorTest.java b/...a/validate/AlwaysAcceptValidatorTest.java → .../mda/validate/AcceptAllValidatorTest.java
@@ -12,11 +12,11 @@
 import net.shibboleth.metadata.validate.Validator.Action;
 import uk.org.ukfederation.mda.MockItem;
 
-public class AlwaysAcceptValidatorTest {
+public class AcceptAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final AlwaysAcceptValidator v = new AlwaysAcceptValidator();
+        final AcceptAllValidator v = new AcceptAllValidator();
         v.setId("comp");
         v.initialize();
 

diff --git a/...a/validate/AlwaysRejectValidatorTest.java → .../mda/validate/RejectAllValidatorTest.java b/...a/validate/AlwaysRejectValidatorTest.java → .../mda/validate/RejectAllValidatorTest.java
@@ -12,11 +12,11 @@
 import net.shibboleth.metadata.validate.Validator.Action;
 import uk.org.ukfederation.mda.MockItem;
 
-public class AlwaysRejectValidatorTest {
+public class RejectAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final AlwaysRejectValidator v = new AlwaysRejectValidator();
+        final RejectAllValidator v = new RejectAllValidator();
         v.setId("comp");
         v.initialize();
 
@@ -34,7 +34,7 @@ public void validate() throws Exception {
 
     @Test
     public void validateWithMessage() throws Exception {
-        final AlwaysRejectValidator v = new AlwaysRejectValidator();
+        final RejectAllValidator v = new RejectAllValidator();
         v.setId("comp");
         v.setMessage("decimal %.2f");
         v.initialize();