Register PCEP session to stats handler only after it is fully initialized

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

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
index 65c9321756d1d5408031b2cb960a446446fdddd6..54414d26f86f8a9d021f450f687e63ff7cd30e7e 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
@@ -7,59 +7,64 @@
  */
 package org.opendaylight.protocol.pcep.spi;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import org.opendaylight.protocol.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.vendor.information.tlvs.VendorInformationTlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Tlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.tlvs.VendorInformationTlv;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, ObjectSerializer {
+public abstract class AbstractObjectWithTlvsParser<T> extends CommonObjectParser implements ObjectSerializer {
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractObjectWithTlvsParser.class);
 
-    public static final int PADDED_TO = 4;
-
     private final TlvRegistry tlvReg;
 
     private final VendorInformationTlvRegistry viTlvReg;
 
-    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
-        this.tlvReg = Preconditions.checkNotNull(tlvReg);
-        this.viTlvReg = Preconditions.checkNotNull(viTlvReg);
+    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg,
+        final int objectClass, final int objectType) {
+        super(objectClass, objectType);
+        this.tlvReg = requireNonNull(tlvReg);
+        this.viTlvReg = requireNonNull(viTlvReg);
     }
 
     protected final void parseTlvs(final T builder, final ByteBuf bytes) throws PCEPDeserializerException {
-        Preconditions.checkArgument(bytes != null, "Array of bytes is mandatory. Can't be null.");
+        checkArgument(bytes != null, "Array of bytes is mandatory. Can't be null.");
         if (!bytes.isReadable()) {
             return;
         }
-        final List<VendorInformationTlv> viTlvs = Lists.newArrayList();
+        final List<VendorInformationTlv> viTlvs = new ArrayList<>();
         while (bytes.isReadable()) {
             final int type = bytes.readUnsignedShort();
             final int length = bytes.readUnsignedShort();
             if (length > bytes.readableBytes()) {
-                throw new PCEPDeserializerException("Wrong length specified. Passed: " + length + "; Expected: <= " + bytes.readableBytes()
+                throw new PCEPDeserializerException("Wrong length specified. Passed: " + length + "; Expected: <= "
+            + bytes.readableBytes()
                     + ".");
             }
             final ByteBuf tlvBytes = bytes.readSlice(length);
             LOG.trace("Parsing PCEP TLV : {}", ByteBufUtil.hexDump(tlvBytes));
 
             if (VendorInformationUtil.isVendorInformationTlv(type)) {
-                final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(tlvBytes.readUnsignedInt());
-                final Optional<VendorInformationTlv> viTlv = this.viTlvReg.parseVendorInformationTlv(enterpriseNumber, tlvBytes);
-                if(viTlv.isPresent()) {
+                final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(ByteBufUtils.readUint32(tlvBytes));
+                final Optional<VendorInformationTlv> viTlv = this.viTlvReg.parseVendorInformationTlv(enterpriseNumber,
+                    tlvBytes);
+                if (viTlv.isPresent()) {
                     LOG.trace("Parsed VENDOR-INFORMATION TLV {}.", viTlv.get());
                     viTlvs.add(viTlv.get());
                 }
             } else {
                 final Tlv tlv = this.tlvReg.parseTlv(type, tlvBytes);
-                if(tlv != null) {
+                if (tlv != null) {
                     LOG.trace("Parsed PCEP TLV {}.", tlv);
                     addTlv(builder, tlv);
                 }
@@ -70,7 +75,7 @@ public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, O
     }
 
     protected final void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
-        Preconditions.checkNotNull(tlv, "PCEP TLV is mandatory.");
+        requireNonNull(tlv, "PCEP TLV is mandatory.");
         LOG.trace("Serializing PCEP TLV {}", tlv);
         this.tlvReg.serializeTlv(tlv, buffer);
         LOG.trace("Serialized PCEP TLV : {}.", ByteBufUtil.hexDump(buffer));
@@ -80,10 +85,10 @@ public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, O
         // FIXME: No TLVs by default, fallback to augments
     }
 
-    protected abstract void addVendorInformationTlvs(final T builder, final List<VendorInformationTlv> tlvs);
+    protected abstract void addVendorInformationTlvs(T builder, List<VendorInformationTlv> tlvs);
 
     protected final void serializeVendorInformationTlvs(final List<VendorInformationTlv> tlvs, final ByteBuf buffer) {
-        if (tlvs != null && !tlvs.isEmpty()) {
+        if (tlvs != null) {
             for (final VendorInformationTlv tlv : tlvs) {
                 LOG.trace("Serializing VENDOR-INFORMATION TLV {}", tlv);
                 this.viTlvReg.serializeVendorInformationTlv(tlv, buffer);