X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packetcable-policy-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fpacketcable%2Fprovider%2Fvalidation%2Fimpl%2Fvalidators%2Fccaps%2FConnectionValidator.java;h=fabea0ed452b10e6ecb46260aa5c927a23da5196;hb=refs%2Fchanges%2F26%2F46626%2F4;hp=3dbfe292fecd06c9192369d978db9bd06e607d9f;hpb=2661af1958d039a03ed599a518712d40b1393ea7;p=packetcable.git diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/ConnectionValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/ConnectionValidator.java index 3dbfe29..fabea0e 100644 --- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/ConnectionValidator.java +++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/ConnectionValidator.java @@ -8,9 +8,8 @@ package org.opendaylight.controller.packetcable.provider.validation.impl.validators.ccaps; -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.ccap.attributes.Connection; +import org.opendaylight.yang.gen.v1.urn.packetcable.rev161017.ccap.attributes.Connection; /** * @author rvail @@ -21,17 +20,15 @@ public class ConnectionValidator extends AbstractValidator { private static final String PORT = "connection.port"; @Override - public void validate(final Connection connection, Extent extent) throws ValidationException { + protected void doValidate(final Connection connection, Extent extent) { if (connection == null) { - throw new ValidationException("connection must exist"); + getErrorMessages().add("connection must exist"); + return; } mustExist(connection.getIpAddress(), IP_ADDRESS); // Note PortNumber validates range on creation so only existence needs to be checked mustExist(connection.getPort(), PORT); - - - throwErrorsIfNeeded(); } }