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 / GateValidator.java

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/GateValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/GateValidator.java
index fcfaa6a2e8394a57a2c917cb8f14bc31e2f2bb15..58a9efd02283686156e7494d6b7f9aec97baf089 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/GateValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/GateValidator.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.controller.packetcable.provider.validation.impl.validators.qos;
 
-import org.opendaylight.controller.packetcable.provider.validation.ValidationException;
 import org.opendaylight.controller.packetcable.provider.validation.impl.validators.AbstractValidator;
 import org.opendaylight.controller.packetcable.provider.validation.impl.validators.qos.classifier.ClassifiersValidator;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.pcmm.qos.gates.apps.app.subscribers.subscriber.gates.Gate;
@@ -23,14 +22,15 @@ public class GateValidator extends AbstractValidator<Gate> {
     private static final String TRAFFIC_PROFILE = "gate.traffic-profile";
     private static final String CLASSIFIERS = "gate.classifiers";
 
-//    private final GateSpecValidatator gateSpecValidatator = new GateSpecValidatator();
+//    private final GateSpecValidator gateSpecValidatator = new GateSpecValidator();
     private final TrafficProfileValidator trafficProfileValidator = new TrafficProfileValidator();
     private final ClassifiersValidator classifiersValidator = new ClassifiersValidator();
 
     @Override
-    public void validate(final Gate gate, final Extent extent) throws ValidationException {
+    protected void doValidate(final Gate gate, final Extent extent) {
         if (gate == null) {
-            throw new ValidationException("gate must exist");
+            getErrorMessages().add("gate must exist");
+            return;
         }
 
         mustExist(gate.getGateId(), GATE_ID);
@@ -46,7 +46,5 @@ public class GateValidator extends AbstractValidator<Gate> {
             validateChild(trafficProfileValidator, gate.getTrafficProfile());
             validateChild(classifiersValidator, gate.getClassifiers());
         }
-
-        throwErrorsIfNeeded();
     }
 }