Rework parser infrastructure to support partial message processing

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

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
index e682b9df4d481e56ead270f008b524b1db196429..339943303fec940c566f7493d14cc7918e1f6e09 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
@@ -12,21 +12,20 @@ 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.ObjectHandlerRegistry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
 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.OpenMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.message.OpenMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.message.open.message.Open;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
 
 /**
  * Parser for {@link OpenMessage}
  */
 public class PCEPOpenMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 1;
+       public static final int TYPE = 1;
 
        public PCEPOpenMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -35,7 +34,7 @@ public class PCEPOpenMessageParser extends AbstractMessageParser {
        @Override
        public void serializeMessage(final Message message, final ByteBuf buffer) {
                if (!(message instanceof OpenMessage)) {
-                       throw new IllegalArgumentException("Wrong instance of Message. Passed instance " + message.getClass() + ". Nedded OpenMessage.");
+                       throw new IllegalArgumentException("Wrong instance of Message. Passed instance " + message.getClass() + ". Needed OpenMessage.");
                }
                final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.message.OpenMessage open = ((OpenMessage) message).getOpenMessage();
 
@@ -47,18 +46,7 @@ public class PCEPOpenMessageParser extends AbstractMessageParser {
        }
 
        @Override
-       public OpenMessage parseMessage(final byte[] buffer) throws PCEPDeserializerException, PCEPDocumentedException {
-               if (buffer == null || buffer.length == 0) {
-                       throw new PCEPDeserializerException("Open message doesn't contain OPEN object.");
-               }
-               final List<Object> objs = parseObjects(buffer);
-
-               return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.OpenBuilder().setOpenMessage(
-                               validate(objs)).build();
-       }
-
-       private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.message.OpenMessage validate(
-                       final List<Object> objects) throws PCEPDeserializerException {
+       protected org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Open validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
                if (objects == null) {
                        throw new IllegalArgumentException("Passed list can't be null.");
                }
@@ -76,11 +64,11 @@ public class PCEPOpenMessageParser extends AbstractMessageParser {
                        throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
                }
 
-               return msg;
+               return new OpenBuilder().setOpenMessage(msg).build();
        }
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }