Rework parser infrastructure to support partial message processing

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / message / PCEPCloseMessageParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
index 5a37f08e4af46555026ea4f73dd24f676ffe1c14..1a166cd4e70a49ee6193b479d9d9a4771a641c8c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
@@ -12,9 +12,7 @@ import io.netty.buffer.ByteBuf;
 import java.util.List;
 
 import org.opendaylight.protocol.pcep.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.PCEPDocumentedException;
-import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
-import org.opendaylight.protocol.pcep.spi.HandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Close;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.CloseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.CloseMessage;
@@ -22,24 +20,25 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.message.CCloseMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.message.CCloseMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.message.c.close.message.CClose;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.object.CClose;
 
 /**
- * Parser for {@link org.opendaylight.protocol.pcep.message.PCEPCloseMessage PCEPCloseMessage}
+ * Parser for {@link CloseMessage}
  */
 public class PCEPCloseMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 7;
+       public static final int TYPE = 7;
 
-       public PCEPCloseMessageParser(final HandlerRegistry registry) {
+       public PCEPCloseMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 
        @Override
        public void serializeMessage(final Message message, final ByteBuf buffer) {
-               if (!(message instanceof CloseMessage))
+               if (!(message instanceof CloseMessage)) {
                        throw new IllegalArgumentException("Wrong instance of Message. Passed instance of " + message.getClass()
                                        + ". Nedded CloseMessage.");
+               }
                final CCloseMessage close = ((CloseMessage) message).getCCloseMessage();
 
                if (close.getCClose() == null) {
@@ -49,34 +48,24 @@ public class PCEPCloseMessageParser extends AbstractMessageParser {
        }
 
        @Override
-       public CloseMessage parseMessage(final byte[] buffer) throws PCEPDeserializerException, PCEPDocumentedException {
-               if (buffer == null || buffer.length == 0) {
-                       throw new PCEPDeserializerException("Close message doesn't contain CLOSE object.");
-               }
-               final List<Object> objs = parseObjects(buffer);
-
-               return validate(objs);
-       }
-
-       private Close validate(final List<Object> objects) throws PCEPDeserializerException {
-               if (objects == null)
+       protected Close validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
+               if (objects == null) {
                        throw new IllegalArgumentException("Passed list can't be null.");
-
-               if (objects.isEmpty() || !(objects.get(0) instanceof CClose))
+               }
+               if (objects.isEmpty() || !(objects.get(0) instanceof CClose)) {
                        throw new PCEPDeserializerException("Close message doesn't contain CLOSE object.");
-
+               }
                final Object o = objects.get(0);
                final CCloseMessage msg = new CCloseMessageBuilder().setCClose((CClose) o).build();
                objects.remove(0);
-
-               if (!objects.isEmpty())
+               if (!objects.isEmpty()) {
                        throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
-
+               }
                return new CloseBuilder().setCCloseMessage(msg).build();
        }
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }