Clean pcep/base-parser code

[bgpcep.git] / pcep / base-parser / src / main / java / org / opendaylight / protocol / pcep / parser / object / PCEPOpenObjectParser.java

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
index f2d855883dc4d809bd9742dbb8400e55f4306888..f11220d4b663499bb12bf28b0d75510a4880101b 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Parser for {@link Open}
+ * Parser for {@link Open}.
  */
 public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
     private static final Logger LOG = LoggerFactory.getLogger(PCEPOpenObjectParser.class);
@@ -66,23 +66,23 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Cannot be null or empty.");
         final int versionValue = ByteArray.copyBitsRange(bytes.readByte(), VERSION_SF_OFFSET, VERSION_SF_LENGTH);
 
-        final OpenBuilder builder = new OpenBuilder();
-        builder.setVersion(new ProtocolVersion((short) versionValue));
-        builder.setProcessingRule(header.isProcessingRule());
-        builder.setIgnore(header.isIgnore());
         final short keepalive = bytes.readUnsignedByte();
-        builder.setKeepalive(keepalive);
         final short deadTimer = bytes.readUnsignedByte();
+        final Uint8 sessionId = ByteBufUtils.readUint8(bytes);
+        final TlvsBuilder tbuilder = new TlvsBuilder();
+        parseTlvs(tbuilder, bytes.slice());
+        final OpenBuilder builder = new OpenBuilder()
+                .setVersion(new ProtocolVersion(Uint8.valueOf(versionValue)))
+                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.isIgnore())
+                .setKeepalive(Uint8.valueOf(keepalive))
+                .setSessionId(sessionId)
+                .setTlvs(tbuilder.build());
         if (keepalive == 0) {
             builder.setDeadTimer(Uint8.ZERO);
         } else {
-            builder.setDeadTimer(deadTimer);
+            builder.setDeadTimer(Uint8.valueOf(deadTimer));
         }
-        builder.setSessionId(ByteBufUtils.readUint8(bytes));
-
-        final TlvsBuilder tbuilder = new TlvsBuilder();
-        parseTlvs(tbuilder, bytes.slice());
-        builder.setTlvs(tbuilder.build());
 
         final Open obj = builder.build();
         if (versionValue != PCEP_VERSION) {
@@ -107,7 +107,7 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
             object.getClass());
         final Open open = (Open) object;
         final ByteBuf body = Unpooled.buffer();
-        writeUnsignedByte((short) (PCEP_VERSION << Byte.SIZE - VERSION_SF_LENGTH), body);
+        writeUnsignedByte(Uint8.valueOf(PCEP_VERSION << Byte.SIZE - VERSION_SF_LENGTH), body);
         writeUnsignedByte(open.getKeepalive(), body);
         writeUnsignedByte(open.getDeadTimer(), body);
         checkArgument(open.getSessionId() != null, "SessionId is mandatory.");