Revert "BUG-47 : unfinished PCEP migration to generated DTOs."

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / object / PCEPNotificationObjectParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
index 9c654954a61f30382a736090650155c8432e1984..7f277b7130ca1db7cd46de6b6a1b40c056e6f8e3 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
@@ -8,29 +8,17 @@
 package org.opendaylight.protocol.pcep.impl.object;
 
 import org.opendaylight.protocol.pcep.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.PCEPDocumentedException;
-import org.opendaylight.protocol.pcep.impl.Util;
-import org.opendaylight.protocol.pcep.spi.AbstractObjectParser;
-import org.opendaylight.protocol.pcep.spi.HandlerRegistry;
+import org.opendaylight.protocol.pcep.PCEPObject;
+import org.opendaylight.protocol.pcep.impl.PCEPObjectParser;
+import org.opendaylight.protocol.pcep.impl.PCEPTlvParser;
+import org.opendaylight.protocol.pcep.object.PCEPNotificationObject;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.NotificationObject;
-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.ObjectHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OverloadDurationTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.notification.object.Tlvs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.notification.object.TlvsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.notification.object.tlvs.OverloadDurationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcntf.message.pcntf.message.notifications.NotificationsBuilder;
 
 /**
- * Parser for {@link NotificationObject}
+ * Parser for {@link org.opendaylight.protocol.pcep.object.PCEPNotificationObject
+ * PCEPNotificationObject}
  */
-public class PCEPNotificationObjectParser extends AbstractObjectParser<NotificationsBuilder> {
-
-       public static final int CLASS = 12;
-
-       public static final int TYPE = 1;
+public class PCEPNotificationObjectParser implements PCEPObjectParser {
 
        /*
         * lengths of fields
@@ -42,56 +30,34 @@ public class PCEPNotificationObjectParser extends AbstractObjectParser<Notificat
        /*
         * offsets of fields
         */
-       public static final int FLAGS_F_OFFSET = 1; // added reserved filed of size 1
+       public static final int FLAGS_F_OFFSET = 1; //added reserved filed of size 1
        public static final int NT_F_OFFSET = FLAGS_F_OFFSET + FLAGS_F_LENGTH;
        public static final int NV_F_OFFSET = NT_F_OFFSET + NT_F_LENGTH;
        public static final int TLVS_OFFSET = NV_F_OFFSET + NV_F_LENGTH;
 
-       public PCEPNotificationObjectParser(final HandlerRegistry registry) {
-               super(registry);
-       }
-
        @Override
-       public NotificationObject parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException,
-                       PCEPDocumentedException {
+       public PCEPObject parse(byte[] bytes, boolean processed, boolean ignored) throws PCEPDeserializerException {
                if (bytes == null || bytes.length == 0)
                        throw new IllegalArgumentException("Array of bytes is mandatory. Can't be null or empty.");
 
-               final NotificationsBuilder builder = new NotificationsBuilder();
-
-               parseTlvs(builder, ByteArray.cutBytes(bytes, TLVS_OFFSET));
+               if (bytes.length < TLVS_OFFSET)
+                       throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.length + "; Expected: >=" + TLVS_OFFSET + ".");
 
-               builder.setIgnore(header.isIgnore());
-               builder.setProcessingRule(header.isProcessingRule());
-
-               builder.setType((short) (bytes[NT_F_OFFSET] & 0xFF));
-               builder.setValue((short) (bytes[NV_F_OFFSET] & 0xFF));
-
-               return builder.build();
+               return new PCEPNotificationObject((short) (bytes[NT_F_OFFSET] & 0xFF), (short) (bytes[NV_F_OFFSET] & 0xFF), PCEPTlvParser.parse(ByteArray.cutBytes(
+                               bytes, TLVS_OFFSET)));
        }
 
        @Override
-       public void addTlv(final NotificationsBuilder builder, final Tlv tlv) {
-               if (tlv instanceof OverloadDurationTlv && builder.getType() == 2 && builder.getValue() == 1)
-                       builder.setTlvs(new TlvsBuilder().setOverloadDuration(
-                                       new OverloadDurationBuilder().setDuration(((OverloadDurationTlv) tlv).getDuration()).build()).build());
-       }
+       public byte[] put(PCEPObject obj) {
+               if (!(obj instanceof PCEPNotificationObject))
+                       throw new IllegalArgumentException("Wrong instance of PCEPObject. Passed " + obj.getClass() + ". Needed PCEPNotificationObject.");
 
-       @Override
-       public byte[] serializeObject(final Object object) {
-               if (!(object instanceof NotificationObject))
-                       throw new IllegalArgumentException("Wrong instance of PCEPObject. Passed " + object.getClass() + ". Needed NotificationObject.");
+               final PCEPNotificationObject notObj = (PCEPNotificationObject) obj;
 
-               final NotificationObject notObj = (NotificationObject) object;
+               final byte[] tlvs = PCEPTlvParser.put(notObj.getTlvs());
+               final byte[] retBytes = new byte[TLVS_OFFSET + tlvs.length];
 
-               final byte[] tlvs = serializeTlvs(notObj.getTlvs());
-               int tlvsLength = 0;
-               if (tlvs != null)
-                       tlvsLength = tlvs.length;
-               final byte[] retBytes = new byte[TLVS_OFFSET + tlvsLength + Util.getPadding(TLVS_OFFSET + tlvs.length, PADDED_TO)];
-
-               if (tlvs != null)
-                       ByteArray.copyWhole(tlvs, retBytes, TLVS_OFFSET);
+               ByteArray.copyWhole(tlvs, retBytes, TLVS_OFFSET);
 
                retBytes[NT_F_OFFSET] = ByteArray.shortToBytes(notObj.getType())[1];
                retBytes[NV_F_OFFSET] = ByteArray.shortToBytes(notObj.getValue())[1];
@@ -99,21 +65,4 @@ public class PCEPNotificationObjectParser extends AbstractObjectParser<Notificat
                return retBytes;
        }
 
-       public byte[] serializeTlvs(final Tlvs tlvs) {
-               if (tlvs.getOverloadDuration() != null) {
-                       // FIXME : add
-                       // return serializeTlv(new NoPathVectorBuilder().setFlags(tlvs.getNoPathVector()).build());
-               }
-               return null;
-       }
-
-       @Override
-       public int getObjectType() {
-               return TYPE;
-       }
-
-       @Override
-       public int getObjectClass() {
-               return CLASS;
-       }
 }