Getting rid of readerIndex handling. 96/15796/1
authorDana Kutenicsova <dkutenic@cisco.com>
Thu, 26 Feb 2015 19:53:42 +0000 (20:53 +0100)
committerDana Kutenicsova <dkutenic@cisco.com>
Thu, 26 Feb 2015 19:53:42 +0000 (20:53 +0100)
- in most cases it can be replaced by skipBytes()

Change-Id: Ia2d7fb64f61879bb5404745c270ae5364f051077
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
18 files changed:
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/TlvUtil.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07SrpObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROUnnumberedInterfaceSubobjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv4PrefixSubobjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv6PrefixSubobjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROUnnumberedInterfaceSubobjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv4PrefixSubobjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv6PrefixSubobjectParser.java

index fbacf8d0ed9b0d368d71c30bbc7ba72bab862b5c..f8021e807a47ce8f2784cb0359a5639256d5c0d3 100644 (file)
@@ -36,8 +36,8 @@ public final class TlvUtil {
         byteAggregator.writeShort(type);
         byteAggregator.writeShort(value.writerIndex());
         byteAggregator.writeBytes(value);
-        value.readerIndex(0);
         if (LOG.isDebugEnabled()) {
+            value.readerIndex(0);
             LOG.debug("Serialized tlv type {} to: {}", type, ByteBufUtil.hexDump(value));
         }
     }
@@ -52,8 +52,8 @@ public final class TlvUtil {
         byteAggregator.writeByte(type);
         byteAggregator.writeByte(value.writerIndex());
         byteAggregator.writeBytes(value);
-        value.readerIndex(0);
         if (LOG.isDebugEnabled()) {
+            value.readerIndex(0);
             LOG.debug("Serialized tlv type {} to: {}", type, ByteBufUtil.hexDump(value));
         }
     }
index 263c0fb0c6f60bf08a19268692e6680470637c91..32856744f3ba5e4a9bd261ba8b7915a9ebf08d16 100644 (file)
@@ -61,7 +61,7 @@ public class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<Tlvs
         final SrpBuilder builder = new SrpBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + FLAGS_SIZE);
+        bytes.skipBytes(FLAGS_SIZE);
         builder.setOperationId(new SrpIdNumber(bytes.readUnsignedInt()));
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
index a545aafa5a8c3af3c24db6b96ac2071a6fa3598e..1060db9e055fad480fee9ca1aeb7af647efc9132 100644 (file)
@@ -62,7 +62,7 @@ public final class PCEPByteToMessageDecoder extends ByteToMessageDecoder {
     }
 
     private Message parse(final ByteBuf buffer, final List<Message> errors) throws PCEPDeserializerException {
-        buffer.readerIndex(buffer.readerIndex() + 1);
+        buffer.skipBytes(1);
         final int type = buffer.readUnsignedByte();
         final int msgLength = buffer.readUnsignedShort();
         final int actualLength = buffer.readableBytes();
@@ -71,7 +71,7 @@ public final class PCEPByteToMessageDecoder extends ByteToMessageDecoder {
             throw new PCEPDeserializerException("Body size " + actualLength + " does not match header size "
                     + (msgLength - PCEPMessageConstants.COMMON_HEADER_LENGTH));
         }
-        buffer.readerIndex(buffer.readerIndex() + actualLength);
+        buffer.skipBytes(actualLength);
         return this.registry.parseMessage(type, msgBody, errors);
     }
 }
index 135641960e4d53079c0467bc1d4ae86246b3dd83..33ebb968f421bfe2d1dcc34ff6bc0379eb764dde 100644 (file)
@@ -52,7 +52,7 @@ public class PCEPCloseObjectParser extends AbstractObjectWithTlvsParser<TlvsBuil
         final CCloseBuilder builder = new CCloseBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + FLAGS_F_LENGTH + RESERVED);
+        bytes.skipBytes(FLAGS_F_LENGTH + RESERVED);
         builder.setReason(bytes.readUnsignedByte());
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
index 5533e796a2bdcac4cf036343805c8c99f77dd7bb..c960edf7d9feab3182772d69377cda20b3d0b9dc 100644 (file)
@@ -52,7 +52,7 @@ public class PCEPErrorObjectParser extends AbstractObjectWithTlvsParser<ErrorObj
         final ErrorObjectBuilder builder = new ErrorObjectBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + FLAGS_F_LENGTH + RESERVED);
+        bytes.skipBytes(FLAGS_F_LENGTH + RESERVED);
         builder.setType(bytes.readUnsignedByte());
         builder.setValue(bytes.readUnsignedByte());
         parseTlvs(builder, bytes.slice());
index 0685b7bc92e589bedadd7f2dce1387de8452a5f4..2e409f3860228512e06126780b6d2b42d73ffe46 100644 (file)
@@ -42,7 +42,7 @@ public final class PCEPExcludeRouteObjectParser extends AbstractXROWithSubobject
         final XroBuilder builder = new XroBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + FLAGS_OFFSET);
