From 184a3d4c059463ce2e2ac64c70379a6fb4f6a637 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Fri, 25 May 2018 09:16:54 +0200 Subject: [PATCH] Code clean up - check style - Qname generation - functional style - java language migration - mvn duplication Change-Id: I0c7757c8cadead5e988cde6d3fa0e607c4cad72c Signed-off-by: Claudio D. Gasparini --- .../flowspec/AbstractFlowspecNlriParser.java | 163 +++++++++--------- .../ipv4/FlowspecIpv4NlriParserHelper.java | 36 ++-- .../ipv6/FlowspecIpv6NlriParserHelper.java | 54 +++--- .../bgp/inet/codec/Ipv4NlriParserTest.java | 15 +- .../labeled/unicast/BgpPrefixSidTlvsTest.java | 10 +- .../impl/nlri/LinkstateNlriParser.java | 97 ++++++----- .../linkstate/impl/nlri/NodeNlriParser.java | 65 +++---- .../impl/tlvs/OspfRouteTlvParser.java | 16 +- .../spi/registry/ConditionsRegistryImpl.java | 2 +- .../protocol/bgp/state/NeighborUtil.java | 9 +- .../bgp/state/StateProviderImplTest.java | 6 +- .../protocol/bgp/parser/APITest.java | 3 +- .../protocol/bgp/parser/TableTypeTest.java | 4 +- .../open/MultiProtocolCapabilityHandler.java | 17 +- .../bgp/parser/impl/BGPParserTest.java | 4 +- .../bgp/parser/impl/ComplementaryTest.java | 3 +- .../bgp/mode/impl/base/BaseBestPathTest.java | 2 +- .../bgp/rib/impl/ApplicationPeer.java | 4 +- .../protocol/bgp/rib/impl/BGPPeer.java | 2 +- .../bgp/rib/impl/BGPPeerTrackerImpl.java | 2 +- .../protocol/bgp/rib/impl/config/BgpPeer.java | 2 +- .../protocol/bgp/rib/impl/config/RibImpl.java | 2 +- .../bgp/rib/impl/AbstractAddPathTest.java | 2 +- .../bgp/rib/impl/AbstractRIBTestSetup.java | 2 +- .../bgp/rib/impl/ParserToSalTest.java | 5 +- .../bgp/rib/impl/RouteUpdateKeyTest.java | 10 +- .../bgp/rib/impl/SimpleSessionListener.java | 2 +- .../bgp/rib/impl/config/AbstractConfig.java | 2 +- .../protocol/bgp/rib/spi/RIBSupportTest.java | 2 +- .../protocol/bgp/rib/spi/RouterIdsTest.java | 4 +- .../provider/AbstractTopologyBuilder.java | 2 +- .../bgp/topology/provider/ProtocolUtil.java | 5 +- .../LinkstateTopologyBuilderTest.java | 4 +- .../protocol/bmp/impl/BmpDispatcherImpl.java | 2 +- .../protocol/bmp/mock/BmpMockDispatcher.java | 4 +- .../bmp/mock/BmpMockSessionListener.java | 2 +- .../AbstractBmpMessageWithTlvParserTest.java | 2 +- .../protocol/concepts/ASNumberTest.java | 4 +- features/bgp/odl-bgpcep-bgp/pom.xml | 6 - .../RROIpv4PrefixSubobjectParser.java | 2 +- .../protocol/pcep/impl/PCEPSessionImpl.java | 2 +- .../pcep/impl/SimpleSessionListener.java | 2 +- .../pcep/pcc/mock/TestingSessionListener.java | 3 +- .../protocol/pcep/spi/APITest.java | 2 +- .../protocol/pcep/spi/RegistryTest.java | 4 +- .../pcep/testtool/SimpleSessionListener.java | 2 +- .../AbstractTopologySessionListener.java | 2 +- .../topology/provider/OperationResults.java | 4 +- .../Stateful07TopologySessionListener.java | 6 +- .../impl/ProgrammingServiceImplTest.java | 2 +- .../protocol/util/InetSocketAddressUtil.java | 5 +- .../protocol/util/CheckUtilTest.java | 6 +- .../protocol/util/ByteArrayTest.java | 5 +- 53 files changed, 317 insertions(+), 308 deletions(-) diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java index 5293646ff7..e3f84b7a50 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java @@ -106,8 +106,10 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri static final NodeIdentifier FLOWSPEC_NID = new NodeIdentifier(Flowspec.QNAME); @VisibleForTesting static final NodeIdentifier FLOWSPEC_TYPE_NID = new NodeIdentifier(FlowspecType.QNAME); - public static final NodeIdentifier DEST_PREFIX_NID = new NodeIdentifier(QName.create(DestinationPrefixCase.QNAME, "destination-prefix").intern()); - public static final NodeIdentifier SOURCE_PREFIX_NID = new NodeIdentifier(QName.create(SourcePrefixCase.QNAME, "source-prefix").intern()); + public static final NodeIdentifier DEST_PREFIX_NID + = new NodeIdentifier(QName.create(DestinationPrefixCase.QNAME, "destination-prefix").intern()); + public static final NodeIdentifier SOURCE_PREFIX_NID + = new NodeIdentifier(QName.create(SourcePrefixCase.QNAME, "source-prefix").intern()); @VisibleForTesting static final NodeIdentifier PORTS_NID = new NodeIdentifier(Ports.QNAME); @VisibleForTesting @@ -127,11 +129,13 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri @VisibleForTesting static final NodeIdentifier FRAGMENT_NID = new NodeIdentifier(Fragments.QNAME); @VisibleForTesting - public static final NodeIdentifier OP_NID = new NodeIdentifier(QName.create(Flowspec.QNAME.getNamespace(), Flowspec.QNAME.getRevision(), "op")); + public static final NodeIdentifier OP_NID + = new NodeIdentifier(QName.create(Flowspec.QNAME.getModule(), "op")); @VisibleForTesting - public static final NodeIdentifier VALUE_NID = new NodeIdentifier(QName.create(Flowspec.QNAME.getNamespace(), Flowspec.QNAME.getRevision(), "value")); + public static final NodeIdentifier VALUE_NID + = new NodeIdentifier(QName.create(Flowspec.QNAME.getModule(), "value")); - protected SimpleFlowspecTypeRegistry flowspecTypeRegistry; + protected final SimpleFlowspecTypeRegistry flowspecTypeRegistry; /** * Add this constant to length value to achieve all ones in the leftmost nibble. @@ -170,7 +174,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri * @param pathId associated path id with given NLRI * @return created destination type */ - public abstract DestinationType createWithdrawnDestinationType(@Nonnull final Object[] nlriFields, @Nullable final PathId pathId); + public abstract DestinationType createWithdrawnDestinationType(@Nonnull Object[] nlriFields, + @Nullable PathId pathId); /** * Create advertized destination type @@ -179,11 +184,12 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri * @param pathId associated path id with given NLRI * @return created destination type */ - public abstract DestinationType createAdvertizedRoutesDestinationType(@Nonnull final Object[] nlriFields, @Nullable final PathId pathId); + public abstract DestinationType createAdvertizedRoutesDestinationType(@Nonnull Object[] nlriFields, @Nullable PathId pathId); @Override public final void serializeAttribute(final DataObject attribute, final ByteBuf byteAggregator) { - Preconditions.checkArgument(attribute instanceof Attributes, "Attribute parameter is not a PathAttribute object."); + Preconditions.checkArgument(attribute instanceof Attributes, + "Attribute parameter is not a PathAttribute object."); final Attributes pathAttributes = (Attributes) attribute; final Attributes1 pathAttributes1 = pathAttributes.getAugmentation(Attributes1.class); final Attributes2 pathAttributes2 = pathAttributes.getAugmentation(Attributes2.class); @@ -223,13 +229,15 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri * @param pathId * @param buffer where flowspec NLRI will be serialized */ - protected final void serializeNlri(@Nonnull final Object[] nlriFields, @Nullable final PathId pathId, @Nonnull final ByteBuf buffer) { + protected final void serializeNlri(@Nonnull final Object[] nlriFields, @Nullable final PathId pathId, + @Nonnull final ByteBuf buffer) { final ByteBuf nlriByteBuf = Unpooled.buffer(); PathIdUtil.writePathId(pathId, buffer); serializeNlri(nlriFields, nlriByteBuf); - Preconditions.checkState(nlriByteBuf.readableBytes() <= MAX_NLRI_LENGTH, "Maximum length of Flowspec NLRI reached."); + Preconditions.checkState(nlriByteBuf.readableBytes() <= MAX_NLRI_LENGTH, + "Maximum length of Flowspec NLRI reached."); if (nlriByteBuf.readableBytes() <= MAX_NLRI_LENGTH_ONE_BYTE) { buffer.writeByte(nlriByteBuf.readableBytes()); } else { @@ -262,23 +270,35 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri private void processFlowspecType(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { if (fsType.getChild(PORTS_NID).isPresent()) { - fsBuilder.setFlowspecType(new PortCaseBuilder().setPorts(createPorts((UnkeyedListNode) fsType.getChild(PORTS_NID).get())).build()); + fsBuilder.setFlowspecType(new PortCaseBuilder() + .setPorts(createPorts((UnkeyedListNode) fsType.getChild(PORTS_NID).get())).build()); } else if (fsType.getChild(DEST_PORT_NID).isPresent()) { - fsBuilder.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(createDestinationPorts((UnkeyedListNode) fsType.getChild(DEST_PORT_NID).get())).build()); + fsBuilder.setFlowspecType(new DestinationPortCaseBuilder() + .setDestinationPorts(createDestinationPorts((UnkeyedListNode) fsType.getChild(DEST_PORT_NID).get())) + .build()); } else if (fsType.getChild(SOURCE_PORT_NID).isPresent()) { - fsBuilder.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(createSourcePorts((UnkeyedListNode) fsType.getChild(SOURCE_PORT_NID).get())).build()); + fsBuilder.setFlowspecType(new SourcePortCaseBuilder() + .setSourcePorts(createSourcePorts((UnkeyedListNode) fsType.getChild(SOURCE_PORT_NID).get())) + .build()); } else if (fsType.getChild(ICMP_TYPE_NID).isPresent()) { - fsBuilder.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(createTypes((UnkeyedListNode) fsType.getChild(ICMP_TYPE_NID).get())).build()); + fsBuilder.setFlowspecType(new IcmpTypeCaseBuilder() + .setTypes(createTypes((UnkeyedListNode) fsType.getChild(ICMP_TYPE_NID).get())).build()); } else if (fsType.getChild(ICMP_CODE_NID).isPresent()) { - fsBuilder.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(createCodes((UnkeyedListNode) fsType.getChild(ICMP_CODE_NID).get())).build()); + fsBuilder.setFlowspecType(new IcmpCodeCaseBuilder() + .setCodes(createCodes((UnkeyedListNode) fsType.getChild(ICMP_CODE_NID).get())).build()); } else if (fsType.getChild(TCP_FLAGS_NID).isPresent()) { - fsBuilder.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(createTcpFlags((UnkeyedListNode) fsType.getChild(TCP_FLAGS_NID).get())).build()); + fsBuilder.setFlowspecType(new TcpFlagsCaseBuilder() + .setTcpFlags(createTcpFlags((UnkeyedListNode) fsType.getChild(TCP_FLAGS_NID).get())).build()); } else if (fsType.getChild(PACKET_LENGTHS_NID).isPresent()) { - fsBuilder.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(createPacketLengths((UnkeyedListNode) fsType.getChild(PACKET_LENGTHS_NID).get())).build()); + fsBuilder.setFlowspecType(new PacketLengthCaseBuilder() + .setPacketLengths(createPacketLengths((UnkeyedListNode) fsType.getChild(PACKET_LENGTHS_NID).get())) + .build()); } else if (fsType.getChild(DSCP_NID).isPresent()) { - fsBuilder.setFlowspecType(new DscpCaseBuilder().setDscps(createDscpsLengths((UnkeyedListNode) fsType.getChild(DSCP_NID).get())).build()); + fsBuilder.setFlowspecType(new DscpCaseBuilder() + .setDscps(createDscpsLengths((UnkeyedListNode) fsType.getChild(DSCP_NID).get())).build()); } else if (fsType.getChild(FRAGMENT_NID).isPresent()) { - fsBuilder.setFlowspecType(new FragmentCaseBuilder().setFragments(createFragments((UnkeyedListNode) fsType.getChild(FRAGMENT_NID).get())).build()); + fsBuilder.setFlowspecType(new FragmentCaseBuilder() + .setFragments(createFragments((UnkeyedListNode) fsType.getChild(FRAGMENT_NID).get())).build()); } else { extractSpecificFlowspec(fsType, fsBuilder); } @@ -290,13 +310,10 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : portsData.getValue()) { final PortsBuilder portsBuilder = new PortsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - portsBuilder.setOp(NumericTwoByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> portsBuilder + .setOp(NumericTwoByteOperandParser.INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - portsBuilder.setValue((Integer) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild -> portsBuilder.setValue((Integer) dataContainerChild.getValue())); ports.add(portsBuilder.build()); } @@ -309,13 +326,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : destinationPortsData.getValue()) { final DestinationPortsBuilder destPortsBuilder = new DestinationPortsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - destPortsBuilder.setOp(NumericTwoByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> destPortsBuilder.setOp(NumericTwoByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - destPortsBuilder.setValue((Integer) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild + -> destPortsBuilder.setValue((Integer) dataContainerChild.getValue())); destinationPorts.add(destPortsBuilder.build()); } @@ -328,13 +343,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : sourcePortsData.getValue()) { final SourcePortsBuilder sourcePortsBuilder = new SourcePortsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - sourcePortsBuilder.setOp(NumericTwoByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> sourcePortsBuilder.setOp(NumericTwoByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - sourcePortsBuilder.setValue((Integer) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild + -> sourcePortsBuilder.setValue((Integer) dataContainerChild.getValue())); sourcePorts.add(sourcePortsBuilder.build()); } @@ -347,13 +360,10 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : typesData.getValue()) { final TypesBuilder typesBuilder = new TypesBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - typesBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> typesBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - typesBuilder.setValue((Short) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild -> typesBuilder.setValue((Short) dataContainerChild.getValue())); types.add(typesBuilder.build()); } @@ -366,13 +376,10 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : codesData.getValue()) { final CodesBuilder codesBuilder = new CodesBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - codesBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> codesBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - codesBuilder.setValue((Short) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild -> codesBuilder.setValue((Short) dataContainerChild.getValue())); codes.add(codesBuilder.build()); } @@ -385,13 +392,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : tcpFlagsData.getValue()) { final TcpFlagsBuilder tcpFlagsBuilder = new TcpFlagsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - tcpFlagsBuilder.setOp(BitmaskOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> tcpFlagsBuilder + .setOp(BitmaskOperandParser.INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - tcpFlagsBuilder.setValue((Integer) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild + -> tcpFlagsBuilder.setValue((Integer) dataContainerChild.getValue())); tcpFlags.add(tcpFlagsBuilder.build()); } @@ -404,13 +409,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : packetLengthsData.getValue()) { final PacketLengthsBuilder packetLengthsBuilder = new PacketLengthsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - packetLengthsBuilder.setOp(NumericTwoByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> packetLengthsBuilder.setOp(NumericTwoByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - packetLengthsBuilder.setValue((Integer) valueNode.get().getValue()); - } + valueNode.ifPresent(dataContainerChild + -> packetLengthsBuilder.setValue((Integer) dataContainerChild.getValue())); packetLengths.add(packetLengthsBuilder.build()); } @@ -423,13 +426,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : dscpLengthsData.getValue()) { final DscpsBuilder dscpsLengthsBuilder = new DscpsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - dscpsLengthsBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> dscpsLengthsBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - dscpsLengthsBuilder.setValue(new Dscp((Short) valueNode.get().getValue())); - } + valueNode.ifPresent(dataContainerChild + -> dscpsLengthsBuilder.setValue(new Dscp((Short) dataContainerChild.getValue()))); dscpsLengths.add(dscpsLengthsBuilder.build()); } @@ -442,13 +443,11 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri for (final UnkeyedListEntryNode node : fragmentsData.getValue()) { final FragmentsBuilder fragmentsBuilder = new FragmentsBuilder(); final Optional> opValue = node.getChild(OP_NID); - if (opValue.isPresent()) { - fragmentsBuilder.setOp(BitmaskOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } + opValue.ifPresent(dataContainerChild -> fragmentsBuilder.setOp(BitmaskOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); final Optional> valueNode = node.getChild(VALUE_NID); - if (valueNode.isPresent()) { - fragmentsBuilder.setValue(createFragment((Set) valueNode.get().getValue())); - } + valueNode.ifPresent(dataContainerChild + -> fragmentsBuilder.setValue(createFragment((Set) dataContainerChild.getValue()))); fragments.add(fragmentsBuilder.build()); } @@ -456,7 +455,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } private static Fragment createFragment(final Set data) { - return new Fragment(data.contains(DO_NOT_VALUE), data.contains(FIRST_VALUE), data.contains(IS_A_VALUE), data.contains(LAST_VALUE)); + return new Fragment(data.contains(DO_NOT_VALUE), data.contains(FIRST_VALUE), data.contains(IS_A_VALUE), + data.contains(LAST_VALUE)); } protected final String stringNlri(final List flows) { @@ -475,7 +475,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri buffer.append(NumericTwoByteOperandParser.INSTANCE.toString(((PortCase) value).getPorts())); } else if (value instanceof DestinationPortCase) { buffer.append("where destination port "); - buffer.append(NumericTwoByteOperandParser.INSTANCE.toString(((DestinationPortCase) value).getDestinationPorts())); + buffer.append(NumericTwoByteOperandParser + .INSTANCE.toString(((DestinationPortCase) value).getDestinationPorts())); } else if (value instanceof SourcePortCase) { buffer.append("where source port "); buffer.append(NumericTwoByteOperandParser.INSTANCE.toString(((SourcePortCase) value).getSourcePorts())); @@ -565,7 +566,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri if (length >= MAX_NLRI_LENGTH_ONE_BYTE) { length = (length << Byte.SIZE | nlri.readUnsignedByte()) & MAX_NLRI_LENGTH; } - Preconditions.checkState(length > 0 && length <= nlri.readableBytes(), "Invalid flowspec NLRI length %s", length); + Preconditions.checkState(length > 0 && length <= nlri.readableBytes(), + "Invalid flowspec NLRI length %s", length); return length; } @@ -583,7 +585,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri while (nlri.isReadable()) { int nlriLength = readNlriLength(nlri); - Preconditions.checkState(nlriLength > 0 && nlriLength <= nlri.readableBytes(), "Invalid flowspec NLRI length %s", nlriLength); + Preconditions.checkState(nlriLength > 0 && nlriLength <= nlri.readableBytes(), + "Invalid flowspec NLRI length %s", nlriLength); LOG.trace("Flowspec NLRI length is {}", nlriLength); while (nlriLength > 0) { @@ -594,7 +597,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri final int flowspecTypeLength = readableLength - nlri.readableBytes(); nlriLength -= flowspecTypeLength; } - Preconditions.checkState(nlriLength == 0, "Remain NLRI length should be 0 instead of %s", nlriLength); + Preconditions.checkState(nlriLength == 0, + "Remain NLRI length should be 0 instead of %s", nlriLength); } return fss; @@ -612,7 +616,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } @Override - public final void parseNlri(@Nonnull final ByteBuf nlri, @Nonnull final MpReachNlriBuilder builder, @Nullable final PeerSpecificParserConstraint constraint) + public final void parseNlri(@Nonnull final ByteBuf nlri, @Nonnull final MpReachNlriBuilder builder, + @Nullable final PeerSpecificParserConstraint constraint) throws BGPParsingException { if (!nlri.isReadable()) { return; diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java index da2db9a998..4f6ccf0cc3 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java @@ -42,21 +42,16 @@ public final class FlowspecIpv4NlriParserHelper { public static void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { if (fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).isPresent()) { - fsBuilder.setFlowspecType( - new DestinationPrefixCaseBuilder() - .setDestinationPrefix( - new Ipv4Prefix((String) fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).get().getValue()) - ).build() - ); + fsBuilder.setFlowspecType(new DestinationPrefixCaseBuilder().setDestinationPrefix( + new Ipv4Prefix((String) fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).get() + .getValue())).build()); } else if (fsType.getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).isPresent()) { - fsBuilder.setFlowspecType( - new SourcePrefixCaseBuilder() - .setSourcePrefix( - new Ipv4Prefix((String) fsType.getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).get().getValue()) - ).build() - ); + fsBuilder.setFlowspecType(new SourcePrefixCaseBuilder().setSourcePrefix(new Ipv4Prefix((String) fsType + .getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).get().getValue())).build()); } else if (fsType.getChild(PROTOCOL_IP_NID).isPresent()) { - fsBuilder.setFlowspecType(new ProtocolIpCaseBuilder().setProtocolIps(createProtocolsIps((UnkeyedListNode) fsType.getChild(PROTOCOL_IP_NID).get())).build()); + fsBuilder.setFlowspecType(new ProtocolIpCaseBuilder() + .setProtocolIps(createProtocolsIps((UnkeyedListNode) fsType.getChild(PROTOCOL_IP_NID).get())) + .build()); } } @@ -78,14 +73,13 @@ public final class FlowspecIpv4NlriParserHelper { for (final UnkeyedListEntryNode node : protocolIpsData.getValue()) { final ProtocolIpsBuilder ipsBuilder = new ProtocolIpsBuilder(); - final Optional> opValue = node.getChild(AbstractFlowspecNlriParser.OP_NID); - if (opValue.isPresent()) { - ipsBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } - final Optional> valueNode = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); - if (valueNode.isPresent()) { - ipsBuilder.setValue((Short) valueNode.get().getValue()); - } + final Optional> opValue + = node.getChild(AbstractFlowspecNlriParser.OP_NID); + opValue.ifPresent(dataContainerChild -> ipsBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); + final Optional> valueNode + = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); + valueNode.ifPresent(dataContainerChild -> ipsBuilder.setValue((Short) dataContainerChild.getValue())); protocolIps.add(ipsBuilder.build()); } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java index c4c7e1aaee..66a6a46695 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java @@ -44,21 +44,19 @@ public final class FlowspecIpv6NlriParserHelper { public static void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { if (fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).isPresent()) { - fsBuilder.setFlowspecType( - new DestinationIpv6PrefixCaseBuilder() - .setDestinationPrefix(new Ipv6Prefix((String) fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).get().getValue())) - .build() - ); + fsBuilder.setFlowspecType(new DestinationIpv6PrefixCaseBuilder() + .setDestinationPrefix(new Ipv6Prefix((String) fsType + .getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).get().getValue())).build()); } else if (fsType.getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).isPresent()) { - fsBuilder.setFlowspecType( - new SourceIpv6PrefixCaseBuilder() - .setSourcePrefix(new Ipv6Prefix((String) fsType.getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).get().getValue())) - .build() - ); + fsBuilder.setFlowspecType(new SourceIpv6PrefixCaseBuilder().setSourcePrefix(new Ipv6Prefix((String) fsType + .getChild(AbstractFlowspecNlriParser.SOURCE_PREFIX_NID).get().getValue())).build()); } else if (fsType.getChild(NEXT_HEADER_NID).isPresent()) { - fsBuilder.setFlowspecType(new NextHeaderCaseBuilder().setNextHeaders(createNextHeaders((UnkeyedListNode) fsType.getChild(NEXT_HEADER_NID).get())).build()); + fsBuilder.setFlowspecType(new NextHeaderCaseBuilder() + .setNextHeaders(createNextHeaders((UnkeyedListNode) fsType.getChild(NEXT_HEADER_NID).get())) + .build()); } else if (fsType.getChild(FLOW_LABEL_NID).isPresent()) { - fsBuilder.setFlowspecType(new FlowLabelCaseBuilder().setFlowLabel(createFlowLabels((UnkeyedListNode) fsType.getChild(FLOW_LABEL_NID).get())).build()); + fsBuilder.setFlowspecType(new FlowLabelCaseBuilder() + .setFlowLabel(createFlowLabels((UnkeyedListNode) fsType.getChild(FLOW_LABEL_NID).get())).build()); } } @@ -83,14 +81,14 @@ public final class FlowspecIpv6NlriParserHelper { for (final UnkeyedListEntryNode node : nextHeadersData.getValue()) { final NextHeadersBuilder nextHeadersBuilder = new NextHeadersBuilder(); - final Optional> opValue = node.getChild(AbstractFlowspecNlriParser.OP_NID); - if (opValue.isPresent()) { - nextHeadersBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } - final Optional> valueNode = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); - if (valueNode.isPresent()) { - nextHeadersBuilder.setValue((Short) valueNode.get().getValue()); - } + final Optional> opValue + = node.getChild(AbstractFlowspecNlriParser.OP_NID); + opValue.ifPresent(dataContainerChild -> nextHeadersBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); + final Optional> valueNode + = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); + valueNode.ifPresent(dataContainerChild + -> nextHeadersBuilder.setValue((Short) dataContainerChild.getValue())); nextHeaders.add(nextHeadersBuilder.build()); } @@ -102,14 +100,14 @@ public final class FlowspecIpv6NlriParserHelper { for (final UnkeyedListEntryNode node : flowLabelsData.getValue()) { final FlowLabelBuilder flowLabelsBuilder = new FlowLabelBuilder(); - final Optional> opValue = node.getChild(AbstractFlowspecNlriParser.OP_NID); - if (opValue.isPresent()) { - flowLabelsBuilder.setOp(NumericOneByteOperandParser.INSTANCE.create((Set) opValue.get().getValue())); - } - final Optional> valueNode = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); - if (valueNode.isPresent()) { - flowLabelsBuilder.setValue((Long) valueNode.get().getValue()); - } + final Optional> opValue + = node.getChild(AbstractFlowspecNlriParser.OP_NID); + opValue.ifPresent(dataContainerChild -> flowLabelsBuilder.setOp(NumericOneByteOperandParser + .INSTANCE.create((Set) dataContainerChild.getValue()))); + final Optional> valueNode + = node.getChild(AbstractFlowspecNlriParser.VALUE_NID); + valueNode.ifPresent(dataContainerChild + -> flowLabelsBuilder.setValue((Long) dataContainerChild.getValue())); flowLabels.add(flowLabelsBuilder.build()); } diff --git a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java index b70f549483..ac41ef254c 100644 --- a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java +++ b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java @@ -9,9 +9,8 @@ package org.opendaylight.protocol.bgp.inet.codec; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; @@ -133,10 +132,10 @@ public class Ipv4NlriParserTest { .getDestinationType()); assertEquals(this.ip4caseWD.hashCode(), b.getWithdrawnRoutes().getDestinationType().hashCode()); - assertFalse(this.ip4caseWDWrong.hashCode() == b.getWithdrawnRoutes().getDestinationType().hashCode()); + assertNotEquals(this.ip4caseWDWrong.hashCode(), b.getWithdrawnRoutes().getDestinationType().hashCode()); - assertTrue(this.ip4caseWD.toString().equals(b.getWithdrawnRoutes().getDestinationType().toString())); - assertFalse(this.ip4caseWDWrong.toString().equals(b.getWithdrawnRoutes().getDestinationType().toString())); + assertEquals(this.ip4caseWD.toString(), b.getWithdrawnRoutes().getDestinationType().toString()); + assertNotEquals(this.ip4caseWDWrong.toString(), b.getWithdrawnRoutes().getDestinationType().toString()); } @Test @@ -148,10 +147,10 @@ public class Ipv4NlriParserTest { .getDestinationType()); assertEquals(this.ip4caseAD.hashCode(), b.getAdvertizedRoutes().getDestinationType().hashCode()); - assertFalse(this.ip4caseADWrong.hashCode() == b.getAdvertizedRoutes().getDestinationType().hashCode()); + assertNotEquals(this.ip4caseADWrong.hashCode(), b.getAdvertizedRoutes().getDestinationType().hashCode()); - assertTrue(this.ip4caseAD.toString().equals(b.getAdvertizedRoutes().getDestinationType().toString())); - assertFalse(this.ip4caseADWrong.toString().equals(b.getAdvertizedRoutes().getDestinationType().toString())); + assertEquals(this.ip4caseAD.toString(), b.getAdvertizedRoutes().getDestinationType().toString()); + assertNotEquals(this.ip4caseADWrong.toString(), b.getAdvertizedRoutes().getDestinationType().toString()); } @Test diff --git a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/BgpPrefixSidTlvsTest.java b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/BgpPrefixSidTlvsTest.java index a4f35ddee5..a0c8f35f5d 100644 --- a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/BgpPrefixSidTlvsTest.java +++ b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/BgpPrefixSidTlvsTest.java @@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.labeled.unicast; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; @@ -57,10 +57,10 @@ public final class BgpPrefixSidTlvsTest { final LuOriginatorSrgbTlv parsed = parser.parseBgpPrefixSidTlv(serialized); assertEquals(tlv.getSrgbValue().size(), parsed.getSrgbValue().size()); - assertTrue(tlv.getSrgbValue().get(0).getBase().equals(srgb1)); - assertTrue(tlv.getSrgbValue().get(0).getRange().equals(srgb2)); - assertTrue(tlv.getSrgbValue().get(1).getBase().equals(srgb2)); - assertTrue(tlv.getSrgbValue().get(1).getRange().equals(srgb1)); + assertEquals(tlv.getSrgbValue().get(0).getBase(), srgb1); + assertEquals(tlv.getSrgbValue().get(0).getRange(), srgb2); + assertEquals(tlv.getSrgbValue().get(1).getBase(), srgb2); + assertEquals(tlv.getSrgbValue().get(1).getRange(), srgb1); assertEquals(3, parser.getType()); } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java index 06900ab43b..7a534919b2 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java @@ -73,17 +73,21 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { @VisibleForTesting public static final NodeIdentifier REMOTE_NODE_DESCRIPTORS_NID = new NodeIdentifier(RemoteNodeDescriptors.QNAME); @VisibleForTesting - public static final NodeIdentifier ADVERTISING_NODE_DESCRIPTORS_NID = new NodeIdentifier(AdvertisingNodeDescriptors.QNAME); + public static final NodeIdentifier ADVERTISING_NODE_DESCRIPTORS_NID + = new NodeIdentifier(AdvertisingNodeDescriptors.QNAME); @VisibleForTesting public static final NodeIdentifier PREFIX_DESCRIPTORS_NID = new NodeIdentifier(PrefixDescriptors.QNAME); @VisibleForTesting public static final NodeIdentifier LINK_DESCRIPTORS_NID = new NodeIdentifier(LinkDescriptors.QNAME); @VisibleForTesting - public static final NodeIdentifier PROTOCOL_ID_NID = new NodeIdentifier(QName.create(CLinkstateDestination.QNAME, "protocol-id").intern()); + public static final NodeIdentifier PROTOCOL_ID_NID = new NodeIdentifier( + QName.create(CLinkstateDestination.QNAME.getModule(), "protocol-id")); @VisibleForTesting - public static final NodeIdentifier IDENTIFIER_NID = new NodeIdentifier(QName.create(CLinkstateDestination.QNAME, "identifier").intern()); + public static final NodeIdentifier IDENTIFIER_NID = new NodeIdentifier( + QName.create(CLinkstateDestination.QNAME.getModule(), "identifier")); @VisibleForTesting - private static final NodeIdentifier DISTINGUISHER_NID = new NodeIdentifier(QName.create(CLinkstateDestination.QNAME, "route-distinguisher").intern()); + private static final NodeIdentifier DISTINGUISHER_NID = new NodeIdentifier( + QName.create(CLinkstateDestination.QNAME.getModule(), "route-distinguisher")); private final SimpleNlriTypeRegistry nlriTypeReg = SimpleNlriTypeRegistry.getInstance(); @@ -137,7 +141,8 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { @Override public void serializeAttribute(final DataObject attribute, final ByteBuf byteAggregator) { - Preconditions.checkArgument(attribute instanceof Attributes, "Attribute parameter is not a PathAttribute object."); + Preconditions.checkArgument(attribute instanceof Attributes, + "Attribute parameter is not a PathAttribute object."); final Attributes pathAttributes = (Attributes) attribute; final Attributes1 pathAttributes1 = pathAttributes.getAugmentation(Attributes1.class); final Attributes2 pathAttributes2 = pathAttributes.getAugmentation(Attributes2.class); @@ -150,8 +155,10 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { private void serializeWithDrawnRoutes(final WithdrawnRoutes withdrawnRoutes, final ByteBuf byteAggregator) { if (withdrawnRoutes != null && withdrawnRoutes.getDestinationType() instanceof DestinationLinkstateCase) { - final DestinationLinkstateCase linkstateCase = (DestinationLinkstateCase) withdrawnRoutes.getDestinationType(); - for (final CLinkstateDestination cLinkstateDestination : linkstateCase.getDestinationLinkstate().getCLinkstateDestination()) { + final DestinationLinkstateCase linkstateCase + = (DestinationLinkstateCase) withdrawnRoutes.getDestinationType(); + for (final CLinkstateDestination cLinkstateDestination : linkstateCase.getDestinationLinkstate() + .getCLinkstateDestination()) { this.nlriTypeReg.serializeNlriType(cLinkstateDestination, byteAggregator); } } @@ -159,12 +166,17 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { private void serializeAdvertisedRoutes(final AdvertizedRoutes advertizedRoutes, final ByteBuf byteAggregator) { if (advertizedRoutes != null && advertizedRoutes.getDestinationType() - instanceof - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationLinkstateCase) { - final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationLinkstateCase - linkstateCase = (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationLinkstateCase) advertizedRoutes.getDestinationType(); + instanceof + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.update + .attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationLinkstateCase) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.update + .attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationLinkstateCase + linkstateCase = (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate + .rev180329.update.attributes.mp.reach.nlri.advertized.routes.destination.type + .DestinationLinkstateCase) advertizedRoutes.getDestinationType(); - for (final CLinkstateDestination cLinkstateDestination : linkstateCase.getDestinationLinkstate().getCLinkstateDestination()) { + for (final CLinkstateDestination cLinkstateDestination : linkstateCase.getDestinationLinkstate() + .getCLinkstateDestination()) { this.nlriTypeReg.serializeNlriType(cLinkstateDestination, byteAggregator); } } @@ -196,7 +208,8 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { } } - public static CLinkstateDestination extractLinkstateDestination(final DataContainerNode linkstate) { + public static CLinkstateDestination extractLinkstateDestination( + final DataContainerNode linkstate) { final CLinkstateDestinationBuilder builder = new CLinkstateDestinationBuilder(); serializeCommonParts(builder, linkstate); @@ -215,7 +228,8 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { return builder.build(); } - private static void serializeNodeDescriptor(final CLinkstateDestinationBuilder builder, final ChoiceNode objectType) { + private static void serializeNodeDescriptor(final CLinkstateDestinationBuilder builder, + final ChoiceNode objectType) { final NodeCaseBuilder nodeBuilder = new NodeCaseBuilder(); // node descriptors nodeBuilder.setNodeDescriptors(NodeNlriParser @@ -223,51 +237,56 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { builder.setObjectType(nodeBuilder.build()); } - private static void serializeLocalNodeDescriptor(final CLinkstateDestinationBuilder builder, final ChoiceNode objectType) { + private static void serializeLocalNodeDescriptor(final CLinkstateDestinationBuilder builder, + final ChoiceNode objectType) { // link local node descriptors final LinkCaseBuilder linkBuilder = new LinkCaseBuilder(); - linkBuilder.setLocalNodeDescriptors(NodeNlriParser.serializeLocalNodeDescriptors((ContainerNode) objectType.getChild(LOCAL_NODE_DESCRIPTORS_NID).get())); + linkBuilder.setLocalNodeDescriptors(NodeNlriParser.serializeLocalNodeDescriptors((ContainerNode) objectType + .getChild(LOCAL_NODE_DESCRIPTORS_NID).get())); // link remote node descriptors if (objectType.getChild(REMOTE_NODE_DESCRIPTORS_NID).isPresent()) { - linkBuilder.setRemoteNodeDescriptors(NodeNlriParser.serializeRemoteNodeDescriptors((ContainerNode) objectType.getChild(REMOTE_NODE_DESCRIPTORS_NID).get())); + linkBuilder.setRemoteNodeDescriptors(NodeNlriParser + .serializeRemoteNodeDescriptors((ContainerNode) objectType.getChild(REMOTE_NODE_DESCRIPTORS_NID) + .get())); } // link descriptors - final Optional> linkDescriptors = objectType.getChild(LINK_DESCRIPTORS_NID); - if (linkDescriptors.isPresent()) { - linkBuilder.setLinkDescriptors(LinkNlriParser.serializeLinkDescriptors((ContainerNode) linkDescriptors.get())); - } + final Optional> linkDescriptors + = objectType.getChild(LINK_DESCRIPTORS_NID); + linkDescriptors.ifPresent(dataContainerChild -> linkBuilder.setLinkDescriptors(LinkNlriParser + .serializeLinkDescriptors((ContainerNode) dataContainerChild))); builder.setObjectType(linkBuilder.build()); } - private static void serializeAdvertisedNodeDescriptor(final CLinkstateDestinationBuilder builder, final ChoiceNode objectType) { + private static void serializeAdvertisedNodeDescriptor(final CLinkstateDestinationBuilder builder, + final ChoiceNode objectType) { // prefix node descriptors final PrefixCaseBuilder prefixBuilder = new PrefixCaseBuilder(); - prefixBuilder.setAdvertisingNodeDescriptors(NodeNlriParser.serializeAdvNodeDescriptors((ContainerNode) objectType.getChild( - ADVERTISING_NODE_DESCRIPTORS_NID).get())); + prefixBuilder.setAdvertisingNodeDescriptors(NodeNlriParser + .serializeAdvNodeDescriptors((ContainerNode) objectType.getChild(ADVERTISING_NODE_DESCRIPTORS_NID) + .get())); // prefix descriptors - final Optional> prefixDescriptors = objectType.getChild(PREFIX_DESCRIPTORS_NID); - if (prefixDescriptors.isPresent()) { - prefixBuilder.setPrefixDescriptors(AbstractPrefixNlriParser.serializePrefixDescriptors((ContainerNode) prefixDescriptors.get())); - } + final Optional> prefixDescriptors + = objectType.getChild(PREFIX_DESCRIPTORS_NID); + prefixDescriptors.ifPresent(dataContainerChild -> prefixBuilder.setPrefixDescriptors(AbstractPrefixNlriParser + .serializePrefixDescriptors((ContainerNode) dataContainerChild))); builder.setObjectType(prefixBuilder.build()); } - private static void serializeCommonParts(final CLinkstateDestinationBuilder builder, final DataContainerNode linkstate) { + private static void serializeCommonParts(final CLinkstateDestinationBuilder builder, + final DataContainerNode linkstate) { // serialize common parts - final Optional> distinguisher = linkstate.getChild(DISTINGUISHER_NID); - if (distinguisher.isPresent()) { - builder.setRouteDistinguisher(RouteDistinguisherUtil.parseRouteDistinguisher(distinguisher.get().getValue())); - } + final Optional> distinguisher + = linkstate.getChild(DISTINGUISHER_NID); + distinguisher.ifPresent(dataContainerChild -> builder.setRouteDistinguisher(RouteDistinguisherUtil + .parseRouteDistinguisher(dataContainerChild.getValue()))); final Optional> protocolId = linkstate.getChild(PROTOCOL_ID_NID); // DOM representation contains values as are in the model, not as are in generated enum - if (protocolId.isPresent()) { - builder.setProtocolId(ProtocolId.forValue(domProtocolIdValue((String) protocolId.get().getValue()))); - } + protocolId.ifPresent(dataContainerChild -> builder.setProtocolId(ProtocolId + .forValue(domProtocolIdValue((String) dataContainerChild.getValue())))); final Optional> identifier = linkstate.getChild(IDENTIFIER_NID); - if (identifier.isPresent()) { - builder.setIdentifier(new Identifier((BigInteger) identifier.get().getValue())); - } + identifier.ifPresent(dataContainerChild -> builder + .setIdentifier(new Identifier((BigInteger) dataContainerChild.getValue()))); } } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java index d8e9104058..14704f59c4 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java @@ -85,19 +85,26 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec { @VisibleForTesting private static final NodeIdentifier OSPF_PSEUDONODE_NID = new NodeIdentifier(OspfPseudonode.QNAME); @VisibleForTesting - public static final NodeIdentifier ISO_SYSTEM_NID = new NodeIdentifier(QName.create(NodeDescriptors.QNAME, "iso-system-id").intern()); + public static final NodeIdentifier ISO_SYSTEM_NID = new NodeIdentifier( + QName.create(NodeDescriptors.QNAME.getModule(), "iso-system-id")); @VisibleForTesting - public static final NodeIdentifier ISIS_ROUTER_NID = new NodeIdentifier(QName.create(NodeDescriptors.QNAME, "is-is-router-identifier").intern()); + public static final NodeIdentifier ISIS_ROUTER_NID = new NodeIdentifier( + QName.create(NodeDescriptors.QNAME.getModule(),"is-is-router-identifier")); @VisibleForTesting - public static final NodeIdentifier PSN_NID = new NodeIdentifier(QName.create(NodeDescriptors.QNAME, "psn").intern()); + public static final NodeIdentifier PSN_NID = new NodeIdentifier( + QName.create(NodeDescriptors.QNAME.getModule(),"psn")); @VisibleForTesting - public static final NodeIdentifier OSPF_ROUTER_NID = new NodeIdentifier(QName.create(NodeDescriptors.QNAME, "ospf-router-id").intern()); - private static final NodeIdentifier LAN_IFACE_NID = new NodeIdentifier(QName.create(NodeDescriptors.QNAME, "lan-interface").intern()); + public static final NodeIdentifier OSPF_ROUTER_NID = new NodeIdentifier( + QName.create(NodeDescriptors.QNAME.getModule(),"ospf-router-id")); + private static final NodeIdentifier LAN_IFACE_NID = new NodeIdentifier( + QName.create(NodeDescriptors.QNAME.getModule(),"lan-interface")); @Override protected ObjectType parseObjectType(final ByteBuf buffer) { final NodeCaseBuilder builder = new NodeCaseBuilder(); - builder.setNodeDescriptors(new NodeDescriptorsBuilder((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier) SimpleNlriTypeRegistry.getInstance().parseTlv(buffer)).build()); + builder.setNodeDescriptors(new NodeDescriptorsBuilder((org.opendaylight.yang.gen.v1.urn.opendaylight.params + .xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier) SimpleNlriTypeRegistry.getInstance() + .parseTlv(buffer)).build()); return builder.build(); } @@ -125,7 +132,8 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec { if (pseudoIsisNode.getChild(ISIS_ROUTER_NID).isPresent()) { final ContainerNode isisRouterNid = (ContainerNode) pseudoIsisNode.getChild(ISIS_ROUTER_NID).get(); if (isisRouterNid.getChild(ISO_SYSTEM_NID).isPresent()) { - isisRouterId.setIsoSystemId(new IsoSystemIdentifier((byte[]) isisRouterNid.getChild(ISO_SYSTEM_NID).get().getValue())); + isisRouterId.setIsoSystemId(new IsoSystemIdentifier((byte[]) isisRouterNid.getChild(ISO_SYSTEM_NID) + .get().getValue())); } } @@ -155,7 +163,8 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec { final OspfPseudonodeCaseBuilder builder = new OspfPseudonodeCaseBuilder(); final OspfPseudonodeBuilder nodeBuilder = new OspfPseudonodeBuilder(); if (ospfPseudonode.getChild(LAN_IFACE_NID).isPresent()) { - nodeBuilder.setLanInterface(new OspfInterfaceIdentifier((Long)ospfPseudonode.getChild(LAN_IFACE_NID).get().getValue())); + nodeBuilder.setLanInterface(new OspfInterfaceIdentifier((Long)ospfPseudonode.getChild(LAN_IFACE_NID) + .get().getValue())); } if (ospfPseudonode.getChild(OSPF_ROUTER_NID).isPresent()) { nodeBuilder.setOspfRouterId((Long)ospfPseudonode.getChild(OSPF_ROUTER_NID).get().getValue()); @@ -166,7 +175,8 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec { private static CRouterIdentifier serializeRouterId(final ContainerNode descriptorsData) { CRouterIdentifier cRouterId = null; - final Optional> maybeRouterId = descriptorsData.getChild(ROUTER_NID); + final Optional> maybeRouterId + = descriptorsData.getChild(ROUTER_NID); if (maybeRouterId.isPresent()) { final ChoiceNode routerId = (ChoiceNode) maybeRouterId.get(); if (routerId.getChild(ISIS_NODE_NID).isPresent()) { @@ -183,43 +193,34 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec { } private static AsNumber serializeAsNumber(final ContainerNode descriptorsData) { - final Optional> asNumber = descriptorsData.getChild(AS_NUMBER_NID); - if (asNumber.isPresent()) { - return new AsNumber((Long) asNumber.get().getValue()); - } - return null; + final Optional> asNumber + = descriptorsData.getChild(AS_NUMBER_NID); + return asNumber.map(dataContainerChild -> new AsNumber((Long) dataContainerChild.getValue())).orElse(null); } private static DomainIdentifier serializeDomainId(final ContainerNode descriptorsData) { final Optional> domainId = descriptorsData.getChild(DOMAIN_NID); - if (domainId.isPresent()) { - return new DomainIdentifier((Long) domainId.get().getValue()); - } - return null; + return domainId.map(dataContainerChild + -> new DomainIdentifier((Long) dataContainerChild.getValue())).orElse(null); } private static AreaIdentifier serializeAreaId(final ContainerNode descriptorsData) { final Optional> areaId = descriptorsData.getChild(AREA_NID); - if (areaId.isPresent()) { - return new AreaIdentifier((Long) areaId.get().getValue()); - } - return null; + return areaId.map(dataContainerChild + -> new AreaIdentifier((Long) dataContainerChild.getValue())).orElse(null); } private static Ipv4Address serializeBgpRouterId(final ContainerNode descriptorsData) { - final Optional> bgpRouterId = descriptorsData.getChild(BGP_ROUTER_NID); - if (bgpRouterId.isPresent()) { - return new Ipv4Address((String) bgpRouterId.get().getValue()); - } - return null; + final Optional> bgpRouterId + = descriptorsData.getChild(BGP_ROUTER_NID); + return bgpRouterId.map(dataContainerChild + -> new Ipv4Address((String) dataContainerChild.getValue())).orElse(null); } private static AsNumber serializeMemberAsn(final ContainerNode descriptorsData) { - final Optional> memberAsn = descriptorsData.getChild(MEMBER_ASN_NID); - if (memberAsn.isPresent()) { - return new AsNumber((Long) memberAsn.get().getValue()); - } - return null; + final Optional> memberAsn + = descriptorsData.getChild(MEMBER_ASN_NID); + return memberAsn.map(dataContainerChild -> new AsNumber((Long) dataContainerChild.getValue())).orElse(null); } static LocalNodeDescriptors serializeLocalNodeDescriptors(final ContainerNode descriptorsData) { diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java index 31d704ecaa..725bbec2e3 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java @@ -19,9 +19,11 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; -public final class OspfRouteTlvParser implements LinkstateTlvParser, LinkstateTlvParser.LinkstateTlvSerializer { +public final class OspfRouteTlvParser implements LinkstateTlvParser, + LinkstateTlvParser.LinkstateTlvSerializer { - public static final QName OSPF_ROUTE_TYPE_QNAME = QName.create(PrefixDescriptors.QNAME, "ospf-route-type").intern(); + public static final QName OSPF_ROUTE_TYPE_QNAME = + QName.create(PrefixDescriptors.QNAME.getModule(), "ospf-route-type"); public static final NodeIdentifier OSPF_ROUTE_NID = new NodeIdentifier(OspfRouteTlvParser.OSPF_ROUTE_TYPE_QNAME); private static final int OSPF_ROUTE_TYPE = 264; @@ -46,11 +48,11 @@ public final class OspfRouteTlvParser implements LinkstateTlvParser> ospfRoute = prefixDesc.getChild(OSPF_ROUTE_NID); - if (ospfRoute.isPresent()) { - return OspfRouteType.forValue(domOspfRouteTypeValue((String) ospfRoute.get().getValue())); - } - return null; + final Optional> ospfRoute + = prefixDesc.getChild(OSPF_ROUTE_NID); + return ospfRoute.map(dataContainerChild + -> OspfRouteType.forValue(domOspfRouteTypeValue((String) dataContainerChild.getValue()))) + .orElse(null); } diff --git a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ConditionsRegistryImpl.java b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ConditionsRegistryImpl.java index 3840ce9dcf..d22a05200a 100644 --- a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ConditionsRegistryImpl.java +++ b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ConditionsRegistryImpl.java @@ -36,7 +36,7 @@ final class ConditionsRegistryImpl { = new HashMap<>(); //TODO Implement match prefix //private final GenericConditionPolicyHandler genericConditionHandler; - private BgpConditionsRegistry bgpConditionsRegistry = new BgpConditionsRegistry(); + private final BgpConditionsRegistry bgpConditionsRegistry = new BgpConditionsRegistry(); ConditionsRegistryImpl(final DataBroker databroker) { // this.genericConditionHandler = new GenericConditionPolicyHandler(databroker); diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java index 7ed5d40e6f..c675662b3d 100644 --- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java +++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java @@ -325,13 +325,10 @@ public final class NeighborUtil { private static AfiSafi buildAfiSafi(@Nonnull final BGPAfiSafiState neighbor, @Nonnull final TablesKey tablesKey, @Nonnull final BGPTableTypeRegistryConsumer bgpTableTypeRegistry) { final Optional> afiSafi = bgpTableTypeRegistry.getAfiSafiType(tablesKey); - if (!afiSafi.isPresent()) { - return null; - } - - return new AfiSafiBuilder().setAfiSafiName(afiSafi.get()) + return afiSafi.map(aClass -> new AfiSafiBuilder().setAfiSafiName(aClass) .setState(buildAfiSafiState(neighbor, tablesKey, neighbor.isAfiSafiSupported(tablesKey))) - .setGracefulRestart(buildAfiSafiGracefulRestartState(neighbor, tablesKey)).build(); + .setGracefulRestart(buildAfiSafiGracefulRestartState(neighbor, tablesKey)).build()).orElse(null); + } private static org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java index ad43dbc365..0e30ca10a3 100644 --- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java +++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java @@ -194,7 +194,7 @@ public class StateProviderImplTest extends ConstantSchemaAbstractDataBrokerTest private InMemoryDOMDataStore spiedOperStore; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); doReturn(Optional.of(IPV4UNICAST.class)) @@ -435,9 +435,7 @@ public class StateProviderImplTest extends ConstantSchemaAbstractDataBrokerTest }).when(mockTxChain).newWriteOnlyTransaction(); return mockTxChain; - }).doAnswer(invocation -> { - return realOperStore.createTransactionChain(); - }).when(spiedOperStore).createTransactionChain(); + }).doAnswer(invocation -> realOperStore.createTransactionChain()).when(spiedOperStore).createTransactionChain(); int timerInterval = 1; try (StateProviderImpl stateProvider = new StateProviderImpl(getDataBroker(), timerInterval, tableTypeRegistry, diff --git a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java index fd75c0cc3e..9728677b79 100644 --- a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java +++ b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bgp.parser; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; @@ -83,6 +84,6 @@ public class APITest { BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build()); params.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build()); final Open open1 = new OpenBuilder().setBgpParameters(params).build(); - assertEquals(true, BgpExtendedMessageUtil.advertizedBgpExtendedMessageCapability(open1)); + assertTrue(BgpExtendedMessageUtil.advertizedBgpExtendedMessageCapability(open1)); } } diff --git a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java index e04f38d6e4..eba8c4d354 100644 --- a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java +++ b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java @@ -8,7 +8,7 @@ package org.opendaylight.protocol.bgp.parser; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.fail; @@ -41,7 +41,7 @@ public class TableTypeTest { assertEquals("Subsequent address family may not be null", e.getMessage()); } - assertFalse(tt1.equals(tt2)); + assertNotEquals(tt1, tt2); assertNotSame(tt1.hashCode(), tt2.hashCode()); assertEquals(tt1.toString(), tt1.toString()); assertNotSame(tt1.getAfi(), tt2.getAfi()); diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java index b6261dbe5a..7fcc312d34 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java @@ -35,19 +35,19 @@ public final class MultiProtocolCapabilityHandler implements CapabilityParser, C private final AddressFamilyRegistry afiReg; private final SubsequentAddressFamilyRegistry safiReg; - public MultiProtocolCapabilityHandler(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { + public MultiProtocolCapabilityHandler(final AddressFamilyRegistry afiReg, + final SubsequentAddressFamilyRegistry safiReg) { this.afiReg = requireNonNull(afiReg); this.safiReg = requireNonNull(safiReg); } @Override public CParameters parseCapability(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { - final Optional parsedAfiSafiOptional = MultiprotocolCapabilitiesUtil.parseMPAfiSafi(buffer, this.afiReg, this.safiReg); - if (!parsedAfiSafiOptional.isPresent()) { - return null; - } - return new CParametersBuilder().addAugmentation(CParameters1.class,new CParameters1Builder().setMultiprotocolCapability( - new MultiprotocolCapabilityBuilder(parsedAfiSafiOptional.get()).build()).build()).build(); + final Optional parsedAfiSafiOptional = MultiprotocolCapabilitiesUtil + .parseMPAfiSafi(buffer, this.afiReg, this.safiReg); + return parsedAfiSafiOptional.map(bgpTableType -> new CParametersBuilder() + .addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability( + new MultiprotocolCapabilityBuilder(bgpTableType).build()).build()).build()).orElse(null); } @Override @@ -59,7 +59,8 @@ public final class MultiProtocolCapabilityHandler implements CapabilityParser, C final MultiprotocolCapability mp = capability.getAugmentation(CParameters1.class).getMultiprotocolCapability(); final ByteBuf capBuffer = Unpooled.buffer(); - MultiprotocolCapabilitiesUtil.serializeMPAfiSafi(this.afiReg, this.safiReg, mp.getAfi(), mp.getSafi(), capBuffer); + MultiprotocolCapabilitiesUtil.serializeMPAfiSafi(this.afiReg, this.safiReg, mp.getAfi(), + mp.getSafi(), capBuffer); CapabilityUtil.formatCapability(CODE, capBuffer, byteAggregator); } diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java index 77f37cbb41..c4e2a56cfc 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java @@ -78,9 +78,9 @@ public class BGPParserTest { */ static final List inputBytes = new ArrayList<>(); - private static int COUNTER = 7; + private static final int COUNTER = 7; - private static int MAX_SIZE = 300; + private static final int MAX_SIZE = 300; private static BGPUpdateMessageParser updateParser; diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java index 9196e86996..0ab58322d4 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java @@ -9,6 +9,7 @@ package org.opendaylight.protocol.bgp.parser.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotSame; import java.lang.reflect.Constructor; @@ -64,7 +65,7 @@ public class ComplementaryTest { assertEquals(0, tlv3.getRestartTime().intValue()); - assertFalse(tlv1.equals(tlv2)); + assertNotEquals(tlv1, tlv2); assertNotSame(tlv1.hashCode(), tlv3.hashCode()); diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPathTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPathTest.java index deca4e1129..df5b96adc0 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPathTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPathTest.java @@ -51,7 +51,7 @@ public class BaseBestPathTest { public void testHashCodeAndEqual() { assertTrue(this.baseBestPath.equals(this.baseBestPathCopy) && this.baseBestPathCopy.equals(this.baseBestPath)); - assertTrue(this.baseBestPath.hashCode() == this.baseBestPathCopy.hashCode()); + assertEquals(this.baseBestPath.hashCode(), this.baseBestPathCopy.hashCode()); } @Test diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java index 8cf798ac0c..cb3bdf5cbf 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java @@ -131,9 +131,7 @@ public class ApplicationPeer extends AbstractPeer implements ClusteredDOMDataTre this.writerChain = this.rib.createPeerDOMChain(this); final Set localTables = this.rib.getLocalTablesKeys(); - localTables.forEach(tablesKey -> { - this.supportedTables.add(RibSupportUtils.toYangTablesKey(tablesKey)); - }); + localTables.forEach(tablesKey -> this.supportedTables.add(RibSupportUtils.toYangTablesKey(tablesKey))); setAdvertizedGracefulRestartTableTypes(Collections.emptyList()); this.adjRibInWriter = AdjRibInWriter.create(this.rib.getYangRibId(), PeerRole.Internal, this.writerChain); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index 375b577aa5..eda7ecaf8c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -118,7 +118,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener { @GuardedBy("this") private BGPSession session; @GuardedBy("this") - private DOMTransactionChain chain; + private final DOMTransactionChain chain; @GuardedBy("this") private AdjRibInWriter ribWriter; @GuardedBy("this") diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeerTrackerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeerTrackerImpl.java index 64167cd148..7873b3a2d5 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeerTrackerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeerTrackerImpl.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. public final class BGPPeerTrackerImpl implements BGPPeerTracker { @GuardedBy("this") - private Map peers = new HashMap<>(); + private final Map peers = new HashMap<>(); private ImmutableList peersList; @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java index a7358453f7..e3547f881c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java @@ -216,7 +216,7 @@ public final class BgpPeer implements PeerBean, BGPPeerStateConsumer { } private final class BgpPeerSingletonService implements BGPPeerStateConsumer { - private boolean activeConnection; + private final boolean activeConnection; private final BGPDispatcher dispatcher; private final InetSocketAddress inetAddress; private final int retryTimer; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java index ec403dd6f4..2a96ad886a 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java @@ -80,7 +80,7 @@ public final class RibImpl implements RIB, BGPRibStateConsumer, AutoCloseable { private Ipv4Address routerId; private ClusterIdentifier clusterId; - private DataBroker dataBroker; + private final DataBroker dataBroker; public RibImpl( final RIBExtensionConsumerContext contextProvider, diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java index 63de26aed2..e3f8b1f1da 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java @@ -135,7 +135,7 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest { private NioEventLoopGroup boss; private org.opendaylight.protocol.bgp.inet.BGPActivator inetActivator; protected StrictBGPPeerRegistry serverRegistry; - protected BGPPeerTrackerImpl peerTracker = new BGPPeerTrackerImpl(); + protected final BGPPeerTrackerImpl peerTracker = new BGPPeerTrackerImpl(); protected CodecsRegistryImpl codecsRegistry; @Before diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java index 11e1d73eb6..86f3ce7f02 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java @@ -136,7 +136,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest { @Mock private ClusterSingletonServiceProvider clusterSingletonServiceProvider; - private BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); + private final BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); private static ModuleInfoBackedContext createClassLoadingStrategy() { final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java index 6482b91aa6..4b1e0859b4 100755 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java @@ -7,6 +7,7 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -73,7 +74,7 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest { @Mock private BGPDispatcher dispatcher; - private BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); + private final BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); private CodecsRegistryImpl codecsRegistry; @Before @@ -163,7 +164,7 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest { for (final Tables table : tables) { if (table.getAfi().equals(tableType.getAfi()) && table.getSafi().equals(tableType.getSafi())) { found = true; - assertTrue(Boolean.valueOf(true).equals(table.getAttributes().isUptodate())); + assertEquals(Boolean.valueOf(true), table.getAttributes().isUptodate()); } } assertTrue(found); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKeyTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKeyTest.java index 94b987f687..a20fc7b945 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKeyTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKeyTest.java @@ -10,7 +10,7 @@ package org.opendaylight.protocol.bgp.rib.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotEquals; import com.google.common.primitives.UnsignedInteger; import org.junit.Test; @@ -28,10 +28,10 @@ public class RouteUpdateKeyTest { final RouteUpdateKey rk = new RouteUpdateKey(PEER_ID, PREFIX); assertEquals(PEER_ID, rk.getPeerId()); assertEquals(PREFIX, rk.getRouteId()); - assertTrue(rk.equals(new RouteUpdateKey(PEER_ID, PREFIX))); - assertTrue(rk.equals(rk)); + assertEquals(rk, new RouteUpdateKey(PEER_ID, PREFIX)); + assertEquals(rk, rk); assertFalse(rk.equals(null)); - assertFalse(rk.equals(new RouteUpdateKey(PEER_ID_2, PREFIX))); - assertFalse(rk.equals(new RouteUpdateKey(PEER_ID_2, PREFIX_2))); + assertNotEquals(rk, new RouteUpdateKey(PEER_ID_2, PREFIX)); + assertNotEquals(rk, new RouteUpdateKey(PEER_ID_2, PREFIX_2)); } } \ No newline at end of file diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java index 04e9908cac..d5dfd775ed 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java @@ -90,7 +90,7 @@ public final class SimpleSessionListener implements BGPSessionListener, Listener } BGPSessionImpl getSession() { - Assert.assertEquals("Session up", true, Uninterruptibles.awaitUninterruptibly(this.sessionLatch, 10, TimeUnit.SECONDS)); + Assert.assertTrue("Session up", Uninterruptibles.awaitUninterruptibly(this.sessionLatch, 10, TimeUnit.SECONDS)); return (BGPSessionImpl) this.session; } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java index f755498a15..fee0253802 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java @@ -86,7 +86,7 @@ class AbstractConfig extends DefaultRibPoliciesMockTest { protected PeerGroupConfigLoader peerGroupLoader; @Mock private DOMDataTreeChangeService dataTreeChangeService; - private BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); + private final BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); @Before public void setUp() throws Exception { diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java index 7d3d3ac7cd..b3a850ba9a 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java @@ -95,7 +95,7 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { private DataTreeCandidateNode subTree; private DOMDataWriteTransaction tx; private ContainerNode nlri; - private Map> routesMap = new HashMap<>(); + private final Map> routesMap = new HashMap<>(); private ContainerNode attributes; private MapEntryNode mapEntryNode; private BindingToNormalizedNodeCodec mappingService; diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java index d920b7e25f..6b149f65a6 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java @@ -17,8 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. public class RouterIdsTest { - private UnsignedInteger unsignedRouterId = UnsignedInteger.valueOf(707406378); - private PeerId peerID = new PeerId("bgp://42.42.42.42"); + private final UnsignedInteger unsignedRouterId = UnsignedInteger.valueOf(707406378); + private final PeerId peerID = new PeerId("bgp://42.42.42.42"); @Test public void testRouterIdForAddress() throws Exception { diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java index 81ba926f19..64ac7dae2c 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java @@ -70,7 +70,7 @@ public abstract class AbstractTopologyBuilder implements Cluste private ListenerRegistration> listenerRegistration = null; @GuardedBy("this") private BindingTransactionChain chain = null; - private AtomicBoolean closed = new AtomicBoolean(false); + private final AtomicBoolean closed = new AtomicBoolean(false); @GuardedBy("this") @VisibleForTesting protected long listenerScheduledRestartTime = 0; diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java index 62373d6297..78ee0e4621 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java @@ -7,12 +7,12 @@ */ package org.opendaylight.bgpcep.bgp.topology.provider; -import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.IsisAreaIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeFlagBits; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier; @@ -208,7 +208,8 @@ public final class ProtocolUtil { private static List toIsoNetIds(final List areaIds, final String systemId) { - return Lists.transform(areaIds, input -> new IsoNetId(UriBuilder.toIsoNetId(input, systemId))); + return areaIds.stream().map(input -> new IsoNetId(UriBuilder.toIsoNetId(input, systemId))) + .collect(Collectors.toList()); } private static List nodeMultiTopology(final List list) { diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java index efba6e387b..e11e46112f 100755 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java @@ -129,7 +129,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .child(Tables.class, new TablesKey(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class)) .build(); this.linkstateRouteIID = path.builder().child((Class) LinkstateRoutes.class) - .child(LinkstateRoute.class, new LinkstateRouteKey(new PathId(0L), LINKSTATE_ROUTE_KEY.toString())) + .child(LinkstateRoute.class, new LinkstateRouteKey(new PathId(0L), LINKSTATE_ROUTE_KEY)) .build(); } @@ -334,7 +334,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { Thread.sleep(LISTENER_RESTART_TIME); // manually invoke onTransactionChainFailed() to have the listener restart scheduled again spiedLinkstateTopologyBuilder.onTransactionChainFailed(null, null, null); - assertTrue(spiedLinkstateTopologyBuilder.listenerScheduledRestartTime == listenerScheduledRestartTime + assertEquals(spiedLinkstateTopologyBuilder.listenerScheduledRestartTime, listenerScheduledRestartTime + LISTENER_RESTART_TIME); verify(spiedLinkstateTopologyBuilder, times(5)).restartTransactionChainOnDemand(); verify(spiedLinkstateTopologyBuilder, times(3)).scheduleListenerRestart(); diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java index 698e9ad6a7..6a91e809b1 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java @@ -99,7 +99,7 @@ public class BmpDispatcherImpl implements BmpDispatcher { private final BmpSessionListenerFactory slf; private final KeyMapping keys; private long delay; - private Timer timer = new Timer(); + private final Timer timer = new Timer(); BootstrapListener(final Bootstrap bootstrap, final InetSocketAddress remoteAddress, final BmpSessionListenerFactory slf, final KeyMapping keys) { diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java index f4ea2c72e9..e83226f3c6 100644 --- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java +++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java @@ -84,8 +84,8 @@ final class BmpMockDispatcher implements AutoCloseable { private final Bootstrap bootstrap; private final InetSocketAddress remoteAddress; private final SocketAddress localAddress; - private long delay; - private Timer timer = new Timer(); + private final long delay; + private final Timer timer = new Timer(); BootstrapListener(final Bootstrap bootstrap, final SocketAddress localAddress, final InetSocketAddress remoteAddress) { diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionListener.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionListener.java index 8e7fe8099d..4fb479f5d3 100644 --- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionListener.java +++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionListener.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.binding.Notification; public final class BmpMockSessionListener implements BmpSessionListener { private final LongAdder counter = new LongAdder(); @GuardedBy("this") - private AtomicBoolean up = new AtomicBoolean(false); + private final AtomicBoolean up = new AtomicBoolean(false); @Override public void onSessionUp(final BmpSession session) { diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java index 7e00539afb..a97b854055 100644 --- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java +++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java @@ -99,7 +99,7 @@ public class AbstractBmpMessageWithTlvParserTest { @Override protected void addTlv(final TlvsBuilder builder, final Tlv tlv) { - if (tlv != null && tlv instanceof DescriptionTlv) { + if (tlv instanceof DescriptionTlv) { builder.setDescriptionTlv((DescriptionTlv) tlv); } } diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java index bd5975eb6a..9d4d9e98cb 100644 --- a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java +++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java @@ -11,7 +11,7 @@ package org.opendaylight.protocol.concepts; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThat; import java.util.HashSet; @@ -53,7 +53,7 @@ public class ASNumberTest { assertThat(this.asn1, not(equalTo(this.asn3))); assertThat(this.asn1, not(equalTo(this.asn4))); assertThat(this.asn1, not(equalTo(new Object()))); - assertFalse(this.asn1.equals(new Object())); + assertNotEquals(this.asn1, new Object()); } @Test diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml index 67e382b6c7..a841e1230c 100644 --- a/features/bgp/odl-bgpcep-bgp/pom.xml +++ b/features/bgp/odl-bgpcep-bgp/pom.xml @@ -95,12 +95,6 @@ features xml - - ${project.groupId} - odl-bgpcep-bgp-mvpn - features - xml - ${project.groupId} odl-bgpcep-bgp-l3vpn diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java index 41bbf87131..03ff2ae7d9 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java @@ -36,7 +36,7 @@ public class RROIpv4PrefixSubobjectParser implements RROSubobjectParser, RROSubo private static final int PREFIX_F_LENGTH = 1; private static final int FLAGS_SIZE = 8; - private static final int PREFIX4_F_OFFSET = 0 + Ipv4Util.IP4_LENGTH; + private static final int PREFIX4_F_OFFSET = Ipv4Util.IP4_LENGTH; private static final int CONTENT4_LENGTH = Ipv4Util.IP4_LENGTH + PREFIX_F_LENGTH + FLAGS_SIZE / Byte.SIZE; diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java index 87eff40e6e..5c9107cb8e 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java @@ -90,7 +90,7 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem // True if the listener should not be notified about events @GuardedBy("this") - private AtomicBoolean closed = new AtomicBoolean(false); + private final AtomicBoolean closed = new AtomicBoolean(false); private final Channel channel; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SimpleSessionListener.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SimpleSessionListener.java index ad3bdd66c0..ff68b2d2bb 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SimpleSessionListener.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SimpleSessionListener.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; */ public class SimpleSessionListener implements PCEPSessionListener { - public List messages = Lists.newArrayList(); + public final List messages = Lists.newArrayList(); public boolean up = false; diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/TestingSessionListener.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/TestingSessionListener.java index 9a90e7ccff..8036bd6e0d 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/TestingSessionListener.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/TestingSessionListener.java @@ -71,8 +71,7 @@ public final class TestingSessionListener implements PCEPSessionListener, Listen } public PCEPSession getSession() { - Assert.assertEquals("Session up", true, - Uninterruptibles.awaitUninterruptibly(this.sessionLatch, 10, TimeUnit.SECONDS)); + Assert.assertTrue("Session up", Uninterruptibles.awaitUninterruptibly(this.sessionLatch, 10, TimeUnit.SECONDS)); return this.session; } diff --git a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java index 056d4329ec..1ffd93de44 100644 --- a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java +++ b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java @@ -36,7 +36,7 @@ public class APITest { assertNull(header.isProcessingRule()); assertEquals(new ObjectHeaderImpl(null, true).hashCode(), header.hashCode()); - assertTrue(new ObjectHeaderImpl(null, true).equals(header)); + assertEquals(new ObjectHeaderImpl(null, true), header); } @Test diff --git a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java index 2e7951f4c5..e00edae059 100644 --- a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java +++ b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java @@ -92,7 +92,7 @@ public class RegistryTest { public final List regs = new ArrayList<>(); - AbstractPCEPExtensionProviderActivator activator = new AbstractPCEPExtensionProviderActivator() { + final AbstractPCEPExtensionProviderActivator activator = new AbstractPCEPExtensionProviderActivator() { @Override protected List startImpl(final PCEPExtensionProviderContext context) { @@ -100,7 +100,7 @@ public class RegistryTest { } }; - PCEPExtensionProviderContext ctx = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance(); + final PCEPExtensionProviderContext ctx = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance(); @Before public void setUp() throws PCEPDeserializerException { diff --git a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java index 173a696ae1..d808111d35 100644 --- a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java +++ b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; */ public class SimpleSessionListener implements PCEPSessionListener { - private List messages = Lists.newArrayList(); + private final List messages = Lists.newArrayList(); private static final Logger LOG = LoggerFactory.getLogger(SimpleSessionListener.class); diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index dad70f519a..e6529e8368 100755 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -104,7 +104,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS private InstanceIdentifier pccIdentifier; @GuardedBy("this") private TopologyNodeState nodeState; - private AtomicBoolean synced = new AtomicBoolean(false); + private final AtomicBoolean synced = new AtomicBoolean(false); @GuardedBy("this") private PCEPSession session; @GuardedBy("this") diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java index 0508247434..a8e6a0a9c2 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java @@ -13,6 +13,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcep.error.object.ErrorObjectBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.Errors; @@ -55,7 +56,8 @@ final class OperationResults implements OperationResult { public static OperationResults createUnsent(final PCEPErrors error) { final List e = error != null ? Collections.singletonList(getErrorFor(error)) : Collections.emptyList(); - return new OperationResults(FailureType.Unsent, Lists.transform(e, CONVERT_ERRORS)); + return new OperationResults(FailureType.Unsent, e.stream().map(CONVERT_ERRORS::apply) + .collect(Collectors.toList())); } private static Errors getErrorFor(final PCEPErrors error) { diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java index 0b92bb0a29..6bb3c519eb 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java @@ -100,9 +100,9 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< @GuardedBy("this") private final List staleLsps = new ArrayList<>(); - private AtomicBoolean statefulCapability = new AtomicBoolean(false); - private AtomicBoolean lspUpdateCapability = new AtomicBoolean(false); - private AtomicBoolean initiationCapability = new AtomicBoolean(false); + private final AtomicBoolean statefulCapability = new AtomicBoolean(false); + private final AtomicBoolean lspUpdateCapability = new AtomicBoolean(false); + private final AtomicBoolean initiationCapability = new AtomicBoolean(false); /** * Creates a new stateful topology session listener for given server session manager. diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java index 85610d8054..4f98d9ae92 100644 --- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java +++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java @@ -349,7 +349,7 @@ public class ProgrammingServiceImplTest extends AbstractProgrammingTest { doReturn(dependencies).when(mockedSubmitInstruction).getPreconditions(); doReturn(new InstructionId(id)).when(mockedSubmitInstruction).getId(); - doReturn(deadline.isPresent() ? deadline.get() : new Nanotime(BigInteger.valueOf(Long.MAX_VALUE))) + doReturn(deadline.orElseGet(() -> new Nanotime(BigInteger.valueOf(Long.MAX_VALUE)))) .when(mockedSubmitInstruction).getDeadline(); return mockedSubmitInstruction; } diff --git a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java index 3248dc4f18..892ed168b8 100644 --- a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java +++ b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java @@ -13,6 +13,7 @@ import com.google.common.net.HostAndPort; import java.net.InetSocketAddress; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * Created as a util for test tools. @@ -25,8 +26,8 @@ public final class InetSocketAddressUtil { } public static List parseAddresses(final String address, final int defaultPort) { - return Lists.transform(Arrays.asList(address.split(SEPARATOR)), - input -> getInetSocketAddress(input, defaultPort)); + return Arrays.asList(address.split(SEPARATOR)).stream() + .map(input -> getInetSocketAddress(input, defaultPort)).collect(Collectors.toList()); } public static List parseAddresses(final String address) { diff --git a/testtool-util/src/test/java/org/opendaylight/protocol/util/CheckUtilTest.java b/testtool-util/src/test/java/org/opendaylight/protocol/util/CheckUtilTest.java index 1f79e91f79..0e822e5dc2 100644 --- a/testtool-util/src/test/java/org/opendaylight/protocol/util/CheckUtilTest.java +++ b/testtool-util/src/test/java/org/opendaylight/protocol/util/CheckUtilTest.java @@ -9,7 +9,7 @@ package org.opendaylight.protocol.util; import static junit.framework.TestCase.assertNull; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -49,7 +49,7 @@ public class CheckUtilTest extends AbstractConcurrentDataBrokerTest { private final KeyedInstanceIdentifier topologyIIdKeyed = InstanceIdentifier.create(NetworkTopology.class).child(Topology.class, new TopologyKey(TOPOLOGY_ID)); - private static int TIMEOUT = 1; + private static final int TIMEOUT = 1; @Mock private ListenerCheck listenerCheck; @Mock @@ -162,7 +162,7 @@ public class CheckUtilTest extends AbstractConcurrentDataBrokerTest { @Test(expected = AssertionError.class) public void testCheckEquals() throws Exception { - checkEquals(() -> assertTrue(false), TIMEOUT); + checkEquals(() -> fail(), TIMEOUT); } @Test(expected = AssertionError.class) diff --git a/util/src/test/java/org/opendaylight/protocol/util/ByteArrayTest.java b/util/src/test/java/org/opendaylight/protocol/util/ByteArrayTest.java index 231b5b7607..d5652521d8 100644 --- a/util/src/test/java/org/opendaylight/protocol/util/ByteArrayTest.java +++ b/util/src/test/java/org/opendaylight/protocol/util/ByteArrayTest.java @@ -135,9 +135,8 @@ public class ByteArrayTest { final String FILE_TO_TEST = "src/test/resources/PCEStatefulCapabilityTlv1.bin"; final File fileToCompareWith = new File(FILE_TO_TEST); - final InputStream bytesIStream = new FileInputStream(fileToCompareWith); - try { + try (InputStream bytesIStream = new FileInputStream(fileToCompareWith)) { final byte[] actualBytes = ByteArray.fileToBytes(FILE_TO_TEST); if (fileToCompareWith.length() > Integer.MAX_VALUE) { @@ -154,8 +153,6 @@ public class ByteArrayTest { } assertArrayEquals(expectedBytes, actualBytes); - } finally { - bytesIStream.close(); } } -- 2.36.6