BUG-612 : switch PCEP objects to ByteBuf.

[bgpcep.git] / pcep / ietf-stateful02 / src / main / java / org / opendaylight / protocol / pcep / ietf / stateful02 / Stateful02LspObjectParser.java

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
index 2085c18340a2c7e6cd8ab340d6cd27ba6e4dab5f..b67f8225a33bc69653ea875b9f11ba457b956f93 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful02;
 
+import io.netty.buffer.ByteBuf;
+
 import java.util.BitSet;
 
 import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
@@ -26,6 +28,8 @@ 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.ObjectHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
 
+import com.google.common.base.Preconditions;
+
 /**
  * Parser for {@link Lsp}
  */
@@ -54,23 +58,24 @@ public class Stateful02LspObjectParser extends AbstractObjectWithTlvsParser<Tlvs
        }
 
        @Override
-       public Lsp parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException {
-               if (bytes == null || bytes.length == 0) {
-                       throw new IllegalArgumentException("Array of bytes is mandatory. Can't be null or empty.");
-               }
-               final BitSet flags = ByteArray.bytesToBitSet(ByteArray.subByte(bytes, 2, 2));
-
+       public Lsp parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
+               Preconditions.checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
                final LspBuilder builder = new LspBuilder();
                builder.setIgnore(header.isIgnore());
                builder.setProcessingRule(header.isProcessingRule());
-
-               builder.setPlspId(new PlspId((ByteArray.bytesToLong(ByteArray.subByte(bytes, 0, 2)) & 0xFFFF) << 4 | (bytes[2] & 0xFF) >> 4));
+               int[] plspIdRaw = new int[] {
+                               bytes.readUnsignedByte(),
+                               bytes.readUnsignedByte(),
+                               bytes.getUnsignedByte(2),
+               };
+               builder.setPlspId(new PlspId((long) ((plspIdRaw[0] << 12) | (plspIdRaw[1] << 4) | (plspIdRaw[2] >> 4))));
+               final BitSet flags = ByteArray.bytesToBitSet(ByteArray.readBytes(bytes, 2));
                builder.setDelegate(flags.get(DELEGATE_FLAG_OFFSET));
                builder.setSync(flags.get(SYNC_FLAG_OFFSET));
                builder.setRemove(flags.get(REMOVE_FLAG_OFFSET));
                builder.setOperational(flags.get(OPERATIONAL_FLAG_OFFSET));
                final TlvsBuilder b = new TlvsBuilder();
-               parseTlvs(b, ByteArray.cutBytes(bytes, TLVS_OFFSET));
+               parseTlvs(b, bytes.slice());
                builder.setTlvs(b.build());
                return builder.build();
        }