+        bytes.skipBytes(FLAGS_OFFSET);
         builder.setFlags(new Flags(bytes.readBoolean()));
         builder.setSubobject(parseSubobjects(bytes.slice()));
         return builder.build();
index 773d219323e3bbb7ecbb62be0f256a4d0272835e..c035a56156cf379fc4a6159446999efd9a08f1fa 100644 (file)
@@ -48,7 +48,7 @@ public class PCEPLoadBalancingObjectParser implements ObjectParser, ObjectSerial
         final LoadBalancingBuilder builder = new LoadBalancingBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + RESERVED + FLAGS_F_LENGTH);
+        bytes.skipBytes(RESERVED + FLAGS_F_LENGTH);
         builder.setMaxLsp(bytes.readUnsignedByte());
         builder.setMinBandwidth(new Bandwidth(ByteArray.readAllBytes(bytes)));
         return builder.build();
index c69d8db8ed408a93bdc221fc84228078fd6684d2..020a0afe4ec6ddf7aaeb7bc23be1162452b6648f 100644 (file)
@@ -72,7 +72,7 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         final BitSet flags = ByteArray.bytesToBitSet(new byte[] { bytes.readByte() });
         builder.setLocalProtectionDesired(flags.get(L_FLAG_OFFSET));
         final TlvsBuilder tbuilder = new TlvsBuilder();
-        bytes.readerIndex(bytes.readerIndex() + RESERVED);
+        bytes.skipBytes(RESERVED);
         parseTlvs(tbuilder, bytes.slice());
         builder.setTlvs(tbuilder.build());
         return builder.build();
index 57cd412b1159ac5eefe50d3fea2288cba567ee02..1e418afd20bbd72940f79378b57a616ee05a4e61 100644 (file)
@@ -61,7 +61,7 @@ public class PCEPMetricObjectParser implements ObjectParser, ObjectSerializer {
             throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.readableBytes() + "; Expected: " + SIZE
                     + ".");
         }
-        bytes.readerIndex(bytes.readerIndex() + RESERVED);
+        bytes.skipBytes(RESERVED);
         final byte[] flagBytes = { bytes.readByte() };
         final BitSet flags = ByteArray.bytesToBitSet(flagBytes);
         final MetricBuilder builder = new MetricBuilder();
index 91e4bdddd3a7b17efe27fcc33b202e2e3052d915..8b87007a33a0f3bcebe75bbece86896a95c8cfa9 100644 (file)
@@ -66,7 +66,7 @@ public class PCEPNoPathObjectParser extends AbstractObjectWithTlvsParser<TlvsBui
         final byte[] flagsByte = ByteArray.readBytes(bytes, FLAGS_F_LENGTH);
         final BitSet flags = ByteArray.bytesToBitSet(flagsByte);
         builder.setUnsatisfiedConstraints(flags.get(C_FLAG_OFFSET));
-        bytes.readerIndex(bytes.readerIndex() + RESERVED_F_LENGTH);
+        bytes.skipBytes(RESERVED_F_LENGTH);
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
         builder.setTlvs(tlvsBuilder.build());
index 82d0b22628f385b16727b173a0f4a36c1fe5b64c..bf095a438e83a1e338e755f5871a32b66409892c 100644 (file)
@@ -52,7 +52,7 @@ public class PCEPNotificationObjectParser extends AbstractObjectWithTlvsParser<C
         final CNotificationBuilder builder = new CNotificationBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
-        bytes.readerIndex(bytes.readerIndex() + NT_F_OFFSET);
+        bytes.skipBytes(NT_F_OFFSET);
         builder.setType(bytes.readUnsignedByte());
         builder.setValue(bytes.readUnsignedByte());
         parseTlvs(builder, bytes.slice());
index 3cf8f593f0bada13b2fd6467f99d9dc21e095162..7c246339bd29ea94574aa8d55b9cd0fdcc61b66f 100644 (file)
@@ -65,7 +65,7 @@ public class PCEPSvecObjectParser implements ObjectParser, ObjectSerializer {
             throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.readableBytes() + "; Expected: >="
                     + MIN_SIZE + ".");
         }
-        bytes.readerIndex(bytes.readerIndex() + FLAGS_F_OFFSET);
+        bytes.skipBytes(FLAGS_F_OFFSET);
         final BitSet flags = ByteArray.bytesToBitSet(ByteArray.readBytes(bytes, FLAGS_F_LENGTH));
         final List<RequestId> requestIDs = Lists.newArrayList();
 
index a7656df90d86900a4d1ad179c2f65f1e88f32589..3bfda2222717509b69a40bbda7fb89d48d1085b8 100644 (file)
@@ -44,7 +44,7 @@ public class EROUnnumberedInterfaceSubobjectParser implements EROSubobjectParser
         final SubobjectBuilder builder = new SubobjectBuilder();
         builder.setLoose(loose);
         final UnnumberedBuilder ubuilder = new UnnumberedBuilder();
