Clean pcep/base-parser code

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

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java
index 350a9d35d56f2f1c40115aee3d88eb0558d52e40..5c36bcddf6b151486e516b96ab342df240628b0f 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java
@@ -25,9 +25,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.UnnumberedCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.UnnumberedCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
- * Parser for {@link UnnumberedCase}
+ * Parser for {@link UnnumberedCase}.
  */
 public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser, XROSubobjectSerializer {
 
@@ -45,13 +46,14 @@ public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser
                 + "; Expected: " + CONTENT_LENGTH + ".");
         }
         buffer.readerIndex(buffer.readerIndex() + RESERVED);
-        final SubobjectBuilder builder = new SubobjectBuilder();
-        builder.setMandatory(mandatory);
-        builder.setAttribute(Attribute.forValue(buffer.readUnsignedByte()));
-        final UnnumberedBuilder ubuilder = new UnnumberedBuilder();
-        ubuilder.setRouterId(ByteBufUtils.readUint32(buffer));
-        ubuilder.setInterfaceId(ByteBufUtils.readUint32(buffer));
-        builder.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build());
+        final Attribute attr = Attribute.forValue(buffer.readUnsignedByte());
+        final UnnumberedBuilder ubuilder = new UnnumberedBuilder()
+                .setRouterId(ByteBufUtils.readUint32(buffer))
+                .setInterfaceId(ByteBufUtils.readUint32(buffer));
+        final SubobjectBuilder builder = new SubobjectBuilder()
+                .setMandatory(mandatory)
+                .setAttribute(attr)
+                .setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build());
         return builder.build();
     }
 
@@ -62,7 +64,8 @@ public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser
         final UnnumberedSubobject specObj = ((UnnumberedCase) subobject.getSubobjectType()).getUnnumbered();
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         body.writeZero(RESERVED);
-        writeUnsignedByte(subobject.getAttribute() != null ? (short) subobject.getAttribute().getIntValue() : null,
+        writeUnsignedByte(
+                subobject.getAttribute() != null ? Uint8.valueOf(subobject.getAttribute().getIntValue()) : (Uint8) null,
                 body);
         checkArgument(specObj.getRouterId() != null, "RouterId is mandatory.");
         writeUnsignedInt(specObj.getRouterId(), body);