Added support for priority in all classifiers

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

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/SubscribersValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/SubscribersValidator.java
index 0bc86940f0d0f6d401d22f1d7a101df40e691dbb..48b50fbeba7a73e5740e81716dbf8d2652f80088 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/SubscribersValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/SubscribersValidator.java
@@ -8,10 +8,9 @@
 
 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.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.gates.apps.app.Subscribers;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.gates.apps.app.subscribers.Subscriber;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.pcmm.qos.gates.apps.app.Subscribers;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.pcmm.qos.gates.apps.app.subscribers.Subscriber;
 
 /**
  * @author rvail
@@ -21,18 +20,19 @@ public class SubscribersValidator extends AbstractValidator<Subscribers> {
     private final SubscriberValidator subscriberValidator = new SubscriberValidator();
 
     @Override
-    public void validate(final Subscribers subscribers, final Extent extent) throws ValidationException {
+    protected void doValidate(final Subscribers subscribers, final Extent extent) {
         if (subscribers == null) {
-            throw new ValidationException("subscribers must exist");
+            getErrorMessages().add("subscribers must exist");
+            return;
         }
 
         if (extent == Extent.NODE_AND_SUBTREE) {
-            for (Subscriber subscriber : subscribers.getSubscriber()) {
-                validateChild(subscriberValidator , subscriber);
+            if (subscribers.getSubscriber() != null) {
+                for (Subscriber subscriber : subscribers.getSubscriber()) {
+                    validateChild(subscriberValidator, subscriber);
+                }
             }
         }
-
-        throwErrorsIfNeeded();
     }
 
 }