Migrate to use yangtools' ByteBufUtils

[bgpcep.git] / pcep / spi / src / main / java / org / opendaylight / protocol / pcep / spi / AbstractMessageParser.java

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
index 32b06a0e05c713d82c72763f2398f1d4a4f176e4..28252d038c6f71b717d4501f2c3de6f1be2217f0 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
@@ -31,12 +31,12 @@ 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.rev181109.pcerr.message.pcerr.message.error.type.request._case.request.RpsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp.object.Rp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.objects.VendorInformationObject;
+import org.opendaylight.yangtools.yang.common.netty.ByteBufUtils;
 
 public abstract class AbstractMessageParser implements MessageParser, MessageSerializer {
-
     private static final int COMMON_OBJECT_HEADER_LENGTH = 4;
-
     private static final int OT_SF_LENGTH = 4;
+
     /*
      * offsets of fields inside of multi-field in bits
      */
@@ -59,19 +59,18 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
      * @param object Object to be serialized, may be null
      * @param buffer ByteBuf where the object should be serialized
      */
-    protected void serializeObject(@Nullable final Object object, final ByteBuf buffer) {
-        if (object == null) {
-            return;
+    protected void serializeObject(final @Nullable Object object, final ByteBuf buffer) {
+        if (object != null) {
+            this.registry.serializeObject(object, buffer);
         }
-        this.registry.serializeObject(object, buffer);
     }
 
     private List<Object> parseObjects(final ByteBuf bytes) throws PCEPDeserializerException {
         final List<Object> objs = new ArrayList<>();
         while (bytes.isReadable()) {
             if (bytes.readableBytes() < COMMON_OBJECT_HEADER_LENGTH) {
-                throw new PCEPDeserializerException("Too few bytes in passed array. Passed: " + bytes.readableBytes() + " Expected: >= "
-                        + COMMON_OBJECT_HEADER_LENGTH + ".");
+                throw new PCEPDeserializerException("Too few bytes in passed array. Passed: " + bytes.readableBytes()
+                    + " Expected: >= " + COMMON_OBJECT_HEADER_LENGTH + ".");
             }
             final int objClass = bytes.readUnsignedByte();
 
@@ -81,8 +80,8 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
             final int objLength = bytes.readUnsignedShort();
 
             if (bytes.readableBytes() < objLength - COMMON_OBJECT_HEADER_LENGTH) {
-                throw new PCEPDeserializerException("Too few bytes in passed array. Passed: " + bytes.readableBytes() + " Expected: >= "
-                        + objLength + ".");
+                throw new PCEPDeserializerException("Too few bytes in passed array. Passed: " + bytes.readableBytes()
+                    + " Expected: >= " + objLength + ".");
             }
             // copy bytes for deeper parsing
             final ByteBuf bytesToPass = bytes.readSlice(objLength - COMMON_OBJECT_HEADER_LENGTH);
@@ -90,8 +89,9 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
             final ObjectHeader header = new ObjectHeaderImpl(flags.get(PROCESSED), flags.get(IGNORED));
 
             if (VendorInformationUtil.isVendorInformationObject(objClass, objType)) {
-                final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(bytesToPass.readUnsignedInt());
-                final Optional<? extends Object> obj = this.registry.parseVendorInformationObject(enterpriseNumber, header, bytesToPass);
+                final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(ByteBufUtils.readUint32(bytesToPass));
+                final Optional<? extends Object> obj = this.registry.parseVendorInformationObject(enterpriseNumber,
+                    header, bytesToPass);
                 if (obj.isPresent()) {
                     objs.add(obj.get());
                 }
@@ -107,22 +107,23 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
         return objs;
     }
 
-    public static Message createErrorMsg(final PCEPErrors e, final Optional<Rp> rp) {
+    public static Message createErrorMsg(final PCEPErrors err, final Optional<Rp> rp) {
         final PcerrMessageBuilder msgBuilder = new PcerrMessageBuilder();
         if (rp.isPresent()) {
-            msgBuilder.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(Collections.singletonList(new RpsBuilder().setRp(
-                    rp.get()).build())).build()).build());
+            msgBuilder.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(
+                Collections.singletonList(new RpsBuilder().setRp(rp.get()).build())).build()).build());
         }
         return new PcerrBuilder().setPcerrMessage(
                 msgBuilder.setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(
-                    new ErrorObjectBuilder().setType(e.getErrorType()).setValue(
-                        e.getErrorValue()).build()).build())).build()).build();
+                    new ErrorObjectBuilder().setType(err.getErrorType()).setValue(
+                        err.getErrorValue()).build()).build())).build()).build();
     }
 
-    protected abstract Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException;
+    protected abstract Message validate(List<Object> objects, List<Message> errors) throws PCEPDeserializerException;
 
     @Override
-    public final Message parseMessage(final ByteBuf buffer, final List<Message> errors) throws PCEPDeserializerException {
+    public final Message parseMessage(final ByteBuf buffer, final List<Message> errors)
+            throws PCEPDeserializerException {
         requireNonNull(buffer, "Buffer may not be null");
 
         // Parse objects first
@@ -132,7 +133,8 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
         return validate(objs, errors);
     }
 
-    protected final void serializeVendorInformationObjects(final List<VendorInformationObject> viObjects, final ByteBuf buffer) {
+    protected final void serializeVendorInformationObjects(final List<VendorInformationObject> viObjects,
+            final ByteBuf buffer) {
         if (viObjects != null) {
             for (final VendorInformationObject viObject : viObjects) {
                 this.registry.serializeVendorInformationObject(viObject, buffer);