Minor fixes and adding unit testing for validators

[packetcable.git] / packetcable-policy-server / src / main / java / org / opendaylight / controller / packetcable / provider / validation / impl / validators / qos / classifier / ClassifiersValidator.java

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifiersValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifiersValidator.java
index 422b94eaf23085cc2d1343bc6f152b3ed7723ac1..a2d09178f002299c15630d1588bac89dc3fe16e8 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifiersValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifiersValidator.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.controller.packetcable.provider.validation.impl.validators.qos.classifier;
 
-import org.opendaylight.controller.packetcable.provider.validation.ValidationException;
 import org.opendaylight.controller.packetcable.provider.validation.impl.validators.AbstractValidator;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.classifier.attributes.Classifiers;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.classifier.attributes.classifiers.ClassifierContainer;
@@ -21,12 +20,13 @@ public class ClassifiersValidator extends AbstractValidator<Classifiers> {
 
     private static final String CLASSIFER_CONTAINER = "classifers.classifer-container";
 
-    private ClassifierContainerValidator classifierContainerValidator = new ClassifierContainerValidator();
+    private final ClassifierContainerValidator classifierContainerValidator = new ClassifierContainerValidator();
 
     @Override
-    public void validate(final Classifiers classifiers, final Extent extent) throws ValidationException {
+    protected void doValidate(final Classifiers classifiers, final Extent extent) {
         if (classifiers == null) {
-            throw new ValidationException("classifiers must exist");
+            getErrorMessages().add("classifiers must exist");
+            return;
         }
 
         mustExistAndNotBeEmpty(classifiers.getClassifierContainer(), CLASSIFER_CONTAINER);
@@ -49,8 +49,6 @@ public class ClassifiersValidator extends AbstractValidator<Classifiers> {
                 validateChild(classifierContainerValidator, classifier);
             }
         }
-
-        throwErrorsIfNeeded();
     }
 
 }