X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=bgp%2Fbmp-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbmp%2Fspi%2Fparser%2FAbstractBmpPerPeerMessageParser.java;h=b7e892d2229ce0185f79925efab84a59fd197681;hb=5ddbbec3193f9dfcbb980379a5454b70fe4847ea;hp=0a2a7e2573123d67a16960bdccf6198413faa583;hpb=f6c1019a1e048a2d6d44218e9a05181798a0f3fe;p=bgpcep.git

diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
index 0a2a7e2573..b7e892d222 100644
--- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
+++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.protocol.bmp.spi.parser;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.bgp.concepts.RouteDistinguisherUtil;
@@ -17,9 +19,9 @@ import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.ByteBufWriteUtil;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Timestamp;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.AdjRibInType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.Peer.PeerDistinguisher;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.PeerType;
@@ -44,7 +46,7 @@ public abstract class AbstractBmpPerPeerMessageParser<T  extends Builder<?>> ext
 
     public AbstractBmpPerPeerMessageParser(final MessageRegistry bgpMssageRegistry, final BmpTlvRegistry tlvRegistry) {
         super(tlvRegistry);
-        this.bgpMssageRegistry = Preconditions.checkNotNull(bgpMssageRegistry);
+        this.bgpMssageRegistry = requireNonNull(bgpMssageRegistry);
     }
 
     @Override
@@ -56,7 +58,7 @@ public abstract class AbstractBmpPerPeerMessageParser<T  extends Builder<?>> ext
         }
     }
 
-    protected final PeerHeader parsePerPeerHeader(final ByteBuf bytes) {
+    protected static final PeerHeader parsePerPeerHeader(final ByteBuf bytes) {
         Preconditions.checkArgument(bytes.readableBytes() >= PER_PEER_HEADER_SIZE);
         final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder();
         final PeerType peerType = PeerType.forValue(bytes.readByte());