From c7111e6d6181aee09edea518faa19ccfe3bb55e3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 13 Dec 2018 11:53:37 +0100 Subject: [PATCH] Fix most bgp-parser-spi checkstyle violations These violations have been piling up, clean most of them up. Change-Id: I3f42f7d49028117b81b9963ab3efa750082cc7db Signed-off-by: Robert Varga --- .../parser/spi/AbstractMessageRegistry.java | 16 ++++--- .../bgp/parser/spi/AttributeRegistry.java | 4 +- .../bgp/parser/spi/AttributeSerializer.java | 2 +- .../bgp/parser/spi/AttributeUtil.java | 6 +-- .../spi/BGPExtensionProviderContext.java | 22 ++++++---- .../bgp/parser/spi/BgpPrefixSidTlvParser.java | 2 +- .../parser/spi/BgpPrefixSidTlvRegistry.java | 8 ++-- .../parser/spi/BgpPrefixSidTlvSerializer.java | 2 +- .../bgp/parser/spi/BgpPrefixSidTlvUtil.java | 2 +- .../bgp/parser/spi/CapabilitySerializer.java | 2 +- .../bgp/parser/spi/MessageParser.java | 1 - .../bgp/parser/spi/MessageRegistry.java | 6 +-- .../protocol/bgp/parser/spi/MessageUtil.java | 6 +-- .../bgp/parser/spi/MultiPathSupport.java | 9 ++-- .../bgp/parser/spi/MultiPathSupportUtil.java | 6 +-- .../spi/MultiprotocolCapabilitiesUtil.java | 15 ++++--- .../parser/spi/NextHopParserSerializer.java | 16 +++---- .../protocol/bgp/parser/spi/NlriParser.java | 15 +++---- .../protocol/bgp/parser/spi/NlriRegistry.java | 21 +++++---- .../bgp/parser/spi/NlriSerializer.java | 4 +- .../protocol/bgp/parser/spi/PathIdUtil.java | 2 +- .../bgp/parser/spi/RevisedErrorHandling.java | 2 +- .../Abstract4OctetAsExtendedCommunity.java | 9 ++-- .../AbstractTwoOctetAsExtendedCommunity.java | 5 +-- .../community/ExtendedCommunityParser.java | 9 +--- .../community/ExtendedCommunityRegistry.java | 12 ++--- .../community/ExtendedCommunityUtil.java | 7 +-- ...t4SpecificExtendedCommunityCommonUtil.java | 9 ++-- .../parser/spi/pojo/MultiPathSupportImpl.java | 6 +-- ...viceLoaderBGPExtensionProviderContext.java | 13 ++---- .../spi/pojo/SimpleAddressFamilyRegistry.java | 3 +- .../SimpleBGPExtensionProviderContext.java | 43 +++++++++++------- ...eBGPExtensionProviderContextActivator.java | 4 +- .../pojo/SimpleBgpPrefixSidTlvRegistry.java | 10 +++-- .../spi/pojo/SimpleCapabilityRegistry.java | 11 +++-- .../pojo/SimpleExtendedCommunityRegistry.java | 21 +++++---- .../spi/pojo/SimpleMessageRegistry.java | 3 +- .../parser/spi/pojo/SimpleNlriRegistry.java | 26 +++++------ .../spi/pojo/SimpleParameterRegistry.java | 12 +++-- ...SimpleSubsequentAddressFamilyRegistry.java | 11 ++--- .../spi/AbstractMessageRegistryTest.java | 44 ++++++++++++------- .../parser/spi/MultiPathSupportUtilTest.java | 7 ++- .../bgp/parser/spi/PathIdUtilTest.java | 13 +++--- .../protocol/bgp/parser/spi/UtilsTest.java | 27 +++++++----- .../AbstractIpv4ExtendedCommunityTest.java | 11 +++-- .../AbstractOpaqueExtendedCommunityTest.java | 11 ++--- ...stractTwoOctetAsExtendedCommunityTest.java | 13 +++--- .../community/ExtendedCommunityUtilTest.java | 2 +- ...ecificExtendedCommunityCommonUtilTest.java | 17 +++---- .../bgp/parser/spi/pojo/BgpTestActivator.java | 29 +++++++----- .../spi/pojo/MultiPathSupportImplTest.java | 18 +++++--- .../PeerSpecificParserConstraintImplTest.java | 7 ++- ...LoaderBGPExtensionProviderContextTest.java | 6 +-- .../SimpleExtendedCommunityRegistryTest.java | 10 ++--- .../parser/spi/pojo/SimpleRegistryTest.java | 22 ++++++---- .../spi/pojo/UnrecognizedAttributesTest.java | 9 ++-- 56 files changed, 326 insertions(+), 303 deletions(-) diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java index 37e5e52b58..834adca4e3 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java @@ -26,7 +26,7 @@ public abstract class AbstractMessageRegistry implements MessageRegistry { protected abstract Notification parseBody(int type, ByteBuf body, int messageLength, PeerSpecificParserConstraint constraint) throws BGPDocumentedException; - protected abstract void serializeMessageImpl(final Notification message, final ByteBuf buffer); + protected abstract void serializeMessageImpl(Notification message, ByteBuf buffer); static { MARKER = new byte[MessageUtil.MARKER_LENGTH]; @@ -38,7 +38,8 @@ public abstract class AbstractMessageRegistry implements MessageRegistry { throws BGPDocumentedException, BGPParsingException { Preconditions.checkArgument(buffer != null && buffer.isReadable(), "Array of bytes cannot be null or empty."); Preconditions.checkArgument(buffer.readableBytes() >= MessageUtil.COMMON_HEADER_LENGTH, - "Too few bytes in passed array. Passed: %s. Expected: >= %s.", buffer.readableBytes(), MessageUtil.COMMON_HEADER_LENGTH); + "Too few bytes in passed array. Passed: %s. Expected: >= %s.", buffer.readableBytes(), + MessageUtil.COMMON_HEADER_LENGTH); final byte[] marker = ByteArray.readBytes(buffer, MessageUtil.MARKER_LENGTH); if (!Arrays.equals(marker, MARKER)) { @@ -50,19 +51,22 @@ public abstract class AbstractMessageRegistry implements MessageRegistry { final int messageType = UnsignedBytes.toInt(typeBytes); if (messageLength < MessageUtil.COMMON_HEADER_LENGTH) { - throw BGPDocumentedException.badMessageLength("Message length field not within valid range.", messageLength); + throw BGPDocumentedException.badMessageLength("Message length field not within valid range.", + messageLength); } if (messageLength - MessageUtil.COMMON_HEADER_LENGTH != buffer.readableBytes()) { - throw new BGPParsingException("Size doesn't match size specified in header. Passed: " + buffer.readableBytes() - + "; Expected: " + (messageLength - MessageUtil.COMMON_HEADER_LENGTH) + ". "); + throw new BGPParsingException("Size doesn't match size specified in header. Passed: " + + buffer.readableBytes() + "; Expected: " + (messageLength - MessageUtil.COMMON_HEADER_LENGTH) + + ". "); } final ByteBuf msgBody = buffer.readSlice(messageLength - MessageUtil.COMMON_HEADER_LENGTH); final Notification msg = parseBody(messageType, msgBody, messageLength, constraint); if (msg == null) { - throw new BGPDocumentedException("Unhandled message type " + messageType, BGPError.BAD_MSG_TYPE, new byte[] { typeBytes }); + throw new BGPDocumentedException("Unhandled message type " + messageType, BGPError.BAD_MSG_TYPE, + new byte[] { typeBytes }); } return msg; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeRegistry.java index f67f945d5e..548ffd45a3 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeRegistry.java @@ -16,11 +16,12 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes; /** - * + * Attribute serializer/deserializer registry, exposing the capability to parse BGP attributes as a whole. */ public interface AttributeRegistry { /** * Parse BGP Attribute from buffer. + * * @param buffer Input buffer. * @param constraints Peer specific constraint. * @return Decoded BGP Attribute. @@ -32,6 +33,7 @@ public interface AttributeRegistry { /** * Serialize BGP Attribute to buffer. + * * @param attribute Input BGP Attribute. * @param byteAggregator Output buffer. */ diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeSerializer.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeSerializer.java index ea5191751c..64f02f2048 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeSerializer.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeSerializer.java @@ -12,6 +12,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess public interface AttributeSerializer { - void serializeAttribute(final Attributes attribute,final ByteBuf byteAggregator); + void serializeAttribute(Attributes attribute, ByteBuf byteAggregator); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeUtil.java index 1f28e38df4..bb33c980dd 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AttributeUtil.java @@ -26,15 +26,15 @@ public final class AttributeUtil { * Adds header to attribute value. If the length of the attribute value exceeds one-byte length field, * set EXTENDED bit and write length as 2B field. * - * @param flags + * @param flags attribute flags * @param type of the attribute * @param value attribute value * @param buffer ByteBuf where the attribute will be copied with its header */ public static void formatAttribute(final int flags, final int type, final ByteBuf value, final ByteBuf buffer) { final int length = value.writerIndex(); - final boolean extended = (length > MAX_ATTR_LENGTH_FOR_SINGLE_BYTE) ? true : false; - buffer.writeByte((extended) ? (flags | EXTENDED) : flags); + final boolean extended = length > MAX_ATTR_LENGTH_FOR_SINGLE_BYTE ? true : false; + buffer.writeByte(extended ? flags | EXTENDED : flags); buffer.writeByte(type); if (extended) { buffer.writeShort(length); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionProviderContext.java index 95b89c1c88..cea856d109 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionProviderContext.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionProviderContext.java @@ -31,11 +31,13 @@ public interface BGPExtensionProviderContext extends BGPExtensionConsumerContext AutoCloseable registerAttributeParser(int attributeType, AttributeParser parser); - AutoCloseable registerAttributeSerializer(Class attributeClass, AttributeSerializer serializer); + AutoCloseable registerAttributeSerializer(Class attributeClass, + AttributeSerializer serializer); AutoCloseable registerCapabilityParser(int capabilityType, CapabilityParser parser); - AutoCloseable registerCapabilitySerializer(Class capabilityClass, CapabilitySerializer serializer); + AutoCloseable registerCapabilitySerializer(Class capabilityClass, + CapabilitySerializer serializer); AutoCloseable registerMessageParser(int messageType, MessageParser parser); @@ -43,22 +45,24 @@ public interface BGPExtensionProviderContext extends BGPExtensionConsumerContext AutoCloseable registerBgpPrefixSidTlvParser(int tlvType, BgpPrefixSidTlvParser parser); - AutoCloseable registerBgpPrefixSidTlvSerializer(Class tlvClass, BgpPrefixSidTlvSerializer serializer); + AutoCloseable registerBgpPrefixSidTlvSerializer(Class tlvClass, + BgpPrefixSidTlvSerializer serializer); AutoCloseable registerNlriParser(Class afi, Class safi, - NlriParser parser, final NextHopParserSerializer nextHopHandler, final Class cNextHopClass, - final Class... cNextHopClassList); + NlriParser parser, NextHopParserSerializer nextHopHandler, Class cnextHopClass, + Class... cnextHopClassList); AutoCloseable registerNlriSerializer(Class nlriClass, NlriSerializer serializer); AutoCloseable registerParameterParser(int parameterType, ParameterParser parser); - AutoCloseable registerParameterSerializer(Class paramClass, ParameterSerializer serializer); + AutoCloseable registerParameterSerializer(Class paramClass, + ParameterSerializer serializer); - AutoCloseable registerExtendedCommunitySerializer(final Class extendedCommunityClass, - final ExtendedCommunitySerializer serializer); + AutoCloseable registerExtendedCommunitySerializer(Class extendedCommunityClass, + ExtendedCommunitySerializer serializer); - AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, final ExtendedCommunityParser parser); + AutoCloseable registerExtendedCommunityParser(int type, int subtype, ExtendedCommunityParser parser); /** * Get the context-wide cache for a particular object type. diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvParser.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvParser.java index de306ff215..b31a13316f 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvParser.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvParser.java @@ -15,7 +15,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess */ public interface BgpPrefixSidTlvParser { /** - * Method for parsing specific types of TLVs from incoming buffer + * Method for parsing specific types of TLVs from incoming buffer. * * @param buffer with TLV bytes * @return instance of specific TLV diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvRegistry.java index db9e1fe2c6..3245be4613 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvRegistry.java @@ -11,11 +11,12 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.BgpPrefixSidTlv; /** - * BGP prefix SID TLVs registry for encoding/decoding + * BGP prefix SID TLVs registry for encoding/decoding. */ public interface BgpPrefixSidTlvRegistry { /** - * Decode incoming TLV + * Decode incoming TLV. + * * @param type number of TLV * @param buffer contains bytes of TLV * @return instance of specific TLV @@ -23,7 +24,8 @@ public interface BgpPrefixSidTlvRegistry { BgpPrefixSidTlv parseBgpPrefixSidTlv(int type, ByteBuf buffer); /** - * Encode TLV instance + * Encode TLV instance. + * * @param tlv instance * @param bytes encoded TLV outcome */ diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvSerializer.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvSerializer.java index 02a35ae952..ced7a209a4 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvSerializer.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvSerializer.java @@ -15,7 +15,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess */ public interface BgpPrefixSidTlvSerializer { /** - * Method for serializing specific types of TLVs from incoming buffer + * Method for serializing specific types of TLVs from incoming buffer. * * @param tlv instance * @param bytes outcome serialized TLV diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvUtil.java index c9b81e69c5..19a492f480 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BgpPrefixSidTlvUtil.java @@ -16,7 +16,7 @@ public final class BgpPrefixSidTlvUtil { } /** - * Utilized method for serialization of BGP prefix SID TLV + * Utilized method for serialization of BGP prefix SID TLV. * * @param type of TLV * @param value of TLV diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/CapabilitySerializer.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/CapabilitySerializer.java index 4c8f5215c9..56170ba644 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/CapabilitySerializer.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/CapabilitySerializer.java @@ -11,5 +11,5 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParameters; public interface CapabilitySerializer { - void serializeCapability(final CParameters capability, final ByteBuf byteAggregator); + void serializeCapability(CParameters capability, ByteBuf byteAggregator); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageParser.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageParser.java index 7d461d4137..2fc06bb21e 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageParser.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageParser.java @@ -24,7 +24,6 @@ public interface MessageParser { * @param messageLength Length of the BGP message. * @param constraint Peer specific constraints, implementations may ignore them. * @return Parsed BGP Message body. - * @throws BGPDocumentedException */ @Nonnull Notification parseMessageBody(@Nonnull ByteBuf body, int messageLength, @Nullable PeerSpecificParserConstraint constraint) throws BGPDocumentedException; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageRegistry.java index 6db2b4fd89..6b565acbab 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageRegistry.java @@ -15,8 +15,7 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yangtools.yang.binding.Notification; /** - * BGP Message codec registry, provides services - * to encode/decode messages. + * BGP Message codec registry, provides services to encode/decode messages. */ public interface MessageRegistry { /** @@ -24,8 +23,6 @@ public interface MessageRegistry { * @param bytes Input buffer with encoded message. * @param constraint Peer specific constraint. * @return Parsed BGP message. - * @throws BGPDocumentedException - * @throws BGPParsingException */ @Nonnull Notification parseMessage(@Nonnull ByteBuf bytes, @Nullable PeerSpecificParserConstraint constraint) throws BGPDocumentedException, BGPParsingException; @@ -36,5 +33,4 @@ public interface MessageRegistry { * @param buffer Output buffer where message is to be written. */ void serializeMessage(@Nonnull Notification message, @Nonnull ByteBuf buffer); - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java index d30b8a9605..ad231c119e 100755 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java @@ -51,7 +51,7 @@ public final class MessageUtil { } /** - * Check for NLRI attribute in Update message + * Check for NLRI attribute in Update message. * * @param message Update message * @return true if any prefix or MP-REACH-NLRI attribute is present, false otherwise @@ -66,7 +66,7 @@ public final class MessageUtil { } /** - * Finds MP-REACH-NLRI in Update message attributes + * Finds MP-REACH-NLRI in Update message attributes. * * @param attrs Update message attributes * @return MP-REACH-NLRI if present in the attributes, null otherwise @@ -83,7 +83,7 @@ public final class MessageUtil { } /** - * Finds MP-UNREACH-NLRI in Update message attributes + * Finds MP-UNREACH-NLRI in Update message attributes. * * @param attrs Update message attributes * @return MP-UNREACH-NLRI if present in the attributes, null otherwise diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupport.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupport.java index 4af953d766..fe32a9d840 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupport.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupport.java @@ -5,22 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType; /** - * Holds user specific add-path constraints per AFI/SAFI (table type) - * + * Holds user specific add-path constraints per AFI/SAFI (table type). */ public interface MultiPathSupport extends PeerConstraint { - /** * Check if requested AFI/SAFI is supported. - * @param tableType + * + * @param tableType Table type to check * @return True if the table type is supported. */ boolean isTableTypeSupported(BgpTableType tableType); - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java index 19c6703c84..9d31079674 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi; import static java.util.Objects.requireNonNull; @@ -27,14 +26,13 @@ public final class MultiPathSupportUtil { * @param afiSafi Required AFI/SAFI * @return True if AFI/SAFI is supported. */ - public static boolean isTableTypeSupported(@Nullable final PeerSpecificParserConstraint constraints, @Nonnull final BgpTableType afiSafi) { + public static boolean isTableTypeSupported(@Nullable final PeerSpecificParserConstraint constraints, + @Nonnull final BgpTableType afiSafi) { requireNonNull(afiSafi); if (constraints != null) { final Optional peerConstraint = constraints.getPeerConstraint(MultiPathSupport.class); return peerConstraint.isPresent() && peerConstraint.get().isTableTypeSupported(afiSafi); } return false; - } - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiprotocolCapabilitiesUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiprotocolCapabilitiesUtil.java index 8d54a7d6b8..a3cb6e481a 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiprotocolCapabilitiesUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiprotocolCapabilitiesUtil.java @@ -27,14 +27,18 @@ public final class MultiprotocolCapabilitiesUtil { private static final Logger LOG = LoggerFactory.getLogger(MultiprotocolCapabilitiesUtil.class); public static final CParameters RR_CAPABILITY = new CParametersBuilder().addAugmentation(CParameters1.class, - new CParameters1Builder().setRouteRefreshCapability(new RouteRefreshCapabilityBuilder().build()).build()).build(); + new CParameters1Builder().setRouteRefreshCapability(new RouteRefreshCapabilityBuilder().build()).build()) + .build(); private static final int RESERVED = 1; - private MultiprotocolCapabilitiesUtil() { throw new UnsupportedOperationException(); } + private MultiprotocolCapabilitiesUtil() { + throw new UnsupportedOperationException(); + } - public static void serializeMPAfiSafi(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg, - final Class afi, final Class safi, final ByteBuf capBuffer) { + public static void serializeMPAfiSafi(final AddressFamilyRegistry afiReg, + final SubsequentAddressFamilyRegistry safiReg, final Class afi, + final Class safi, final ByteBuf capBuffer) { final Integer afival = afiReg.numberForClass(afi); Preconditions.checkArgument(afival != null, "Unhandled address family " + afi); capBuffer.writeShort(afival); @@ -46,7 +50,8 @@ public final class MultiprotocolCapabilitiesUtil { capBuffer.writeByte(safival); } - public static Optional parseMPAfiSafi(final ByteBuf buffer, final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { + public static Optional parseMPAfiSafi(final ByteBuf buffer, final AddressFamilyRegistry afiReg, + final SubsequentAddressFamilyRegistry safiReg) { final int afiVal = buffer.readUnsignedShort(); final Class afi = afiReg.classForFamily(afiVal); if (afi == null) { diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NextHopParserSerializer.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NextHopParserSerializer.java index db9249fa9b..0d55090c84 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NextHopParserSerializer.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NextHopParserSerializer.java @@ -15,28 +15,26 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop; /** - * Handles Next Hop, by default use {@link NextHopUtil} - * which is handles Ipv4 and Ipv6 Next hop. + * Handles Next Hop, by default use {@link NextHopUtil} which is handles Ipv4 and Ipv6 Next hop. */ public interface NextHopParserSerializer { /** - * Parse Next hop from buffer, + * Parse Next hop from buffer. * * @param buffer Encoded Next Hop in ByteBuf. * @return CNextHop - * @throws BGPParsingException */ - default CNextHop parseNextHop(@Nonnull ByteBuf buffer) throws BGPParsingException { + default CNextHop parseNextHop(@Nonnull final ByteBuf buffer) throws BGPParsingException { return NextHopUtil.parseNextHop(buffer); } /** - * Serialize Next Hop + * Serialize Next Hop. * - * @param cNextHop Next Hop container + * @param cnextHop Next Hop container * @param byteAggregator return Encoded Next Hop in ByteBuf */ - default void serializeNextHop(@Nonnull CNextHop cNextHop, @Nonnull final ByteBuf byteAggregator) { - NextHopUtil.serializeNextHop(cNextHop, byteAggregator); + default void serializeNextHop(@Nonnull final CNextHop cnextHop, @Nonnull final ByteBuf byteAggregator) { + NextHopUtil.serializeNextHop(cnextHop, byteAggregator); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriParser.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriParser.java index 084257b52d..2bff6a2cf5 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriParser.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriParser.java @@ -26,11 +26,9 @@ public interface NlriParser { * @param constraint Peer specific constraints. * @throws BGPParsingException exception. */ - void parseNlri( - @Nonnull final ByteBuf nlri, - @Nonnull final MpReachNlriBuilder builder, - @Nullable final PeerSpecificParserConstraint constraint) - throws BGPParsingException; + void parseNlri(@Nonnull ByteBuf nlri, @Nonnull MpReachNlriBuilder builder, + @Nullable PeerSpecificParserConstraint constraint) throws BGPParsingException; + /** * Parse MP UN_REACH NLRI from buffer. * @@ -39,9 +37,6 @@ public interface NlriParser { * @param constraint Peer specific constraints. * @throws BGPParsingException exception. */ - void parseNlri( - @Nonnull final ByteBuf nlri, - @Nonnull final MpUnreachNlriBuilder builder, - @Nullable final PeerSpecificParserConstraint constraint) - throws BGPParsingException; + void parseNlri(@Nonnull ByteBuf nlri, @Nonnull MpUnreachNlriBuilder builder, + @Nullable PeerSpecificParserConstraint constraint) throws BGPParsingException; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriRegistry.java index e4f6e2a417..db711df6d9 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriRegistry.java @@ -15,35 +15,32 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlri; /** - * The codec registry for BGP NLRI, offers - * services for NLRI encoding/decoding. - * + * The codec registry for BGP NLRI, offers services for NLRI encoding/decoding. */ public interface NlriRegistry { /** * Decode MP REACH NLRI Attribute. + * * @param buffer Input buffer. * @param constraint Peer specific constraint. * @return Parsed reach NLRI. - * @throws BGPParsingException */ - @Nonnull MpReachNlri parseMpReach( - @Nonnull ByteBuf buffer, - @Nullable PeerSpecificParserConstraint constraint) throws BGPParsingException; + @Nonnull MpReachNlri parseMpReach(@Nonnull ByteBuf buffer, @Nullable PeerSpecificParserConstraint constraint) + throws BGPParsingException; /** * Decode MP REACH NLRI Attribute. + * * @param buffer Input buffer. * @param constraint Peer specific constraint. * @return Parsed unreach NLRI. - * @throws BGPParsingException */ - @Nonnull MpUnreachNlri parseMpUnreach( - @Nonnull ByteBuf buffer, - @Nullable PeerSpecificParserConstraint constraint) throws BGPParsingException; + @Nonnull MpUnreachNlri parseMpUnreach(@Nonnull ByteBuf buffer, @Nullable PeerSpecificParserConstraint constraint) + throws BGPParsingException; /** * Encode BGP MP REACH NLRI Attribute. + * * @param mpReachNlri Input reach NLRI. * @param byteAggregator Output buffer. */ @@ -51,6 +48,7 @@ public interface NlriRegistry { /** * Encode BGP MP UNREACH NLRI Attribute. + * * @param mpUnreachNlri Input unreach NLRI. * @param byteAggregator Output buffer. */ @@ -58,6 +56,7 @@ public interface NlriRegistry { /** * Get all available NLRI encoders. + * * @return Iterable of NLRI serializers. */ Iterable getSerializers(); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriSerializer.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriSerializer.java index 0f4d7e441c..5b3eaaf920 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriSerializer.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/NlriSerializer.java @@ -8,11 +8,9 @@ package org.opendaylight.protocol.bgp.parser.spi; import io.netty.buffer.ByteBuf; - import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes; public interface NlriSerializer { - void serializeAttribute(final Attributes attribute, final ByteBuf byteAggregator); - + void serializeAttribute(Attributes attribute, ByteBuf byteAggregator); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java index 92723a7575..67848ca66c 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java @@ -56,7 +56,7 @@ public final class PathIdUtil { } /** - * Extract PathId from route change received + * Extract PathId from route change received. * * @param data Data containing the path Id * @param pathNii Path Id NodeIdentifier specific per each Rib support diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/RevisedErrorHandling.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/RevisedErrorHandling.java index f58f4a9903..537a211103 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/RevisedErrorHandling.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/RevisedErrorHandling.java @@ -42,7 +42,7 @@ public enum RevisedErrorHandling { /** * Determine Revised Error Handling from the contents of a {@link PeerSpecificParserConstraint}. * - * @param constraint + * @param constraint Peer-specific constraint * @return Revised Error Handling treatment message/attributes should receive. */ public static RevisedErrorHandling from(final @Nullable PeerSpecificParserConstraint constraint) { diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Abstract4OctetAsExtendedCommunity.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Abstract4OctetAsExtendedCommunity.java index 28ee18e9a9..6c712d081d 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Abstract4OctetAsExtendedCommunity.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Abstract4OctetAsExtendedCommunity.java @@ -5,19 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; -public abstract class Abstract4OctetAsExtendedCommunity implements ExtendedCommunityParser, ExtendedCommunitySerializer { +public abstract class Abstract4OctetAsExtendedCommunity implements ExtendedCommunityParser, + ExtendedCommunitySerializer { private static final int TRANSITIVE_TYPE = 2; private static final int NON_TRANSITIVE_TYPE = 66; @Override public int getType(final boolean isTransitive) { - if (isTransitive) { - return TRANSITIVE_TYPE; - } - return NON_TRANSITIVE_TYPE; + return isTransitive ? TRANSITIVE_TYPE : NON_TRANSITIVE_TYPE; } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunity.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunity.java index a7757b736f..0405cd1535 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunity.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunity.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; - -public abstract class AbstractTwoOctetAsExtendedCommunity implements ExtendedCommunityParser, ExtendedCommunitySerializer { +public abstract class AbstractTwoOctetAsExtendedCommunity implements ExtendedCommunityParser, + ExtendedCommunitySerializer { private static final int TYPE = 0; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityParser.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityParser.java index b482e4bbd9..eb2981562b 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityParser.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityParser.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; @@ -14,18 +13,14 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity; /** - * The Extended Community value parser (ByteBuf to ExtendedCommunity) - * + * The Extended Community value parser (ByteBuf to ExtendedCommunity). */ public interface ExtendedCommunityParser { - /** * Parses the Extended Community value encoded in the buffer. + * * @param buffer ByteBuf * @return Decoded Extended Community value. - * @throws BGPDocumentedException - * @throws BGPParsingException */ ExtendedCommunity parseExtendedCommunity(ByteBuf buffer) throws BGPDocumentedException, BGPParsingException; - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityRegistry.java index 299c126cde..5de2ecffb7 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityRegistry.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; @@ -15,25 +14,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess /** * The Extended Communities registry. - * */ public interface ExtendedCommunityRegistry { - /** * Parses the Extended Community. + * * @param buffer ByteBuf * @return Decoded ExtendedCommunity or null if the parser for such Extended Community type/sub-type is not present. - * @throws BGPDocumentedException - * @throws BGPParsingException */ ExtendedCommunities parseExtendedCommunity(ByteBuf buffer) throws BGPDocumentedException, BGPParsingException; /** * Serializes the Extended Community. + * * @param extendedCommunity ExtendedCommunity to be encoded. - * @param byteAggregator ByteBuf, where the Extended Community is serialized, - * if a serialized is not present for such Extended Community type, no bytes are written into output buffer. + * @param byteAggregator ByteBuf, where the Extended Community is serialized, if a serialized is not present for + * such Extended Community type, no bytes are written into output buffer. */ void serializeExtendedCommunity(ExtendedCommunities extendedCommunity, ByteBuf byteAggregator); - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtil.java index 6546f8b466..d5552816d7 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtil.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.parser.spi.extended.community; /** * The utility functions related to the extended communities. - * */ public final class ExtendedCommunityUtil { @@ -22,9 +21,11 @@ public final class ExtendedCommunityUtil { /** * Sets transitivity flag for the Extended Community type. + * * @param type Extended Community Type * @param isTransitive Extended Community transitivity - * @return Extended Community type with a transitivity flag set if isTransitive false, otherwise returns unchanged type. + * @return Extended Community type with a transitivity flag set if isTransitive false, otherwise returns unchanged + * type. */ public static int setTransitivity(final int type, final boolean isTransitive) { return isTransitive ? type : ExtendedCommunityUtil.toNonTransitiveType(type); @@ -32,6 +33,7 @@ public final class ExtendedCommunityUtil { /** * Check the Extended Community type for transitivity. + * * @param type Extended Community Type * @return True if input type is transitive, false if the type is non-transitive */ @@ -42,5 +44,4 @@ public final class ExtendedCommunityUtil { private static int toNonTransitiveType(final int type) { return type | NON_TRANS; } - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtil.java index c4c78f62ee..d98251a4df 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtil.java @@ -1,11 +1,10 @@ /* - * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import static org.opendaylight.protocol.bgp.parser.spi.extended.community.AbstractIpv4ExtendedCommunity.INET_LOCAL_ADMIN_LENGTH; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java index 2d7354463a..2909de8ff2 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import static java.util.Objects.requireNonNull; @@ -22,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamilies; public final class MultiPathSupportImpl implements MultiPathSupport { - private final Set supportedTables; private MultiPathSupportImpl(final Set supportedTables) { @@ -37,7 +35,8 @@ public final class MultiPathSupportImpl implements MultiPathSupport { * @param addPathCapabilities The remote add-path capabilities list. * @return MultiPathSupport instance. */ - public static MultiPathSupport createParserMultiPathSupport(@Nonnull final List addPathCapabilities) { + public static MultiPathSupport createParserMultiPathSupport( + @Nonnull final List addPathCapabilities) { requireNonNull(addPathCapabilities); final Set support = addPathCapabilities .stream() @@ -51,5 +50,4 @@ public final class MultiPathSupportImpl implements MultiPathSupport { public boolean isTableTypeSupported(final BgpTableType tableType) { return this.supportedTables.contains(tableType); } - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java index 267d167c4e..ec438322d8 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java @@ -13,24 +13,17 @@ import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext; public final class ServiceLoaderBGPExtensionProviderContext { private static final class Holder { - private static final BGPExtensionProviderContext INSTANCE; + private static final BGPExtensionProviderContext INSTANCE = create(); private Holder() { } - - static { - try { - INSTANCE = create(); - } catch (final Exception e) { - throw new ExceptionInInitializerError(e); - } - } } public static BGPExtensionProviderContext create() { final BGPExtensionProviderContext ctx = new SimpleBGPExtensionProviderContext(); - final ServiceLoader loader = ServiceLoader.load(BGPExtensionProviderActivator.class); + final ServiceLoader loader = ServiceLoader.load( + BGPExtensionProviderActivator.class); for (final BGPExtensionProviderActivator a : loader) { a.start(ctx); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAddressFamilyRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAddressFamilyRegistry.java index c99eab19dc..10e1461950 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAddressFamilyRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAddressFamilyRegistry.java @@ -12,7 +12,8 @@ import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry; import org.opendaylight.protocol.util.Values; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily; -final class SimpleAddressFamilyRegistry extends AbstractFamilyRegistry implements AddressFamilyRegistry { +final class SimpleAddressFamilyRegistry extends AbstractFamilyRegistry + implements AddressFamilyRegistry { AutoCloseable registerAddressFamily(final Class clazz, final int number) { Preconditions.checkArgument(number >= 0 && number <= Values.UNSIGNED_SHORT_MAX_VALUE); return super.registerFamily(clazz, number); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java index 460e94a264..557e9d30ee 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java @@ -36,7 +36,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Notification; -public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsumerContext implements BGPExtensionProviderContext { +public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsumerContext + implements BGPExtensionProviderContext { public static final int DEFAULT_MAXIMUM_CACHED_OBJECTS = 100000; @@ -77,7 +78,8 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerAttributeSerializer(final Class attributeClass, final AttributeSerializer serializer) { + public AutoCloseable registerAttributeSerializer(final Class attributeClass, + final AttributeSerializer serializer) { return this.getAttributeRegistry().registerAttributeSerializer(attributeClass, serializer); } @@ -87,7 +89,8 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerCapabilitySerializer(final Class capabilityClass, final CapabilitySerializer serializer) { + public AutoCloseable registerCapabilitySerializer(final Class capabilityClass, + final CapabilitySerializer serializer) { return this.getCapabilityRegistry().registerCapabilitySerializer(capabilityClass, serializer); } @@ -97,19 +100,23 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerMessageSerializer(final Class messageClass, final MessageSerializer serializer) { + public AutoCloseable registerMessageSerializer(final Class messageClass, + final MessageSerializer serializer) { return this.getMessageRegistry().registerMessageSerializer(messageClass, serializer); } @Override - public AutoCloseable registerNlriParser(final Class afi, final Class safi, - final NlriParser parser, final NextHopParserSerializer nextHopParserSerializer, final Class cNextHopClass, final Class... cNextHopClassList) { - return this.getNlriRegistry().registerNlriParser(afi, safi, parser, nextHopParserSerializer, cNextHopClass, cNextHopClassList); + public AutoCloseable registerNlriParser(final Class afi, + final Class safi, final NlriParser parser, + final NextHopParserSerializer nextHopParserSerializer, final Class cnextHopClass, + final Class... cnextHopClassList) { + return this.getNlriRegistry().registerNlriParser(afi, safi, parser, nextHopParserSerializer, cnextHopClass, + cnextHopClassList); } @Override - public AutoCloseable registerNlriSerializer(final Class nlriClass, final NlriSerializer serializer) { + public AutoCloseable registerNlriSerializer(final Class nlriClass, + final NlriSerializer serializer) { return this.getNlriRegistry().registerNlriSerializer(nlriClass, serializer); } @@ -119,12 +126,14 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerParameterSerializer(final Class paramClass, final ParameterSerializer serializer) { + public AutoCloseable registerParameterSerializer(final Class paramClass, + final ParameterSerializer serializer) { return this.getParameterRegistry().registerParameterSerializer(paramClass, serializer); } @Override - public AutoCloseable registerSubsequentAddressFamily(final Class clazz, final int number) { + public AutoCloseable registerSubsequentAddressFamily(final Class clazz, + final int number) { return this.getSubsequentAddressFamilyRegistry().registerSubsequentAddressFamily(clazz, number); } @@ -134,13 +143,16 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerExtendedCommunitySerializer(final Class extendedCommunityClass, + public AutoCloseable registerExtendedCommunitySerializer( + final Class extendedCommunityClass, final ExtendedCommunitySerializer serializer) { - return this.getExtendedCommunityRegistry().registerExtendedCommunitySerializer(extendedCommunityClass, serializer); + return this.getExtendedCommunityRegistry().registerExtendedCommunitySerializer(extendedCommunityClass, + serializer); } @Override - public AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, final ExtendedCommunityParser parser) { + public AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, + final ExtendedCommunityParser parser) { return this.getExtendedCommunityRegistry().registerExtendedCommunityParser(type, subtype, parser); } @@ -150,7 +162,8 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume } @Override - public AutoCloseable registerBgpPrefixSidTlvSerializer(final Class tlvClass, final BgpPrefixSidTlvSerializer serializer) { + public AutoCloseable registerBgpPrefixSidTlvSerializer(final Class tlvClass, + final BgpPrefixSidTlvSerializer serializer) { return this.getBgpPrefixSidTlvRegistry().registerBgpPrefixSidTlvSerializer(tlvClass, serializer); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java index c0108eee31..8553bdbb8a 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java @@ -35,7 +35,7 @@ public class SimpleBGPExtensionProviderContextActivator implements AutoCloseable public void start() { LOG.debug("Starting {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BGPExtensionProviderActivator e : this.extensionActivators) { + for (final BGPExtensionProviderActivator e : this.extensionActivators) { e.start(this.providerContext); } } @@ -44,7 +44,7 @@ public class SimpleBGPExtensionProviderContextActivator implements AutoCloseable public void close() { LOG.debug("Stopping {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BGPExtensionProviderActivator e : this.extensionActivators) { + for (final BGPExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java index a8424be5a2..9d1a683a3c 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java @@ -21,14 +21,16 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SimpleBgpPrefixSidTlvRegistry implements BgpPrefixSidTlvRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); AutoCloseable registerBgpPrefixSidTlvParser(final int tlvType, final BgpPrefixSidTlvParser parser) { Preconditions.checkArgument(tlvType >= 0 && tlvType <= Values.UNSIGNED_BYTE_MAX_VALUE); return this.handlers.registerParser(tlvType, parser); } - AutoCloseable registerBgpPrefixSidTlvSerializer(final Class tlvClass, final BgpPrefixSidTlvSerializer serializer) { + AutoCloseable registerBgpPrefixSidTlvSerializer(final Class tlvClass, + final BgpPrefixSidTlvSerializer serializer) { return this.handlers.registerSerializer(tlvClass, serializer); } @@ -39,7 +41,8 @@ public final class SimpleBgpPrefixSidTlvRegistry implements BgpPrefixSidTlvRegis return null; } final int length = buffer.readUnsignedShort(); - Preconditions.checkState(length <= buffer.readableBytes(), "Length of BGP prefix SID TLV exceeds readable bytes of income."); + Preconditions.checkState(length <= buffer.readableBytes(), + "Length of BGP prefix SID TLV exceeds readable bytes of income."); return parser.parseBgpPrefixSidTlv(buffer.readBytes(length)); } @@ -53,5 +56,4 @@ public final class SimpleBgpPrefixSidTlvRegistry implements BgpPrefixSidTlvRegis serializer.serializeBgpPrefixSidTlv(tlv, valueBuf); BgpPrefixSidTlvUtil.formatBgpPrefixSidTlv(serializer.getType(), valueBuf, bytes); } - } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleCapabilityRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleCapabilityRegistry.java index 5ca4269d64..5649360c2b 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleCapabilityRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleCapabilityRegistry.java @@ -21,19 +21,22 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; final class SimpleCapabilityRegistry implements CapabilityRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); AutoCloseable registerCapabilityParser(final int messageType, final CapabilityParser parser) { Preconditions.checkArgument(messageType >= 0 && messageType <= Values.UNSIGNED_BYTE_MAX_VALUE); return this.handlers.registerParser(messageType, parser); } - AutoCloseable registerCapabilitySerializer(final Class paramClass, final CapabilitySerializer serializer) { + AutoCloseable registerCapabilitySerializer(final Class paramClass, + final CapabilitySerializer serializer) { return this.handlers.registerSerializer(paramClass, serializer); } @Override - public CParameters parseCapability(final int type, final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { + public CParameters parseCapability(final int type, final ByteBuf buffer) throws BGPDocumentedException, + BGPParsingException { final CapabilityParser parser = this.handlers.getParser(type); if (parser == null) { return null; @@ -42,7 +45,7 @@ final class SimpleCapabilityRegistry implements CapabilityRegistry { } @Override - public void serializeCapability(final CParameters capability, ByteBuf bytes) { + public void serializeCapability(final CParameters capability, final ByteBuf bytes) { for (CapabilitySerializer s : this.handlers.getAllSerializers()) { s.serializeCapability(capability, bytes); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java index 100a96c43f..d124452321 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import static org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunityUtil.isTransitive; @@ -33,10 +32,11 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry private static final int EXTENDED_COMMUNITY_LENGTH = 6; - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); private static int createKey(final int type, final int subtype) { - return (type << Byte.SIZE) | subtype; + return type << Byte.SIZE | subtype; } @Override @@ -58,22 +58,26 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry @Override public void serializeExtendedCommunity(final ExtendedCommunities extendedCommunity, final ByteBuf byteAggregator) { - final ExtendedCommunitySerializer serializer = this.handlers.getSerializer(extendedCommunity.getExtendedCommunity().getImplementedInterface()); + final ExtendedCommunitySerializer serializer = this.handlers.getSerializer(extendedCommunity + .getExtendedCommunity().getImplementedInterface()); if (serializer == null) { return; } - ByteBufWriteUtil.writeUnsignedByte(Shorts.checkedCast(serializer.getType(extendedCommunity.isTransitive())), byteAggregator); + ByteBufWriteUtil.writeUnsignedByte(Shorts.checkedCast(serializer.getType(extendedCommunity.isTransitive())), + byteAggregator); ByteBufWriteUtil.writeUnsignedByte(Shorts.checkedCast(serializer.getSubType()), byteAggregator); serializer.serializeExtendedCommunity(extendedCommunity.getExtendedCommunity(), byteAggregator); } synchronized AutoCloseable registerExtendedCommunitySerializer( - final Class extendedCommunityClass, + final Class extendedCommunityClass, final ExtendedCommunitySerializer serializer) { return this.handlers.registerSerializer(extendedCommunityClass, serializer); } - synchronized AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, final ExtendedCommunityParser parser) { + synchronized AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, + final ExtendedCommunityParser parser) { checkTypes(type, subtype); return this.handlers.registerParser(createKey(type, subtype), parser); } @@ -81,7 +85,8 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry private static void checkTypes(final int type, final int subtype) { Preconditions.checkArgument(type >= 0 && type <= UNSIGNED_BYTE_MAX_VALUE, "Illegal extended-community type %s", type); - Preconditions.checkArgument(subtype >= 0 && subtype <= UNSIGNED_BYTE_MAX_VALUE, "Illegal extended-community sub-type %s", subtype); + Preconditions.checkArgument(subtype >= 0 && subtype <= UNSIGNED_BYTE_MAX_VALUE, + "Illegal extended-community sub-type %s", subtype); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java index e8f036d1a5..7c0902cddd 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java @@ -44,7 +44,8 @@ final class SimpleMessageRegistry extends AbstractMessageRegistry { return this.handlers.registerParser(messageType, parser); } - AutoCloseable registerMessageSerializer(final Class messageClass, final MessageSerializer serializer) { + AutoCloseable registerMessageSerializer(final Class messageClass, + final MessageSerializer serializer) { return this.handlers.registerSerializer(messageClass, serializer); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java index ff1497e160..1270c36a1f 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java @@ -55,7 +55,7 @@ final class SimpleNlriRegistry implements NlriRegistry { private final SubsequentAddressFamilyRegistry safiReg; private final AddressFamilyRegistry afiReg; - public SimpleNlriRegistry(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { + SimpleNlriRegistry(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { this.afiReg = requireNonNull(afiReg); this.safiReg = requireNonNull(safiReg); } @@ -67,8 +67,8 @@ final class SimpleNlriRegistry implements NlriRegistry { return new BgpTableTypeImpl(afi, safi); } - synchronized AutoCloseable registerNlriSerializer(final Class nlriClass, final - NlriSerializer serializer){ + synchronized AutoCloseable registerNlriSerializer(final Class nlriClass, + final NlriSerializer serializer) { final NlriSerializer prev = this.serializers.get(nlriClass); Preconditions.checkState(prev == null, "Serializer already bound to class " + prev); @@ -87,8 +87,8 @@ final class SimpleNlriRegistry implements NlriRegistry { synchronized AutoCloseable registerNlriParser(final Class afi, final Class safi, final NlriParser parser, - final NextHopParserSerializer nextHopSerializer, final Class cNextHopClass, - final Class... cNextHopClassList) { + final NextHopParserSerializer nextHopSerializer, final Class cnextHopClass, + final Class... cnextHopClassList) { final BgpTableType key = createKey(afi, safi); final NlriParser prev = this.handlers.get(key); Preconditions.checkState(prev == null, "AFI/SAFI is already bound to parser " + prev); @@ -96,11 +96,11 @@ final class SimpleNlriRegistry implements NlriRegistry { this.handlers.put(key, parser); this.nextHopParsers.put(key,nextHopSerializer); - if (cNextHopClass != null) { - final Entry, BgpTableType> nhKey = new SimpleEntry<>(cNextHopClass, key); + if (cnextHopClass != null) { + final Entry, BgpTableType> nhKey = new SimpleEntry<>(cnextHopClass, key); this.nextHopSerializers.put(nhKey, nextHopSerializer); - for (final Class cNextHop : cNextHopClassList) { - final Entry, BgpTableType> nhKeys = new SimpleEntry<>(cNextHop, key); + for (final Class cnextHop : cnextHopClassList) { + final Entry, BgpTableType> nhKeys = new SimpleEntry<>(cnextHop, key); this.nextHopSerializers.put(nhKeys, nextHopSerializer); } } @@ -112,13 +112,13 @@ final class SimpleNlriRegistry implements NlriRegistry { synchronized (lock) { SimpleNlriRegistry.this.handlers.remove(key); SimpleNlriRegistry.this.nextHopParsers.remove(key); - if (cNextHopClass != null) { + if (cnextHopClass != null) { final Entry, BgpTableType> nhKey - = new SimpleEntry<>(cNextHopClass, key); + = new SimpleEntry<>(cnextHopClass, key); SimpleNlriRegistry.this.nextHopSerializers.remove(nhKey); - for (final Class cNextHop : cNextHopClassList) { + for (final Class cnextHop : cnextHopClassList) { final Entry, BgpTableType> nhKeys - = new SimpleEntry<>(cNextHop, key); + = new SimpleEntry<>(cnextHop, key); SimpleNlriRegistry.this.nextHopSerializers.remove(nhKeys); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java index ac84dc98e8..fa83e509da 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java @@ -20,19 +20,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yangtools.yang.binding.DataContainer; final class SimpleParameterRegistry implements ParameterRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); AutoCloseable registerParameterParser(final int messageType, final ParameterParser parser) { Preconditions.checkArgument(messageType >= 0 && messageType <= Values.UNSIGNED_BYTE_MAX_VALUE); return this.handlers.registerParser(messageType, parser); } - AutoCloseable registerParameterSerializer(final Class paramClass, final ParameterSerializer serializer) { + AutoCloseable registerParameterSerializer(final Class paramClass, + final ParameterSerializer serializer) { return this.handlers.registerSerializer(paramClass, serializer); } @Override - public BgpParameters parseParameter(final int parameterType, final ByteBuf buffer) throws BGPParsingException, BGPDocumentedException { + public BgpParameters parseParameter(final int parameterType, final ByteBuf buffer) throws BGPParsingException, + BGPDocumentedException { final ParameterParser parser = this.handlers.getParser(parameterType); if (parser == null) { return null; @@ -40,7 +43,8 @@ final class SimpleParameterRegistry implements ParameterRegistry { return parser.parseParameter(buffer); } - public void serializeParameter(final BgpParameters parameter, ByteBuf bytes) { + @Override + public void serializeParameter(final BgpParameters parameter, final ByteBuf bytes) { final ParameterSerializer serializer = this.handlers.getSerializer(parameter.getImplementedInterface()); if (serializer == null) { return; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleSubsequentAddressFamilyRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleSubsequentAddressFamilyRegistry.java index 14ba1c175c..785568c39e 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleSubsequentAddressFamilyRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleSubsequentAddressFamilyRegistry.java @@ -7,16 +7,17 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry; import org.opendaylight.protocol.util.Values; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.SubsequentAddressFamily; -final class SimpleSubsequentAddressFamilyRegistry extends AbstractFamilyRegistry implements - SubsequentAddressFamilyRegistry { - AutoCloseable registerSubsequentAddressFamily(final Class clazz, final int number) { - Preconditions.checkArgument(number >= 0 && number <= Values.UNSIGNED_BYTE_MAX_VALUE); +final class SimpleSubsequentAddressFamilyRegistry extends AbstractFamilyRegistry + implements SubsequentAddressFamilyRegistry { + AutoCloseable registerSubsequentAddressFamily(final Class clazz, + final int number) { + checkArgument(number >= 0 && number <= Values.UNSIGNED_BYTE_MAX_VALUE); return super.registerFamily(clazz, number); } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistryTest.java index beb6b287b0..e22fcfa489 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistryTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistryTest.java @@ -26,15 +26,17 @@ import org.opendaylight.yangtools.yang.binding.Notification; public class AbstractMessageRegistryTest { - public static final byte[] keepAliveBMsg = new byte[] { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x00, (byte) 0x13, (byte) 0x04 }; + public static final byte[] KEEPALIVE_BMSG = new byte[] { + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0x00, (byte) 0x13, (byte) 0x04 + }; private final AbstractMessageRegistry registry = new AbstractMessageRegistry() { @Override protected void serializeMessageImpl(final Notification message, final ByteBuf buffer) { - buffer.writeBytes(keepAliveBMsg); + buffer.writeBytes(KEEPALIVE_BMSG); } @Override @@ -49,17 +51,19 @@ public class AbstractMessageRegistryTest { final Notification keepAlive = new KeepaliveBuilder().build(); final ByteBuf buffer = Unpooled.buffer(); this.registry.serializeMessage(keepAlive, buffer); - assertArrayEquals(keepAliveBMsg, ByteArray.getAllBytes(buffer)); + assertArrayEquals(KEEPALIVE_BMSG, ByteArray.getAllBytes(buffer)); - final Notification not = this.registry.parseMessage(Unpooled.copiedBuffer(keepAliveBMsg), null); + final Notification not = this.registry.parseMessage(Unpooled.copiedBuffer(KEEPALIVE_BMSG), null); assertTrue(not instanceof Keepalive); } @Test public void testIncompleteMarker() { - final byte[] testBytes = new byte[] { (byte) 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x00, (byte) 0x13, (byte) 0x04 }; + final byte[] testBytes = new byte[] { + (byte) 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0x00, (byte) 0x13, (byte) 0x04 + }; try { this.registry.parseMessage(Unpooled.copiedBuffer(testBytes), null); Assert.fail(); @@ -71,9 +75,11 @@ public class AbstractMessageRegistryTest { @Test public void testInvalidLength() { - final byte[] testBytes = new byte[] { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x00, (byte) 0x12, (byte) 0x04 }; + final byte[] testBytes = new byte[] { + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0x00, (byte) 0x12, (byte) 0x04 + }; try { this.registry.parseMessage(Unpooled.copiedBuffer(testBytes), null); Assert.fail(); @@ -85,9 +91,11 @@ public class AbstractMessageRegistryTest { @Test public void testInvalidSpecifiedSize() { - final byte[] testBytes = new byte[] { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x00, (byte) 0x13, (byte) 0x04, (byte) 0x04 }; + final byte[] testBytes = new byte[] { + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, + (byte) 0x00, (byte) 0x13, (byte) 0x04, (byte) 0x04 + }; try { this.registry.parseMessage(Unpooled.copiedBuffer(testBytes), null); Assert.fail(); @@ -99,7 +107,8 @@ public class AbstractMessageRegistryTest { @Test public void testBGPHeaderParser() throws Exception { - final MessageRegistry msgReg = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getMessageRegistry(); + final MessageRegistry msgReg = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance() + .getMessageRegistry(); try { msgReg.parseMessage(Unpooled.copiedBuffer(new byte[] { (byte) 0, (byte) 0 }), null); fail("Exception should have occured."); @@ -110,7 +119,8 @@ public class AbstractMessageRegistryTest { @Test public void testMessageParser() throws Exception { - final MessageRegistry msgReg = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getMessageRegistry(); + final MessageRegistry msgReg = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance() + .getMessageRegistry(); String ex = ""; try { msgReg.serializeMessage(null, Unpooled.EMPTY_BUFFER); diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtilTest.java index c08a4b8e27..be21d50ff0 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtilTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtilTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi; import java.util.Optional; @@ -22,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type public class MultiPathSupportUtilTest { - private static final BgpTableType AFI_SAFI = new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); + private static final BgpTableType AFI_SAFI = new BgpTableTypeImpl(Ipv4AddressFamily.class, + UnicastSubsequentAddressFamily.class); @Mock private PeerSpecificParserConstraint constraints; @@ -60,9 +60,8 @@ public class MultiPathSupportUtilTest { Assert.assertFalse(MultiPathSupportUtil.isTableTypeSupported(null, AFI_SAFI)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void testIsTableTypeSupportedNPE() { MultiPathSupportUtil.isTableTypeSupported(null, null); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java index 46da1909ba..c6563ebd68 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi; import static org.opendaylight.protocol.bgp.parser.spi.PathIdUtil.NON_PATH_ID; @@ -60,22 +59,22 @@ public class PathIdUtilTest { @Test public void testExtractPathId() { - final NodeIdentifier NII = new NodeIdentifier(QName.create("urn:opendaylight:params:xml:ns:yang:bgp-inet", "2015-03-05", "path-id").intern()); + final NodeIdentifier NII = new NodeIdentifier(QName.create("urn:opendaylight:params:xml:ns:yang:bgp-inet", + "2015-03-05", "path-id").intern()); final long pathIdValue = 0; - final ContainerNode cont = ImmutableContainerNodeSchemaAwareBuilder.create().withNodeIdentifier(NII). - addChild(new ImmutableLeafNodeBuilder<>().withNodeIdentifier(NII).withValue(pathIdValue).build()).build(); + final ContainerNode cont = ImmutableContainerNodeSchemaAwareBuilder.create().withNodeIdentifier(NII).addChild( + new ImmutableLeafNodeBuilder<>().withNodeIdentifier(NII).withValue(pathIdValue).build()).build(); Assert.assertEquals(pathIdValue, PathIdUtil.extractPathId(cont, NII).longValue()); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testReadPathIdBufferNull() { PathIdUtil.readPathId(null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testReadPathIdBufferEmpty() { PathIdUtil.readPathId(this.buffer); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/UtilsTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/UtilsTest.java index 4d8fdcd1a2..d2ac332cb2 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/UtilsTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/UtilsTest.java @@ -57,9 +57,10 @@ public class UtilsTest { @Test public void testMessageUtil() { final byte[] result = new byte[] { UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, - UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, - UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, - UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, 0, 23, 3, 32, 5, 14, 21 }; + UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, + UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, + UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, UnsignedBytes.MAX_VALUE, + UnsignedBytes.MAX_VALUE, 0, 23, 3, 32, 5, 14, 21 }; final ByteBuf formattedMessage = Unpooled.buffer(); MessageUtil.formatMessage(3, Unpooled.wrappedBuffer(new byte[] { 32, 5, 14, 21 }), formattedMessage); assertArrayEquals(result, ByteArray.getAllBytes(formattedMessage)); @@ -98,12 +99,14 @@ public class UtilsTest { public void testMultiprotocolCapabilitiesUtil() throws BGPParsingException { final byte[] bytes = new byte[] {0, 1, 0, 1}; final ByteBuf bytesBuf = Unpooled.copiedBuffer(bytes); - final BgpTableType parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, this.safiReg).get(); + final BgpTableType parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, + this.safiReg).get(); assertEquals(Ipv4AddressFamily.class, parsedAfiSafi.getAfi()); assertEquals(UnicastSubsequentAddressFamily.class, parsedAfiSafi.getSafi()); final ByteBuf serializedAfiSafi = Unpooled.buffer(4); - MultiprotocolCapabilitiesUtil.serializeMPAfiSafi(this.afiReg, this.safiReg, Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, serializedAfiSafi); + MultiprotocolCapabilitiesUtil.serializeMPAfiSafi(this.afiReg, this.safiReg, Ipv4AddressFamily.class, + UnicastSubsequentAddressFamily.class, serializedAfiSafi); assertArrayEquals(bytes, serializedAfiSafi.array()); } @@ -111,7 +114,8 @@ public class UtilsTest { public void testUnsupportedAfi() { final byte[] bytes = new byte[] {0, 2, 0, 1}; final ByteBuf bytesBuf = Unpooled.copiedBuffer(bytes); - final Optional parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, this.safiReg); + final Optional parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, + this.safiReg); Assert.assertFalse(parsedAfiSafi.isPresent()); } @@ -119,11 +123,12 @@ public class UtilsTest { public void testUnsupportedSafi() { final byte[] bytes = new byte[] {0, 1, 0, 3}; final ByteBuf bytesBuf = Unpooled.copiedBuffer(bytes); - final Optional parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, this.safiReg); + final Optional parsedAfiSafi = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(bytesBuf, this.afiReg, + this.safiReg); Assert.assertFalse(parsedAfiSafi.isPresent()); } - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testAttributeUtilPrivateConstructor() throws Throwable { final Constructor c = AttributeUtil.class.getDeclaredConstructor(); c.setAccessible(true); @@ -134,7 +139,7 @@ public class UtilsTest { } } - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testCapabilityUtilPrivateConstructor() throws Throwable { final Constructor c = CapabilityUtil.class.getDeclaredConstructor(); c.setAccessible(true); @@ -145,7 +150,7 @@ public class UtilsTest { } } - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testMessageUtilPrivateConstructor() throws Throwable { final Constructor c = MessageUtil.class.getDeclaredConstructor(); c.setAccessible(true); @@ -156,7 +161,7 @@ public class UtilsTest { } } - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testParameterUtilPrivateConstructor() throws Throwable { final Constructor c = ParameterUtil.class.getDeclaredConstructor(); c.setAccessible(true); diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractIpv4ExtendedCommunityTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractIpv4ExtendedCommunityTest.java index 43ce1efee4..f760629cd6 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractIpv4ExtendedCommunityTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractIpv4ExtendedCommunityTest.java @@ -5,14 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; import org.junit.Assert; import org.junit.Test; -import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; -import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity; public class AbstractIpv4ExtendedCommunityTest { @@ -21,19 +18,21 @@ public class AbstractIpv4ExtendedCommunityTest { public void testGetType() { final AbstractIpv4ExtendedCommunity abstractIpv4ExtendedCommunity = new AbstractIpv4ExtendedCommunity() { @Override - public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, final ByteBuf byteAggregator) { + public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, + final ByteBuf byteAggregator) { } + @Override public int getSubType() { return 0; } + @Override - public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { + public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) { return null; } }; Assert.assertEquals(1, abstractIpv4ExtendedCommunity.getType(true)); Assert.assertEquals(65, abstractIpv4ExtendedCommunity.getType(false)); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractOpaqueExtendedCommunityTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractOpaqueExtendedCommunityTest.java index c86c32e184..99df5bcdcc 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractOpaqueExtendedCommunityTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractOpaqueExtendedCommunityTest.java @@ -5,14 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; import org.junit.Assert; import org.junit.Test; -import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; -import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity; public class AbstractOpaqueExtendedCommunityTest { @@ -20,22 +17,22 @@ public class AbstractOpaqueExtendedCommunityTest { @Test public void testGetType() { final AbstractOpaqueExtendedCommunity abstractOpaqueExtendedCommunity = new AbstractOpaqueExtendedCommunity() { - @Override - public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, final ByteBuf byteAggregator) { + public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, + final ByteBuf byteAggregator) { } + @Override public int getSubType() { return 0; } @Override - public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { + public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) { return null; } }; Assert.assertEquals(3, abstractOpaqueExtendedCommunity.getType(true)); Assert.assertEquals(67, abstractOpaqueExtendedCommunity.getType(false)); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunityTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunityTest.java index 4468c7de85..b1da444192 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunityTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/AbstractTwoOctetAsExtendedCommunityTest.java @@ -10,24 +10,25 @@ package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; import org.junit.Assert; import org.junit.Test; -import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; -import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity; public class AbstractTwoOctetAsExtendedCommunityTest { - @Test public void testGetType() { - final AbstractTwoOctetAsExtendedCommunity abstractTwoOctetAsExtendedCommunity = new AbstractTwoOctetAsExtendedCommunity() { + final AbstractTwoOctetAsExtendedCommunity abstractTwoOctetAsExtendedCommunity = + new AbstractTwoOctetAsExtendedCommunity() { @Override - public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, final ByteBuf byteAggregator) { + public void serializeExtendedCommunity(final ExtendedCommunity extendedCommunity, + final ByteBuf byteAggregator) { } + @Override public int getSubType() { return 0; } + @Override - public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { + public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) { return null; } }; diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtilTest.java index 1620c2d2be..4a116f4f58 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtilTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/ExtendedCommunityUtilTest.java @@ -17,7 +17,7 @@ import org.junit.Test; public class ExtendedCommunityUtilTest { - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testPrivateConstructor() throws Throwable { final Constructor c = ExtendedCommunityUtil.class.getDeclaredConstructor(); c.setAccessible(true); diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java index eb61ed842b..bc0edb6d09 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java @@ -1,11 +1,10 @@ /* - * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.extended.community; import io.netty.buffer.ByteBuf; @@ -18,13 +17,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type public class Inet4SpecificExtendedCommunityCommonUtilTest { private static final byte[] INPUT = { - 12, 51, 2, 5, 21, 45 + 12, 51, 2, 5, 21, 45 }; @Test public void testHandle() { - final Inet4SpecificExtendedCommunityCommon expected - = new Inet4SpecificExtendedCommunityCommonBuilder() + final Inet4SpecificExtendedCommunityCommon expected = new Inet4SpecificExtendedCommunityCommonBuilder() .setGlobalAdministrator(new Ipv4Address("12.51.2.5")) .setLocalAdministrator(new byte[]{21, 45}).build(); @@ -36,5 +34,4 @@ public class Inet4SpecificExtendedCommunityCommonUtilTest { Inet4SpecificExtendedCommunityCommonUtil.serializeCommon(expected, output); Assert.assertArrayEquals(INPUT, output.array()); } - -} \ No newline at end of file +} diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java index fe3ac1e049..fc0f661d9a 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java @@ -129,10 +129,12 @@ public class BgpTestActivator extends AbstractBGPExtensionProviderActivator { this.nextHopParserSerializer = new NextHopParserSerializer() { @Override public CNextHop parseNextHop(final ByteBuf buffer) throws BGPParsingException { - return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("127.0.0.1")).build()).build(); + return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder() + .setGlobal(new Ipv4Address("127.0.0.1")).build()).build(); } + @Override - public void serializeNextHop(final CNextHop cNextHop, final ByteBuf byteAggregator) { + public void serializeNextHop(final CNextHop cnextHop, final ByteBuf byteAggregator) { final byte[] mpReachBytes = { 0x7f, 0x00, 0x00, 0x01 }; @@ -163,33 +165,38 @@ public class BgpTestActivator extends AbstractBGPExtensionProviderActivator { doReturn(null).when(this.paramParser).parseParameter(any(ByteBuf.class)); doReturn(EMPTY).when(this.paramParser).toString(); - Mockito.doNothing().when(this.paramSerializer).serializeParameter(any(BgpParameters.class), any(ByteBuf.class)); + Mockito.doNothing().when(this.paramSerializer).serializeParameter(any(BgpParameters.class), + any(ByteBuf.class)); doReturn(EMPTY).when(this.paramSerializer).toString(); doReturn(null).when(this.capaParser).parseCapability(any(ByteBuf.class)); doReturn(EMPTY).when(this.capaParser).toString(); - Mockito.doNothing().when(this.capaSerializer).serializeCapability(any(CParameters.class), any(ByteBuf.class)); + Mockito.doNothing().when(this.capaSerializer).serializeCapability(any(CParameters.class), + any(ByteBuf.class)); doReturn(EMPTY).when(this.capaSerializer).toString(); doReturn(null).when(this.sidTlvParser).parseBgpPrefixSidTlv(any(ByteBuf.class)); doReturn(EMPTY).when(this.sidTlvParser).toString(); - Mockito.doNothing().when(this.sidTlvSerializer).serializeBgpPrefixSidTlv(any(BgpPrefixSidTlv.class), any(ByteBuf.class)); + Mockito.doNothing().when(this.sidTlvSerializer).serializeBgpPrefixSidTlv(any(BgpPrefixSidTlv.class), + any(ByteBuf.class)); doReturn(EMPTY).when(this.sidTlvSerializer).toString(); doReturn(0).when(this.sidTlvSerializer).getType(); - doReturn(mock(Notification.class)).when(this.msgParser).parseMessageBody(any(ByteBuf.class), Mockito.anyInt(), - any(PeerSpecificParserConstraint.class)); + doReturn(mock(Notification.class)).when(this.msgParser).parseMessageBody(any(ByteBuf.class), + Mockito.anyInt(), any(PeerSpecificParserConstraint.class)); doReturn(EMPTY).when(this.msgParser).toString(); - Mockito.doNothing().when(this.msgSerializer).serializeMessage(any(Notification.class), any(ByteBuf.class)); + Mockito.doNothing().when(this.msgSerializer).serializeMessage(any(Notification.class), + any(ByteBuf.class)); doReturn(EMPTY).when(this.msgSerializer).toString(); - Mockito.doNothing().when(this.nlriParser).parseNlri(any(ByteBuf.class), any(MpUnreachNlriBuilder.class), any()); - Mockito.doNothing().when(this.nlriParser).parseNlri(any(ByteBuf.class), any(MpReachNlriBuilder.class), any()); + Mockito.doNothing().when(this.nlriParser).parseNlri(any(ByteBuf.class), any(MpUnreachNlriBuilder.class), + any()); + Mockito.doNothing().when(this.nlriParser).parseNlri(any(ByteBuf.class), any(MpReachNlriBuilder.class), + any()); doReturn(EMPTY).when(this.nlriParser).toString(); } catch (BGPDocumentedException | BGPParsingException | BGPTreatAsWithdrawException e) { Assert.fail(); } } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImplTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImplTest.java index 0abaf61c76..b6bfefb0f9 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImplTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImplTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import com.google.common.collect.Lists; @@ -25,7 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type public class MultiPathSupportImplTest { - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void testcreateParserMultiPathSupportNull() { MultiPathSupportImpl.createParserMultiPathSupport(null); } @@ -33,10 +32,14 @@ public class MultiPathSupportImplTest { @Test public void testIsTableTypeSupported() { final List supportedTables = Lists.newArrayList(); - final BgpTableType ipv4Unicast = new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); - final BgpTableType ipv4L3vpn = new BgpTableTypeImpl(Ipv4AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class); - final BgpTableType ipv6Unicast = new BgpTableTypeImpl(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class); - final BgpTableType ipv6L3vpn = new BgpTableTypeImpl(Ipv6AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class); + final BgpTableType ipv4Unicast = new BgpTableTypeImpl(Ipv4AddressFamily.class, + UnicastSubsequentAddressFamily.class); + final BgpTableType ipv4L3vpn = new BgpTableTypeImpl(Ipv4AddressFamily.class, + MplsLabeledVpnSubsequentAddressFamily.class); + final BgpTableType ipv6Unicast = new BgpTableTypeImpl(Ipv6AddressFamily.class, + UnicastSubsequentAddressFamily.class); + final BgpTableType ipv6L3vpn = new BgpTableTypeImpl(Ipv6AddressFamily.class, + MplsLabeledVpnSubsequentAddressFamily.class); supportedTables.add(createAddPathCapability(ipv4Unicast, SendReceive.Send)); supportedTables.add(createAddPathCapability(ipv4L3vpn, SendReceive.Receive)); supportedTables.add(createAddPathCapability(ipv6Unicast, SendReceive.Both)); @@ -49,7 +52,8 @@ public class MultiPathSupportImplTest { } private static AddressFamilies createAddPathCapability(final BgpTableType afisafi, final SendReceive mode) { - return new AddressFamiliesBuilder().setAfi(afisafi.getAfi()).setSafi(afisafi.getSafi()).setSendReceive(mode).build(); + return new AddressFamiliesBuilder().setAfi(afisafi.getAfi()).setSafi(afisafi.getSafi()).setSendReceive(mode) + .build(); } } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImplTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImplTest.java index 5e80029363..0aebc0d9e5 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImplTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImplTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import java.util.Collections; @@ -18,7 +17,8 @@ import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraintProv public class PeerSpecificParserConstraintImplTest { - private static final MultiPathSupport ADD_PATH_CONSTRAINT = MultiPathSupportImpl.createParserMultiPathSupport(Collections.emptyList()); + private static final MultiPathSupport ADD_PATH_CONSTRAINT = MultiPathSupportImpl.createParserMultiPathSupport( + Collections.emptyList()); private PeerSpecificParserConstraintProvider constraints; @@ -38,7 +38,7 @@ public class PeerSpecificParserConstraintImplTest { Assert.assertFalse(this.constraints.addPeerConstraint(MultiPathSupport.class, ADD_PATH_CONSTRAINT)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void testProviderNullInput() { this.constraints.addPeerConstraint(MultiPathSupport.class, null); } @@ -55,5 +55,4 @@ public class PeerSpecificParserConstraintImplTest { final Optional peerConstraint = this.constraints.getPeerConstraint(MultiPathSupport.class); Assert.assertFalse(peerConstraint.isPresent()); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContextTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContextTest.java index 4ea811285c..e6a1a6c211 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContextTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContextTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import java.lang.reflect.Constructor; @@ -14,9 +13,10 @@ import org.junit.Test; public class ServiceLoaderBGPExtensionProviderContextTest { - @Test(expected=UnsupportedOperationException.class) + @Test(expected = UnsupportedOperationException.class) public void testPrivateConstructor() throws Throwable { - final Constructor c = ServiceLoaderBGPExtensionProviderContext.class.getDeclaredConstructor(); + final Constructor c = ServiceLoaderBGPExtensionProviderContext.class + .getDeclaredConstructor(); c.setAccessible(true); try { c.newInstance(); diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java index 04a90a15fd..2653c7739d 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java @@ -5,12 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -90,14 +89,13 @@ public class SimpleExtendedCommunityRegistryTest { verify(this.parser, never()).parseExtendedCommunity(any(ByteBuf.class)); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testRegisterParserOutOfRangeType() { this.register.registerExtendedCommunityParser(1234, 0, this.parser); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testRegisterParserOutOfRangeSubType() { this.register.registerExtendedCommunityParser(0, 1234, this.parser); } - } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java index 7289e6717a..bfbb5ff218 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import static org.junit.Assert.assertArrayEquals; @@ -61,9 +60,9 @@ public class SimpleRegistryTest { private static final PeerSpecificParserConstraint CONSTRAINT; static { - PeerSpecificParserConstraintImpl c = new PeerSpecificParserConstraintImpl(); - c.addPeerConstraint(MultiPathSupport.class, ADD_PATH_SUPPORT); - CONSTRAINT = c; + PeerSpecificParserConstraintImpl peerConstraint = new PeerSpecificParserConstraintImpl(); + peerConstraint.addPeerConstraint(MultiPathSupport.class, ADD_PATH_SUPPORT); + CONSTRAINT = peerConstraint; } protected BGPExtensionProviderContext ctx; @@ -107,7 +106,8 @@ public class SimpleRegistryTest { paramReg.serializeParameter(param, buffer); paramReg.parseParameter(0, Unpooled.wrappedBuffer(paramBytes)); verify(this.activator.paramParser, times(1)).parseParameter(any(ByteBuf.class)); - verify(this.activator.paramSerializer, times(1)).serializeParameter(any(BgpParameters.class), any(ByteBuf.class)); + verify(this.activator.paramSerializer, times(1)).serializeParameter(any(BgpParameters.class), + any(ByteBuf.class)); } @Test @@ -132,7 +132,8 @@ public class SimpleRegistryTest { final ByteBuf buffer = Unpooled.buffer(tlvBytes.length); sidTlvReg.serializeBgpPrefixSidTlv(tlv, buffer); - verify(this.activator.sidTlvSerializer, times(1)).serializeBgpPrefixSidTlv(any(BgpPrefixSidTlv.class), any(ByteBuf.class)); + verify(this.activator.sidTlvSerializer, times(1)).serializeBgpPrefixSidTlv(any(BgpPrefixSidTlv.class), + any(ByteBuf.class)); sidTlvReg.parseBgpPrefixSidTlv(BgpTestActivator.TYPE, Unpooled.wrappedBuffer(tlvBytes)); verify(this.activator.sidTlvParser, times(1)).parseBgpPrefixSidTlv(any(ByteBuf.class)); @@ -183,7 +184,8 @@ public class SimpleRegistryTest { final MpReachNlri mpReach = new MpReachNlriBuilder() .setAfi(Ipv4AddressFamily.class) .setSafi(UnicastSubsequentAddressFamily.class) - .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("127.0.0.1")).build()).build()) + .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal( + new Ipv4Address("127.0.0.1")).build()).build()) .build(); final ByteBuf buffer = Unpooled.buffer(mpReachBytes.length); nlriReg.serializeMpReach(mpReach, buffer); @@ -230,11 +232,13 @@ public class SimpleRegistryTest { final byte[] mpUnreachBytes = { 0x00, 0x01, 0x01 }; - final MpUnreachNlri mpUnreach = new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).build(); + final MpUnreachNlri mpUnreach = new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class) + .setSafi(UnicastSubsequentAddressFamily.class).build(); final ByteBuf buffer = Unpooled.buffer(mpUnreachBytes.length); nlriReg.serializeMpUnReach(mpUnreach, buffer); assertArrayEquals(mpUnreachBytes, buffer.array()); assertEquals(mpUnreach, nlriReg.parseMpUnreach(Unpooled.wrappedBuffer(mpUnreachBytes), CONSTRAINT)); - verify(this.activator.nlriParser, never()).parseNlri(any(ByteBuf.class), any(MpUnreachNlriBuilder.class), any()); + verify(this.activator.nlriParser, never()).parseNlri(any(ByteBuf.class), any(MpUnreachNlriBuilder.class), + any()); } } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java index 9ddc94b7ef..f72cf3bae9 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.parser.spi.pojo; import static org.junit.Assert.assertArrayEquals; @@ -30,7 +29,7 @@ public class UnrecognizedAttributesTest { private static final short NON_EXISTENT_TYPE = 0; private static final int NON_VALUE_BYTES = 3; - private static final SimpleAttributeRegistry simpleAttrReg = new SimpleAttributeRegistry(); + private static final SimpleAttributeRegistry SIMPLE_ATTR_REG = new SimpleAttributeRegistry(); @Rule public ExpectedException expException = ExpectedException.none(); @@ -39,15 +38,15 @@ public class UnrecognizedAttributesTest { public void testUnrecognizedAttributesWithoutOptionalFlag() throws BGPDocumentedException, BGPParsingException { this.expException.expect(BGPDocumentedException.class); this.expException.expectMessage("Well known attribute not recognized."); - simpleAttrReg.parseAttributes( + SIMPLE_ATTR_REG.parseAttributes( Unpooled.wrappedBuffer(new byte[] { 0x03, 0x00, 0x05, 0x01, 0x02, 0x03, 0x04, 0x05 }), null); } @Test public void testUnrecognizedAttributes() throws BGPDocumentedException, BGPParsingException { final byte[] attributeBytes = { (byte)0xe0, 0x00, 0x05, 0x01, 0x02, 0x03, 0x04, 0x05 }; - final List unrecogAttribs = simpleAttrReg - .parseAttributes(Unpooled.wrappedBuffer(attributeBytes), null).getAttributes().getUnrecognizedAttributes(); + final List unrecogAttribs = SIMPLE_ATTR_REG.parseAttributes( + Unpooled.wrappedBuffer(attributeBytes), null).getAttributes().getUnrecognizedAttributes(); assertEquals(UNRECOGNIZED_ATTRIBUTE_COUNT, unrecogAttribs.size()); final UnrecognizedAttributes unrecogAttrib = unrecogAttribs.get(FIRST_ATTRIBUTE); final UnrecognizedAttributesKey expectedAttribKey = -- 2.36.6