BUG-612 : switch XRO to ByteBuf.
[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / object / AbstractXROWithSubobjectsParser.java
index dd250211de24b3e1b9c9a274f9e7c515e17f5172..42290ad48bcae56c436ff7162b963e79fe355406 100644 (file)
@@ -7,15 +7,17 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import org.opendaylight.protocol.pcep.spi.ObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectSerializer;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.spi.XROSubobjectHandlerRegistry;
-import org.opendaylight.protocol.pcep.spi.XROSubobjectSerializer;
-import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.exclude.route.object.xro.Subobjects;
+import org.opendaylight.protocol.pcep.spi.XROSubobjectRegistry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.exclude.route.object.xro.Subobject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,74 +29,50 @@ public abstract class AbstractXROWithSubobjectsParser implements ObjectParser, O
 
        private static final Logger LOG = LoggerFactory.getLogger(AbstractXROWithSubobjectsParser.class);
 
-       private static final int SUB_TYPE_FLAG_F_LENGTH = 1;
-       private static final int SUB_LENGTH_F_LENGTH = 1;
-       private static final int SUB_HEADER_LENGTH = SUB_TYPE_FLAG_F_LENGTH + SUB_LENGTH_F_LENGTH;
-
-       private static final int TYPE_FLAG_F_OFFSET = 0;
-       private static final int LENGTH_F_OFFSET = TYPE_FLAG_F_OFFSET + SUB_TYPE_FLAG_F_LENGTH;
-       private static final int SO_CONTENTS_OFFSET = LENGTH_F_OFFSET + SUB_LENGTH_F_LENGTH;
+       private static final int HEADER_LENGTH = 2;
 
-       private final XROSubobjectHandlerRegistry subobjReg;
+       private final XROSubobjectRegistry subobjReg;
 
-       protected AbstractXROWithSubobjectsParser(final XROSubobjectHandlerRegistry subobjReg) {
+       protected AbstractXROWithSubobjectsParser(final XROSubobjectRegistry subobjReg) {
                this.subobjReg = Preconditions.checkNotNull(subobjReg);
        }
 
-       protected List<Subobjects> parseSubobjects(final byte[] bytes) throws PCEPDeserializerException {
-               if (bytes == null) {
-                       throw new IllegalArgumentException("Byte array is mandatory.");
-               }
-               int type;
-               byte[] soContentsBytes;
-               int length;
-               int offset = 0;
-
-               final List<Subobjects> subs = Lists.newArrayList();
-
-               while (offset < bytes.length) {
-
-                       final boolean mandatory = ((bytes[offset] & (1 << 7)) != 0) ? true : false;
-                       type = UnsignedBytes.checkedCast((bytes[offset] & 0xff) & ~(1 << 7));
-
-                       offset += SUB_TYPE_FLAG_F_LENGTH;
-
-                       length = UnsignedBytes.toInt(bytes[offset]);
-
-                       offset += SUB_LENGTH_F_LENGTH;
-
-                       if (length - SUB_HEADER_LENGTH > bytes.length - offset) {
+       protected List<Subobject> parseSubobjects(final ByteBuf buffer) throws PCEPDeserializerException {
+               Preconditions.checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+               final List<Subobject> subs = new ArrayList<>();
+               while (buffer.isReadable()) {
+                       final boolean mandatory = ((buffer.getByte(buffer.readerIndex()) & (1 << 7)) != 0) ? true : false;
+                       int type = UnsignedBytes.checkedCast((buffer.readByte() & 0xff) & ~(1 << 7));
+                       int length = UnsignedBytes.toInt(buffer.readByte()) - HEADER_LENGTH;
+                       if (length > buffer.readableBytes()) {
                                throw new PCEPDeserializerException("Wrong length specified. Passed: " + length + "; Expected: <= "
-                                               + (bytes.length - offset));
+                                               + buffer.readableBytes());
                        }
-                       soContentsBytes = ByteArray.subByte(bytes, offset, length - SO_CONTENTS_OFFSET);
-
-                       LOG.debug("Attempt to parse subobject from bytes: {}", ByteArray.bytesToHexString(soContentsBytes));
-                       final Subobjects sub = this.subobjReg.getSubobjectParser(type).parseSubobject(soContentsBytes, mandatory);
-                       LOG.debug("Subobject was parsed. {}", sub);
-
-                       subs.add(sub);
-
-                       offset += soContentsBytes.length;
+                       LOG.debug("Attempt to parse subobject from bytes: {}", ByteBufUtil.hexDump(buffer));
+                       final Subobject sub = this.subobjReg.parseSubobject(type, buffer.slice(buffer.readerIndex(), length), mandatory);
+                       if (sub == null) {
+                               LOG.warn("Unknown subobject type: {}. Ignoring subobject.", type);
+                       } else {
+                               LOG.debug("Subobject was parsed. {}", sub);
+                               subs.add(sub);
+                       }
+                       buffer.readerIndex(buffer.readerIndex() + length);
                }
                return subs;
        }
 
-       protected final byte[] serializeSubobject(final List<Subobjects> subobjects) {
-
+       protected final byte[] serializeSubobject(final List<Subobject> subobjects) {
                final List<byte[]> result = Lists.newArrayList();
-
                int finalLength = 0;
-
-               for (final Subobjects subobject : subobjects) {
-
-                       final XROSubobjectSerializer serializer = this.subobjReg.getSubobjectSerializer(subobject.getSubobjectType());
-
-                       final byte[] bytes = serializer.serializeSubobject(subobject);
-                       finalLength += bytes.length;
-                       result.add(bytes);
+               for (final Subobject subobject : subobjects) {
+                       final byte[] bytes = this.subobjReg.serializeSubobject(subobject);
+                       if (bytes == null) {
+                               LOG.warn("Could not find serializer for subobject type: {}. Skipping subobject.", subobject.getSubobjectType());
+                       } else  {
+                               finalLength += bytes.length;
+                               result.add(bytes);
+                       }
                }
-
                final byte[] resultBytes = new byte[finalLength];
                int byteOffset = 0;
                for (final byte[] b : result) {