-        buffer.readerIndex(buffer.readerIndex() + RESERVED);
+        buffer.skipBytes(RESERVED);
         ubuilder.setRouterId(buffer.readUnsignedInt());
         ubuilder.setInterfaceId(buffer.readUnsignedInt());
         builder.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build());
index 2fd8c0167b9c58637dcd1d50e2e3d3395ead6311..0e0788cf08b4234f584ef96a2cf7dc8b4c1fd189 100644 (file)
@@ -55,7 +55,7 @@ public class RROIpv4PrefixSubobjectParser implements RROSubobjectParser, RROSubo
         final int length = buffer.getUnsignedByte(PREFIX4_F_OFFSET);
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.record.route.subobjects.subobject.type.ip.prefix._case.IpPrefix prefix = new IpPrefixBuilder().setIpPrefix(
                 new IpPrefix(Ipv4Util.prefixForBytes(ByteArray.readBytes(buffer, Ipv4Util.IP4_LENGTH), length))).build();
-        buffer.readerIndex(buffer.readerIndex() + PREFIX_F_LENGTH);
+        buffer.skipBytes(PREFIX_F_LENGTH);
         final BitSet flags = ByteArray.bytesToBitSet(ByteArray.readBytes(buffer, FLAGS_F_LENGTH));
         builder.setProtectionAvailable(flags.get(LPA_F_OFFSET));
         builder.setProtectionInUse(flags.get(LPIU_F_OFFSET));
index 2e9bec2507f807e907ef68b3af052b116732c548..edd17c9683bd35a9b38309eff59171f4d94a83b4 100644 (file)
@@ -55,7 +55,7 @@ public class RROIpv6PrefixSubobjectParser implements RROSubobjectParser, RROSubo
         final int length = buffer.getUnsignedByte(PREFIX_F_OFFSET);
         final IpPrefixBuilder prefix = new IpPrefixBuilder().setIpPrefix(new IpPrefix(Ipv6Util.prefixForBytes(ByteArray.readBytes(buffer,
                 Ipv6Util.IPV6_LENGTH), length)));
-        buffer.readerIndex(buffer.readerIndex() + PREFIX_F_LENGTH);
+        buffer.skipBytes(PREFIX_F_LENGTH);
         final BitSet flags = ByteArray.bytesToBitSet(ByteArray.readBytes(buffer, FLAGS_F_LENGTH));
         builder.setProtectionAvailable(flags.get(LPA_F_OFFSET));
         builder.setProtectionInUse(flags.get(LPIU_F_OFFSET));
index a7dcdf61171a41f20c567651c716334976879c56..07306296077dfdfa6cddfbbe81bb1e9a671c52a5 100644 (file)
@@ -53,7 +53,7 @@ public class RROUnnumberedInterfaceSubobjectParser implements RROSubobjectParser
         builder.setProtectionAvailable(flags.get(LPA_F_OFFSET));
         builder.setProtectionInUse(flags.get(LPIU_F_OFFSET));
         final UnnumberedBuilder ubuilder = new UnnumberedBuilder();
-        buffer.readerIndex(buffer.readerIndex() + RESERVED);
+        buffer.skipBytes(RESERVED);
         ubuilder.setRouterId(buffer.readUnsignedInt());
         ubuilder.setInterfaceId(buffer.readUnsignedInt());
         builder.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build());
index 0fc66aa81d3c502b31f61cae4bc46355f6ca8fac..01499543cb3f4ed3dbb1d7a8071bea643c10eb47 100644 (file)
@@ -53,7 +53,7 @@ public class XROIpv4PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final IpPrefixBuilder prefix = new IpPrefixBuilder().setIpPrefix(new IpPrefix(Ipv4Util.prefixForBytes(ByteArray.readBytes(buffer,
                 Ipv4Util.IP4_LENGTH), length)));
         builder.setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(prefix.build()).build());
-        buffer.readerIndex(buffer.readerIndex() + PREFIX_F_LENGTH);
+        buffer.skipBytes(PREFIX_F_LENGTH);
         builder.setAttribute(Attribute.forValue(buffer.readUnsignedByte()));
         return builder.build();
     }
index 39fc55c670bbc603c17ce04fcdbec039ac4804e7..0cf6cd631d6aca1a5ca10bfebcc815dbba14f065 100644 (file)
@@ -53,7 +53,7 @@ public class XROIpv6PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final IpPrefixBuilder prefix = new IpPrefixBuilder().setIpPrefix(new IpPrefix(Ipv6Util.prefixForBytes(ByteArray.readBytes(buffer,
                 Ipv6Util.IPV6_LENGTH), length)));
         builder.setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(prefix.build()).build());
-        buffer.readerIndex(buffer.readerIndex() + PREFIX_F_LENGTH);
+        buffer.skipBytes(PREFIX_F_LENGTH);
         builder.setAttribute(Attribute.forValue(buffer.readUnsignedByte()));
         return builder.build();
     }