From 8876195762fec76b9651bd1050dd7d71a529dda1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 6 Aug 2017 00:36:33 +0200 Subject: [PATCH] Cleanup eclipse warnings - static methods - deprecated classes - raw types - unneded version declarations Change-Id: Ibfe2f1f3203ebca416d8badd1f149d669ddc2415 Signed-off-by: Robert Varga --- .../bgp/benchmark/app/AppPeerBenchmark.java | 3 +- .../bmp/impl/BmpDispatcherImplModule.java | 8 +-- .../protocol/bmp/impl/api/BmpDeployer.java | 1 - .../protocol/bmp/impl/app/BmpRibInWriter.java | 6 +-- .../bmp/impl/app/BmpRouterPeerImpl.java | 6 +-- .../bmp/impl/app/BmpMonitorImplTest.java | 7 +-- .../protocol/bmp/parser/BmpActivator.java | 2 +- .../bmp/parser/message/PeerUpHandler.java | 2 +- .../protocol/bmp/parser/message/TestUtil.java | 1 - .../AbstractBmpPerPeerMessageParser.java | 2 +- .../registry/SimpleBmpMessageRegistry.java | 2 +- .../AbstractBmpPerPeerMessageParserTest.java | 6 +-- bgp/cli/pom.xml | 1 - .../concepts/RouteDistinguisherUtilTest.java | 4 +- .../config/loader/impl/ConfigLoaderImpl.java | 2 +- bgp/controller-config/pom.xml | 1 - .../protocol/bgp/evpn/impl/BGPActivator.java | 8 ++- .../bgp/evpn/impl/EvpnRibSupport.java | 2 +- .../PMSITunnelAttributeHandler.java | 6 +-- .../bgp/evpn/impl/nlri/EvpnNlriParser.java | 6 +-- .../nlri/EvpnNlriAttributesParserTest.java | 4 +- .../flowspec/AbstractFlowspecNlriParser.java | 11 ++-- .../FlowspecL3vpnIpv4NlriParserTest.java | 38 +++++++------- .../FlowspecL3vpnIpv6NlriParserTest.java | 15 +++--- .../SimpleFlowspecIpv4NlriParserTest.java | 39 ++++++++------- .../SimpleFlowspecIpv6NlriParserTest.java | 14 +++--- .../bgp/labeled/unicast/LUNlriParserTest.java | 1 - .../bgp/linkstate/impl/BGPActivator.java | 6 +-- .../linkstate/impl/LinkstateRIBSupport.java | 4 +- .../attribute/LinkstateAttributeParser.java | 4 +- .../impl/nlri/AbstractPrefixNlriParser.java | 4 +- .../linkstate/impl/nlri/LinkNlriParser.java | 6 +-- .../tlvs/AbstractNodeDescriptorTlvCodec.java | 4 +- .../bgp/linkstate/SrAttributeParserTest.java | 4 +- .../bgp/state/StateProviderImplTest.java | 10 ++-- .../bgp/parser/impl/BGPActivator.java | 8 +-- .../impl/message/BGPUpdateMessageParser.java | 2 +- .../impl/AddPathCapabilityHandlerTest.java | 37 ++++++++------ .../MultiProtocolCapabilityHandlerTest.java | 35 +++++++------ .../protocol/bgp/parser/impl/OpenTest.java | 6 +-- .../parser/mock/BGPMessageParserMockTest.java | 4 +- .../protocol/bgp/parser/spi/MessageUtil.java | 12 ++--- .../parser/spi/pojo/SimpleNlriRegistry.java | 18 +++---- .../bgp/mode/impl/BestPathStateImpl.java | 8 +-- .../impl/add/AddPathAbstractRouteEntry.java | 7 +-- .../n/paths/AddPathBestNPathSelection.java | 6 +-- .../mode/spi/AbstractBestPathSelector.java | 4 +- .../bgp/mode/spi/AbstractRouteEntry.java | 28 ++++++----- .../bgp/mode/impl/AbstractRouteEntryTest.java | 23 +++++---- .../bgp/mode/impl/base/BaseBestPathTest.java | 1 - .../mode/impl/base/BasePathSelectorTest.java | 24 ++++----- .../mode/impl/base/BaseRouteEntryTest.java | 3 +- .../peer/acceptor/BGPPeerAcceptorImpl.java | 2 +- bgp/rib-impl/pom.xml | 1 - .../bgp/rib/impl/BGPDispatcherImplModule.java | 8 +-- .../yang/bgp/rib/impl/BGPPeerModule.java | 4 +- .../yang/bgp/rib/impl/RIBImplModule.java | 2 +- .../rib/impl/StrictBgpPeerRegistryModule.java | 4 +- .../impl/AbstractReflectingExportPolicy.java | 2 +- .../protocol/bgp/rib/impl/AdjRibInWriter.java | 14 +++--- .../bgp/rib/impl/AttributeOperations.java | 13 +++-- .../bgp/rib/impl/BGPDispatcherImpl.java | 27 +++++----- .../protocol/bgp/rib/impl/BgpPeerRpc.java | 6 +-- .../bgp/rib/impl/PeerExportGroupImpl.java | 1 - .../protocol/bgp/rib/impl/RIBImpl.java | 4 +- .../bgp/rib/impl/config/BgpDeployerImpl.java | 23 ++++----- .../protocol/BGPProtocolSessionPromise.java | 21 ++++---- .../impl/protocol/BGPReconnectPromise.java | 19 ++++--- .../peer/route/PerTableTypeRouteCounter.java | 8 ++- .../bgp/rib/impl/AbstractRIBTestSetup.java | 12 +++-- .../bgp/rib/impl/AdjRibsInWriterTest.java | 2 +- .../bgp/rib/impl/AttributeOperationsTest.java | 10 ++-- .../bgp/rib/impl/ExportPolicyTest.java | 16 +++--- .../impl/FromExternalImportPolicyTest.java | 11 ++-- .../bgp/rib/impl/ParserToSalTest.java | 15 ++---- .../rib/impl/StrictBGPPeerRegistryTest.java | 2 +- .../impl/SynchronizationAndExceptionTest.java | 50 ++++++++++--------- .../bgp/rib/impl/config/AbstractConfig.java | 8 +-- .../rib/impl/config/BgpDeployerImplTest.java | 10 ++-- .../bgp/rib/impl/config/RibImplTest.java | 6 +-- .../protocol/bgp/rib/mock/BGPMock.java | 16 +++--- .../bgp/rib/spi/AbstractRIBSupport.java | 4 +- .../bgp/rib/spi/ExportPolicyPeerTracker.java | 4 +- .../protocol/bgp/rib/spi/PeerExportGroup.java | 2 - .../spi/MultiPathAbstractRIBSupportTest.java | 6 +-- .../protocol/bgp/testtool/BGPTestTool.java | 2 +- bgp/topology-provider/pom.xml | 1 - .../AbstractReachabilityTopologyBuilder.java | 2 +- .../provider/AbstractTopologyBuilder.java | 14 +++--- .../provider/LinkstateTopologyBuilder.java | 10 ++-- .../config/BackwardsCssTopologyProvider.java | 5 +- .../Ipv4ReachabilityTopologyBuilderTest.java | 2 +- .../Ipv6ReachabilityTopologyBuilderTest.java | 2 +- .../LinkstateTopologyBuilderTest.java | 11 ++-- .../bgp/util/BGPBinaryFileParserTest.java | 2 +- .../pcep/PcepRpcServicesRoutingTest.java | 19 ++++--- .../protocol/pcep/PCEPDispatcher.java | 6 +-- .../parser/BaseParserExtensionActivator.java | 24 +++++---- .../message/PCEPErrorMessageParser.java | 5 +- .../PCEPMonitoringReplyMessageParser.java | 3 +- .../message/PCEPReplyMessageParser.java | 8 +-- .../message/PCEPRequestMessageParser.java | 9 ++-- .../parser/object/PCEPLspaObjectParser.java | 2 +- .../parser/tlv/PathSetupTypeTlvParser.java | 8 +-- .../CInitiated00PCInitiateMessageParser.java | 3 +- .../ietf/stateful07/PathBindingTlvParser.java | 14 +++--- .../Stateful07ErrorMessageParser.java | 7 +-- .../Stateful07PCReportMessageParser.java | 23 +++++---- ...tateful07PCUpdateRequestMessageParser.java | 10 ++-- .../Stateful07RSVPErrorSpecTlvParser.java | 10 ++-- .../SyncOptimizationsLspObjectParser.java | 9 +--- .../pcep/impl/PCEPDispatcherImplModule.java | 8 +-- .../impl/AbstractPCEPSessionNegotiator.java | 2 +- .../pcep/impl/PCEPDispatcherImpl.java | 4 +- .../pcep/impl/PCEPProtocolSessionPromise.java | 12 ++--- .../protocol/pcep/impl/spi/Util.java | 12 ++--- .../pcep/impl/PCEPDispatcherImplTest.java | 9 ++-- .../pcep/impl/PCEPObjectParserTest.java | 2 +- .../pcep/impl/PCEPRROSubobjectParserTest.java | 2 +- .../pcep/impl/PCEPSessionImplTest.java | 1 - .../pcep/impl/PCEPXROSubobjectParserTest.java | 2 +- .../pcc/mock/protocol/PCCDispatcherImpl.java | 3 +- .../mock/protocol/PCCReconnectPromise.java | 7 ++- .../mock/PCCTriggeredFullDBResyncTest.java | 2 +- .../pcc/mock/PCCTriggeredLspResyncTest.java | 2 +- .../pcep/pcc/mock/PCCTriggeredSyncTest.java | 2 +- .../pcc/mock/PCCTunnelManagerImplTest.java | 17 ++++--- .../pcep/pcc/mock/TestingSessionListener.java | 2 +- .../pcep/spi/AbstractMessageParser.java | 2 +- .../provider/PCEPTopologyProvider.java | 2 +- .../provider/ServerSessionManager.java | 23 +++++---- .../provider/AbstractPCEPSessionTest.java | 2 +- .../spi/AbstractInstructionExecutor.java | 5 +- .../CreateTunnelInstructionExecutor.java | 6 +-- .../DestroyTunnelInstructionExecutor.java | 4 +- .../tunnel/provider/NodeChangedListener.java | 3 +- .../UpdateTunnelInstructionExecutor.java | 6 +-- .../provider/TunnelProgrammingTest.java | 8 +-- .../rsvp/parser/impl/RSVPActivator.java | 12 +++-- .../impl/te/ProtectionCommonParser.java | 6 ++- .../parser/impl/RROSubobjectParserTest.java | 2 +- .../spi/subobjects/CommonPathKeyParser.java | 6 +-- ...monUnnumberedInterfaceSubobjectParser.java | 4 +- .../subobjects/CUISubobjectParserTest.java | 9 ++-- .../subobjects/CommonPathKeyParserTest.java | 9 ++-- .../EROSubobjectListParserTest.java | 5 +- .../opendaylight/protocol/util/CheckUtil.java | 3 +- .../protocol/util/CheckUtilTest.java | 14 +++--- 148 files changed, 625 insertions(+), 605 deletions(-) diff --git a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java index d512941c01..beb29f48fd 100644 --- a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java +++ b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java @@ -14,6 +14,7 @@ import com.google.common.base.Stopwatch; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Collections; import java.util.List; import java.util.concurrent.Future; @@ -131,7 +132,7 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact LOG.error("Failed to create Empty Structure for Application Peer Benchmark {}", AppPeerBenchmark.this.appRibId, throwable); } - }); + }, MoreExecutors.directExecutor()); } @Override diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java index 634c4021ea..e29114dd10 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java @@ -48,18 +48,18 @@ public class BmpDispatcherImplModule extends AbstractBmpDispatcherImplModule { // instance will be closed via blueprint. return Reflection.newProxy(BmpDispatcher.class, new AbstractInvocationHandler() { @Override - protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { + protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) throws Throwable { if (method.getName().equals("close")) { tracker.close(); return null; - } else { - return method.invoke(service, args); } + + return method.invoke(service, args); } }); } - void setBundleContext(BundleContext bundleContext) { + void setBundleContext(final BundleContext bundleContext) { this.bundleContext = bundleContext; } } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/api/BmpDeployer.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/api/BmpDeployer.java index 0d6cf5ba48..2eea47c82c 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/api/BmpDeployer.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/api/BmpDeployer.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.bmp.impl.api; import com.google.common.annotations.Beta; -import java.util.concurrent.ExecutionException; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.config.rev170517.odl.bmp.monitors.BmpMonitorConfig; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRibInWriter.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRibInWriter.java index 803fee00cc..94f2800247 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRibInWriter.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRibInWriter.java @@ -118,7 +118,7 @@ final class BmpRibInWriter { * @param tx * @return */ - private ImmutableMap.Builder createTableInstance(final Set tableTypes, + private static ImmutableMap.Builder createTableInstance(final Set tableTypes, final YangInstanceIdentifier yangTableRootIId, final DOMDataWriteTransaction tx, final RIBExtensionConsumerContext ribExtensions, final BindingCodecTree tree) { @@ -178,7 +178,7 @@ final class BmpRibInWriter { * @param message Update message containing prefixes in NLRI * @return MpReachNlri with prefixes from the nlri field */ - private MpReachNlri prefixesToMpReach(final UpdateMessage message) { + private static MpReachNlri prefixesToMpReach(final UpdateMessage message) { final List prefixes = new ArrayList<>(); for (final Ipv4Prefix p : message.getNlri().getNlri()) { prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build()); @@ -200,7 +200,7 @@ final class BmpRibInWriter { * @param message Update message containing withdrawn routes * @return MpUnreachNlri with prefixes from the withdrawn routes field */ - private MpUnreachNlri prefixesToMpUnreach(final UpdateMessage message) { + private static MpUnreachNlri prefixesToMpUnreach(final UpdateMessage message) { final List prefixes = new ArrayList<>(); for (final Ipv4Prefix p : message.getWithdrawnRoutes().getWithdrawnRoutes()) { prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build()); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java index 50613b1f71..65baeb17e9 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java @@ -208,7 +208,7 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { this.up = false; } - private Set setPeerTables(final ReceivedOpen open) { + private static Set setPeerTables(final ReceivedOpen open) { final Set tables = Sets.newHashSet(DEFAULT_TABLE); for (final BgpParameters param : open.getBgpParameters()) { for (final OptionalCapabilities optCapa : param.getOptionalCapabilities()) { @@ -274,7 +274,7 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { return mapEntryBuilder.build(); } - private ContainerNode createStats(final Stat stat, final Timestamp timestamp) { + private static ContainerNode createStats(final Stat stat, final Timestamp timestamp) { final DataContainerNodeAttrBuilder builder = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(Stats.QNAME)); builder.withChild(ImmutableNodes.leafNode(PEER_STATS_TIMESTAMP_QNAME, timestamp.getValue())); @@ -340,7 +340,7 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { } } - private ContainerNode createMirrors(final Mirror mirror, final Timestamp timestamp) { + private static ContainerNode createMirrors(final Mirror mirror, final Timestamp timestamp) { final DataContainerNodeAttrBuilder builder = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(Mirrors.QNAME)); builder.withChild(ImmutableNodes.leafNode(PEER_MIRROR_INFORMATION_QNAME, toDom(MirrorInformationCode.forValue( diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java index 7168519152..4cf7cb382f 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java @@ -284,7 +284,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest { }); } - private void waitWriteAndFlushSuccess(final ChannelFuture channelFuture) throws InterruptedException { + private static void waitWriteAndFlushSuccess(final ChannelFuture channelFuture) { waitFutureSuccess(channelFuture); } @@ -460,7 +460,8 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest { monitoringStation2.close(); } - private Channel connectTestClient(final String routerIp, final BmpMessageRegistry msgRegistry) throws InterruptedException { + private static Channel connectTestClient(final String routerIp, final BmpMessageRegistry msgRegistry) + throws InterruptedException { final BmpHandlerFactory hf = new BmpHandlerFactory(msgRegistry); final Bootstrap b = new Bootstrap(); final EventLoopGroup workerGroup; @@ -487,7 +488,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest { return future.channel(); } - private RouterId getRouterId(final String routerIp) { + private static RouterId getRouterId(final String routerIp) { return new RouterId(new IpAddress(new Ipv4Address(routerIp))); } } diff --git a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java index e3ddd1058e..5a659b7a8c 100644 --- a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/BmpActivator.java @@ -127,7 +127,7 @@ public final class BmpActivator extends AbstractBmpExtensionProviderActivator { } - private void registerBmpTlvHandlers(final List regs, final BmpExtensionProviderContext context) { + private static void registerBmpTlvHandlers(final List regs, final BmpExtensionProviderContext context) { final DescriptionTlvHandler descriptionTlvHandler = new DescriptionTlvHandler(); regs.add(context.registerBmpInitiationTlvParser(DescriptionTlvHandler.TYPE, descriptionTlvHandler)); regs.add(context.registerBmpInitiationTlvSerializer(DescriptionTlv.class, descriptionTlvHandler)); diff --git a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java index 18292060f9..c9fbad13f1 100644 --- a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java @@ -129,7 +129,7 @@ public class PeerUpHandler extends AbstractBmpPerPeerMessageParserbuilder(); + final ImmutableList.Builder stringInfoListBuilder = ImmutableList.builder(); if ( builder.getStringInformation() != null ) { stringInfoListBuilder.addAll(builder.getStringInformation()); } diff --git a/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java index b10855dff2..a1c79d07af 100644 --- a/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java @@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.MultiExitDiscBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.OriginBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.OriginatorIdBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.UnrecognizedAttributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.aigp.AigpTlvBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.as.path.Segments; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.as.path.SegmentsBuilder; diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java index a80a4ad95b..955237c0b7 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java @@ -56,7 +56,7 @@ public abstract class AbstractBmpPerPeerMessageParser> ext } } - protected final PeerHeader parsePerPeerHeader(final ByteBuf bytes) { + protected static final PeerHeader parsePerPeerHeader(final ByteBuf bytes) { Preconditions.checkArgument(bytes.readableBytes() >= PER_PEER_HEADER_SIZE); final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder(); final PeerType peerType = PeerType.forValue(bytes.readByte()); diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java index 5162bf20c7..71d59ce0a4 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java @@ -62,7 +62,7 @@ public class SimpleBmpMessageRegistry implements BmpMessageRegistry { serializer.serializeMessage(message, buffer); } - private int parseMessageHeader(final ByteBuf buffer) throws BmpDeserializationException { + private static int parseMessageHeader(final ByteBuf buffer) throws BmpDeserializationException { Preconditions.checkArgument(buffer != null && buffer.isReadable(), "Array of bytes cannot be null or empty."); Preconditions.checkArgument(buffer.readableBytes() >= COMMON_HEADER_LENGTH, "Too few bytes in passed array. Passed: %s. Expected: >= %s.", buffer.readableBytes(), COMMON_HEADER_LENGTH); diff --git a/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java b/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java index d2be5b335f..db1b5f4f88 100644 --- a/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java +++ b/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java @@ -85,7 +85,7 @@ public class AbstractBmpPerPeerMessageParserTest { (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, // Timestamp }; - final PeerHeader perHeader = this.parser.parsePerPeerHeader(Unpooled.wrappedBuffer(msgBytes)); + final PeerHeader perHeader = AbstractBmpPerPeerMessageParser.parsePerPeerHeader(Unpooled.wrappedBuffer(msgBytes)); final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder(); phBuilder.setType(PeerType.forValue(0)); @@ -106,7 +106,7 @@ public class AbstractBmpPerPeerMessageParserTest { @Test public void testPerPeerHeaderIpv6() { - final PeerHeader perHeader = this.parser.parsePerPeerHeader(Unpooled.wrappedBuffer(this.ipv6MsgWithDistinguishergBytes)); + final PeerHeader perHeader = AbstractBmpPerPeerMessageParser.parsePerPeerHeader(Unpooled.wrappedBuffer(this.ipv6MsgWithDistinguishergBytes)); final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder(); phBuilder.setType(PeerType.L3vpn); @@ -138,7 +138,7 @@ public class AbstractBmpPerPeerMessageParserTest { @Test public void testSerializeMessageBody() { - final PeerHeader perHeader = this.parser.parsePerPeerHeader(Unpooled.wrappedBuffer(this.ipv6MsgWithDistinguishergBytes)); + final PeerHeader perHeader = AbstractBmpPerPeerMessageParser.parsePerPeerHeader(Unpooled.wrappedBuffer(this.ipv6MsgWithDistinguishergBytes)); final PeerUpNotification peerNotif = new PeerUpNotificationBuilder().setPeerHeader(perHeader).build(); diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml index 3c3bd51e1f..ed85248c2c 100644 --- a/bgp/cli/pom.xml +++ b/bgp/cli/pom.xml @@ -67,7 +67,6 @@ org.apache.karaf.shell org.apache.karaf.shell.console - ${karaf.version} provided diff --git a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java index b5c3adc4ba..37e5676f80 100644 --- a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java +++ b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java @@ -9,6 +9,7 @@ package org.opendaylight.bgp.concepts; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.lang.reflect.Constructor; @@ -110,7 +111,8 @@ public class RouteDistinguisherUtilTest { * @param assignedNumberSubfield * @return */ - private RouteDistinguisher createRouteDistinguisher(final int type, final String administratorSubfield, final String assignedNumberSubfield) { + private static RouteDistinguisher createRouteDistinguisher(final int type, final String administratorSubfield, + final String assignedNumberSubfield) { final StringBuffer routeDistiguisher = new StringBuffer(); if (type == 0) { routeDistiguisher.append(type).append(SEPARATOR); diff --git a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java index 34f5650571..8f8117817e 100644 --- a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java +++ b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java @@ -152,7 +152,7 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable { try { final WatchKey key = watchService.take(); if (key != null) { - for (final WatchEvent event : key.pollEvents()) { + for (final WatchEvent event : key.pollEvents()) { handleEvent(event.context().toString()); } final boolean reset = key.reset(); diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml index ff40735ff0..51abc7aac3 100644 --- a/bgp/controller-config/pom.xml +++ b/bgp/controller-config/pom.xml @@ -41,7 +41,6 @@ maven-remote-resources-plugin - 1.5 diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java index c3480b9bfb..96108e5540 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java @@ -53,13 +53,13 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { return regs; } - private void registerAttributesHandler(final BGPExtensionProviderContext context, final List regs) { + private static void registerAttributesHandler(final BGPExtensionProviderContext context, final List regs) { final PMSITunnelAttributeHandler pmsiParser = new PMSITunnelAttributeHandler(context.getAddressFamilyRegistry()); regs.add(context.registerAttributeParser(pmsiParser.getType(), pmsiParser)); regs.add(context.registerAttributeSerializer(pmsiParser.getClazz(), pmsiParser)); } - private void registerNlriHandler(final BGPExtensionProviderContext context, final List regs) { + private static void registerNlriHandler(final BGPExtensionProviderContext context, final List regs) { final NextHopParserSerializer nextHopParser = new NextHopParserSerializer() {}; final EvpnNlriParser nlriHandler = new EvpnNlriParser(); regs.add(context.registerNlriParser(L2vpnAddressFamily.class, EvpnSubsequentAddressFamily.class, @@ -67,7 +67,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(context.registerNlriSerializer(EvpnRoutes.class, nlriHandler)); } - private void registerExtendedCommunities(final BGPExtensionProviderContext context, final List regs) { + private static void registerExtendedCommunities(final BGPExtensionProviderContext context, final List regs) { final DefaultGatewayExtCom defGEC = new DefaultGatewayExtCom(); regs.add(context.registerExtendedCommunityParser(defGEC.getType(true), defGEC.getSubType(), defGEC)); regs.add(context.registerExtendedCommunitySerializer(DefaultGatewayExtendedCommunityCase.class, defGEC)); @@ -88,6 +88,4 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(context.registerExtendedCommunityParser(l2a.getType(false), l2a.getSubType(), l2a)); regs.add(context.registerExtendedCommunitySerializer(Layer2AttributesExtendedCommunityCase.class, l2a)); } - - } diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnRibSupport.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnRibSupport.java index 58fa84907d..871a27704a 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnRibSupport.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnRibSupport.java @@ -91,7 +91,7 @@ final class EvpnRibSupport extends AbstractRIBSupport { return new DestinationEvpnCaseBuilder().setDestinationEvpn(new DestinationEvpnBuilder().setEvpnDestination(extractRoutes(routes)).build()).build(); } - private List extractRoutes(final Collection routes) { + private static List extractRoutes(final Collection routes) { return routes.stream().map(EvpnNlriParser::extractEvpnDestination).collect(Collectors.toList()); } diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/PMSITunnelAttributeHandler.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/PMSITunnelAttributeHandler.java index 90b69956c5..003c2d132d 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/PMSITunnelAttributeHandler.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/PMSITunnelAttributeHandler.java @@ -53,7 +53,7 @@ public final class PMSITunnelAttributeHandler implements AttributeParser, Attrib builder.addAugmentation(PmsiTunnelAugmentation.class, new PmsiTunnelAugmentationBuilder().setPmsiTunnel(pmsiTunnelBuilder.build()).build()); } - private void parseMpls(final PmsiTunnelBuilder pmsiTunnelBuilder, final ByteBuf buffer) { + private static void parseMpls(final PmsiTunnelBuilder pmsiTunnelBuilder, final ByteBuf buffer) { final MplsLabel mpls = MplsLabelUtil.mplsLabelForByteBuf(buffer); if(mpls.getValue() != 0) { pmsiTunnelBuilder.setMplsLabel(mpls); @@ -84,14 +84,14 @@ public final class PMSITunnelAttributeHandler implements AttributeParser, Attrib AttributeUtil.formatAttribute(AttributeUtil.OPTIONAL, getType(), body, byteAggregator); } - private void serializeMpls(final MplsLabel mplsLabel, final ByteBuf body) { + private static void serializeMpls(final MplsLabel mplsLabel, final ByteBuf body) { if(mplsLabel == null) { body.writeZero(MPLS_LENGTH); } body.writeBytes(MplsLabelUtil.byteBufForMplsLabel(mplsLabel)); } - private void serializeFlag(final PmsiTunnel pmsiTunnelAttribute, final ByteBuf body) { + private static void serializeFlag(final PmsiTunnel pmsiTunnelAttribute, final ByteBuf body) { body.writeBoolean(pmsiTunnelAttribute.isLeafInformationRequired()); } diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParser.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParser.java index 4ea0c16386..65f700f25b 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParser.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParser.java @@ -101,7 +101,7 @@ public final class EvpnNlriParser implements NlriParser, NlriSerializer { } @Nullable - private List parseNlri(final ByteBuf nlri) { + private static List parseNlri(final ByteBuf nlri) { if (!nlri.isReadable()) { return null; } @@ -126,8 +126,8 @@ public final class EvpnNlriParser implements NlriParser, NlriSerializer { final Attributes1 pathAttributes1 = pathAttributes.getAugmentation(Attributes1.class); final Attributes2 pathAttributes2 = pathAttributes.getAugmentation(Attributes2.class); if (pathAttributes1 != null) { - final AdvertizedRoutes routes = (pathAttributes1.getMpReachNlri()).getAdvertizedRoutes(); - if ((routes != null) && (routes.getDestinationType() instanceof DestinationEvpnCase)) { + final AdvertizedRoutes routes = pathAttributes1.getMpReachNlri().getAdvertizedRoutes(); + if (routes != null && routes.getDestinationType() instanceof DestinationEvpnCase) { final DestinationEvpnCase evpnCase = (DestinationEvpnCase) routes.getDestinationType(); serializeNlri(evpnCase.getDestinationEvpn().getEvpnDestination(), byteAggregator); } diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java index 12a57d6ed8..17373c3e08 100644 --- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java +++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java @@ -56,7 +56,7 @@ public class EvpnNlriAttributesParserTest { assertArrayEquals(IncMultEthTagRParserTest.RESULT, ByteArray.getAllBytes(buffer)); } - private MpReachNlri createReach() { + private static MpReachNlri createReach() { final MpReachNlriBuilder mpReachExpected = new MpReachNlriBuilder(); final AdvertizedRoutes wd = new AdvertizedRoutesBuilder().setDestinationType(new DestinationEvpnCaseBuilder() .setDestinationEvpn(new DestinationEvpnBuilder().setEvpnDestination(Collections.singletonList(new EvpnDestinationBuilder() @@ -73,7 +73,7 @@ public class EvpnNlriAttributesParserTest { assertArrayEquals(IncMultEthTagRParserTest.RESULT, ByteArray.getAllBytes(buffer)); } - private MpUnreachNlri createUnreach() { + private static MpUnreachNlri createUnreach() { final MpUnreachNlriBuilder mpReachExpected = new MpUnreachNlriBuilder(); final WithdrawnRoutes wd = new WithdrawnRoutesBuilder().setDestinationType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev160321.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationEvpnCaseBuilder() .setDestinationEvpn(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev160321.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.destination.evpn._case.DestinationEvpnBuilder().setEvpnDestination(Collections.singletonList(new EvpnDestinationBuilder() 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 03db6723a6..72c7a0a433 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 @@ -149,7 +149,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri private static final String FLOW_SEPARATOR = " AND "; - protected AbstractFlowspecNlriParser(SimpleFlowspecTypeRegistry flowspecTypeRegistry) { + protected AbstractFlowspecNlriParser(final SimpleFlowspecTypeRegistry flowspecTypeRegistry) { this.flowspecTypeRegistry = Preconditions.checkNotNull(flowspecTypeRegistry); } @@ -187,7 +187,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri final Attributes2 pathAttributes2 = pathAttributes.getAugmentation(Attributes2.class); if (pathAttributes1 != null) { - final AdvertizedRoutes routes = (pathAttributes1.getMpReachNlri()).getAdvertizedRoutes(); + final AdvertizedRoutes routes = pathAttributes1.getMpReachNlri().getAdvertizedRoutes(); if (routes != null) { serializeMpReachNlri(routes.getDestinationType(), byteAggregator); } @@ -636,8 +636,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } @Nullable - protected final PathId readPathId(@Nonnull final ByteBuf nlri, final Class afi, final Class safi, - final PeerSpecificParserConstraint constraint) { + protected static final PathId readPathId(@Nonnull final ByteBuf nlri, final Class afi, + final Class safi, final PeerSpecificParserConstraint constraint) { if (MultiPathSupportUtil.isTableTypeSupported(constraint, new BgpTableTypeImpl(afi, safi))) { return PathIdUtil.readPathId(nlri); } @@ -645,7 +645,8 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } @Override - public final void parseNlri(@Nonnull final ByteBuf nlri, @Nonnull final MpUnreachNlriBuilder builder, @Nullable final PeerSpecificParserConstraint constraint) + public final void parseNlri(@Nonnull final ByteBuf nlri, @Nonnull final MpUnreachNlriBuilder builder, + @Nullable final PeerSpecificParserConstraint constraint) throws BGPParsingException { if (!nlri.isReadable()) { return; diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java index feb29e5958..2403199dc2 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java @@ -26,6 +26,7 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractNumericOperandParser; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractOperandParser; import org.opendaylight.protocol.bgp.flowspec.handlers.BitmaskOperandParser; +import org.opendaylight.protocol.bgp.flowspec.l3vpn.AbstractFlowspecL3vpnNlriParser; import org.opendaylight.protocol.bgp.flowspec.l3vpn.ipv4.FlowspecL3vpnIpv4NlriParser; import org.opendaylight.protocol.bgp.parser.BGPParsingException; import org.opendaylight.protocol.bgp.parser.spi.MultiPathSupport; @@ -207,7 +208,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); - final DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) (result.getAdvertizedRoutes().getDestinationType())) + final DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv4(); final List flows = flowspecDst.getFlowspec(); final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher(); @@ -233,7 +234,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } - private void testFlows( + private static void testFlows( final List flows, final DestinationPrefixCase destinationPrefix, final SourcePrefixCase sourcePrefix, @@ -253,17 +254,17 @@ public class FlowspecL3vpnIpv4NlriParserTest { assertEquals(sps, flows.get(5).getFlowspecType()); } - private FlowspecType createSps() { + private static FlowspecType createSps() { final List sports = Lists.newArrayList(new SourcePortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(8080).build()); return new SourcePortCaseBuilder().setSourcePorts(sports).build(); } - private FlowspecType createProts() { + private static FlowspecType createProts() { final List protocols = Lists.newArrayList(new ProtocolIpsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue((short) 6).build()); return new ProtocolIpCaseBuilder().setProtocolIps(protocols).build(); } - private FlowspecType createDps() { + private static FlowspecType createDps() { final List destports = Lists.newArrayList(new DestinationPortsBuilder().setOp(new NumericOperand(false, false, false, true, false)).setValue(4089).build(), new DestinationPortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(179).build()); return new DestinationPortCaseBuilder().setDestinationPorts(destports).build(); @@ -305,7 +306,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); - final DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) (result.getAdvertizedRoutes().getDestinationType())) + final DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv4(); final List flows = flowspecDst.getFlowspec(); final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher(); @@ -332,7 +333,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } - private PortCase createPorts() { + private static PortCase createPorts() { final List ports = Lists.newArrayList(new PortsBuilder().setOp(new NumericOperand(false, false, true, true, false)).setValue(137).build(), new PortsBuilder().setOp(new NumericOperand(true, false, true, false, true)).setValue(139).build(), new PortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(8080).build()); @@ -378,7 +379,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); - DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) (result.getWithdrawnRoutes().getDestinationType())) + DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv4(); final List flows = flowspecDst.getFlowspec(); checkUnreachFlows(flows, icmpType, icmpCode, tcp, packet, dscp, fragment); @@ -407,42 +408,43 @@ public class FlowspecL3vpnIpv4NlriParserTest { } - private FlowspecType createFragment() { + private static FlowspecType createFragment() { final List fragments = Lists.newArrayList(new FragmentsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(new Fragment(false, true, true, true)).build()); return new FragmentCaseBuilder().setFragments(fragments).build(); } - private FlowspecType createDscp() { + private static FlowspecType createDscp() { final List dscps = Lists.newArrayList(new DscpsBuilder().setOp(new NumericOperand(false, true, false, true, false)).setValue(new Dscp((short) 42)).build()); return new DscpCaseBuilder().setDscps(dscps).build(); } - private PacketLengthCase createPackets() { + private static PacketLengthCase createPackets() { final List packets = Lists.newArrayList(new PacketLengthsBuilder().setOp(new NumericOperand(false, true, false, false, true)) .setValue(57005).build()); return new PacketLengthCaseBuilder().setPacketLengths(packets).build(); } - private TcpFlagsCase createTcp() { + private static TcpFlagsCase createTcp() { final List flags = Lists.newArrayList(new TcpFlagsBuilder().setOp(new BitmaskOperand(false, false, false, true)).setValue(1025).build(), new TcpFlagsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(22193).build()); return new TcpFlagsCaseBuilder().setTcpFlags(flags).build(); } - private FlowspecType createIcmpCode() { + private static FlowspecType createIcmpCode() { final List codes = Lists.newArrayList(new CodesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 4).build(), new CodesBuilder().setOp(new NumericOperand(false, true, false, false, false)).setValue((short) 5).build()); return new IcmpCodeCaseBuilder().setCodes(codes).build(); } - private FlowspecType createIcmpType() { + private static FlowspecType createIcmpType() { final List types = Lists.newArrayList(new TypesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 2).build(), new TypesBuilder().setOp(new NumericOperand(false, true, false, false, true)).setValue((short) 3).build()); return new IcmpTypeCaseBuilder().setTypes(types).build(); } - private void checkUnreachFlows(final List flows, final FlowspecType icmpType, final FlowspecType icmpCode, final TcpFlagsCase tcp, - final PacketLengthCase packet, final FlowspecType dscp, final FlowspecType fragment) { + private static void checkUnreachFlows(final List flows, final FlowspecType icmpType, + final FlowspecType icmpCode, final TcpFlagsCase tcp, + final PacketLengthCase packet, final FlowspecType dscp, final FlowspecType fragment) { assertEquals(6, flows.size()); assertEquals(icmpType, flows.get(0).getFlowspecType()); assertEquals(icmpCode, flows.get(1).getFlowspecType()); @@ -490,7 +492,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); - DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) (result.getWithdrawnRoutes().getDestinationType())) + DestinationFlowspecL3vpnIpv4 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv4Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv4(); final List flows = flowspecDst.getFlowspec(); checkUnreachFlows(flows, icmpType, icmpCode, tcp, packet, dscp, fragment); @@ -802,7 +804,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { ); RouteDistinguisher rd = RouteDistinguisherBuilder.getDefaultInstance(ROUTE_DISTINGUISHER); - assertEquals(rd, extractRouteDistinguisher(entry.build(), this.FS_PARSER.RD_NID)); + assertEquals(rd, extractRouteDistinguisher(entry.build(), AbstractFlowspecL3vpnNlriParser.RD_NID)); } } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java index 3325f06388..40cb5bd1fb 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java @@ -10,6 +10,7 @@ package org.opendaylight.protocol.bgp.flowspec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.opendaylight.protocol.bgp.flowspec.SimpleFlowspecIpv4NlriParserTest.PATH_ID; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; import io.netty.buffer.ByteBuf; @@ -148,7 +149,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); - DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) + DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv6(); final List flows = flowspecDst.getFlowspec(); @@ -203,7 +204,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); - final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) + final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv6(); final List flows = flowspecDst.getFlowspec(); final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher(); @@ -253,7 +254,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); - final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) + final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv6(); final List flows = flowspecDst.getFlowspec(); final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher(); @@ -282,13 +283,13 @@ public class FlowspecL3vpnIpv6NlriParserTest { assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } - private FragmentCase createFragment() { + private static FragmentCase createFragment() { final List fragments = Lists.newArrayList(new FragmentsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(new Fragment(false, true, true, true)).build()); return new FragmentCaseBuilder().setFragments(fragments).build(); } - private FlowspecType createLabel() { - final List labels = Lists.newArrayList(); + private static FlowspecType createLabel() { + final List labels = new ArrayList<>(2); labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build()); labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build()); return new FlowLabelCaseBuilder().setFlowLabel(labels).build(); @@ -314,7 +315,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); - final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) + final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspecL3vpnIpv6(); final List flows = flowspecDst.getFlowspec(); final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher(); diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java index a6bce08c98..c6f2ff23b9 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java @@ -9,7 +9,6 @@ package org.opendaylight.protocol.bgp.flowspec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -213,7 +212,7 @@ public class SimpleFlowspecIpv4NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) (result.getAdvertizedRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspec() .getFlowspec(); testFlows(flows, destinationPrefix, sourcePrefix, prots, ps, dps, sps); @@ -225,8 +224,9 @@ public class SimpleFlowspecIpv4NlriParserTest { assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } - private void testFlows(final List flows, final DestinationPrefixCase destinationPrefix, final SourcePrefixCase sourcePrefix, - final FlowspecType prots, final PortCase ps, final FlowspecType dps, final FlowspecType sps) { + private static void testFlows(final List flows, final DestinationPrefixCase destinationPrefix, + final SourcePrefixCase sourcePrefix, final FlowspecType prots, final PortCase ps, final FlowspecType dps, + final FlowspecType sps) { assertEquals(6, flows.size()); assertEquals(destinationPrefix, flows.get(0).getFlowspecType()); assertEquals(sourcePrefix, flows.get(1).getFlowspecType()); @@ -236,17 +236,17 @@ public class SimpleFlowspecIpv4NlriParserTest { assertEquals(sps, flows.get(5).getFlowspecType()); } - private FlowspecType createSps() { + private static FlowspecType createSps() { final List sports = Lists.newArrayList(new SourcePortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(8080).build()); return new SourcePortCaseBuilder().setSourcePorts(sports).build(); } - private FlowspecType createProts() { + private static FlowspecType createProts() { final List protocols = Lists.newArrayList(new ProtocolIpsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue((short) 6).build()); return new ProtocolIpCaseBuilder().setProtocolIps(protocols).build(); } - private FlowspecType createDps() { + private static FlowspecType createDps() { final List destports = Lists.newArrayList(new DestinationPortsBuilder().setOp(new NumericOperand(false, false, false, true, false)).setValue(4089).build(), new DestinationPortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(179).build()); return new DestinationPortCaseBuilder().setDestinationPorts(destports).build(); @@ -299,7 +299,7 @@ public class SimpleFlowspecIpv4NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) (result.getAdvertizedRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspec() .getFlowspec(); testFlows(flows, destinationPrefix, sourcePrefix, prots, ps, dps, sps); @@ -311,7 +311,7 @@ public class SimpleFlowspecIpv4NlriParserTest { assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } - private PortCase createPorts() { + private static PortCase createPorts() { final List ports = Lists.newArrayList(new PortsBuilder().setOp(new NumericOperand(false, false, true, true, false)).setValue(137).build(), new PortsBuilder().setOp(new NumericOperand(true, false, true, false, true)).setValue(139).build(), new PortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(8080).build()); @@ -367,7 +367,7 @@ public class SimpleFlowspecIpv4NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCase) (result.getWithdrawnRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCase) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspec() .getFlowspec(); checkUnreachFlows(flows, icmpType, icmpCode, tcp, packet, dscp, fragment); @@ -383,42 +383,43 @@ public class SimpleFlowspecIpv4NlriParserTest { } - private FlowspecType createFragment() { + private static FlowspecType createFragment() { final List fragments = Lists.newArrayList(new FragmentsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(new Fragment(false, true, true, true)).build()); return new FragmentCaseBuilder().setFragments(fragments).build(); } - private FlowspecType createDscp() { + private static FlowspecType createDscp() { final List dscps = Lists.newArrayList(new DscpsBuilder().setOp(new NumericOperand(false, true, false, true, false)).setValue(new Dscp((short) 42)).build()); return new DscpCaseBuilder().setDscps(dscps).build(); } - private PacketLengthCase createPackets() { + private static PacketLengthCase createPackets() { final List packets = Lists.newArrayList(new PacketLengthsBuilder().setOp(new NumericOperand(false, true, false, false, true)) .setValue(57005).build()); return new PacketLengthCaseBuilder().setPacketLengths(packets).build(); } - private TcpFlagsCase createTcp() { + private static TcpFlagsCase createTcp() { final List flags = Lists.newArrayList(new TcpFlagsBuilder().setOp(new BitmaskOperand(false, false, false, true)).setValue(1025).build(), new TcpFlagsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(22193).build()); return new TcpFlagsCaseBuilder().setTcpFlags(flags).build(); } - private FlowspecType createIcmpCode() { + private static FlowspecType createIcmpCode() { final List codes = Lists.newArrayList(new CodesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 4).build(), new CodesBuilder().setOp(new NumericOperand(false, true, false, false, false)).setValue((short) 5).build()); return new IcmpCodeCaseBuilder().setCodes(codes).build(); } - private FlowspecType createIcmpType() { + private static FlowspecType createIcmpType() { final List types = Lists.newArrayList(new TypesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 2).build(), new TypesBuilder().setOp(new NumericOperand(false, true, false, false, true)).setValue((short) 3).build()); return new IcmpTypeCaseBuilder().setTypes(types).build(); } - private void checkUnreachFlows(final List flows, final FlowspecType icmpType, final FlowspecType icmpCode, final TcpFlagsCase tcp, - final PacketLengthCase packet, final FlowspecType dscp, final FlowspecType fragment) { + private static void checkUnreachFlows(final List flows, final FlowspecType icmpType, + final FlowspecType icmpCode, final TcpFlagsCase tcp, final PacketLengthCase packet, + final FlowspecType dscp, final FlowspecType fragment) { assertEquals(6, flows.size()); assertEquals(icmpType, flows.get(0).getFlowspecType()); assertEquals(icmpCode, flows.get(1).getFlowspecType()); @@ -477,7 +478,7 @@ public class SimpleFlowspecIpv4NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); parser.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCase) (result.getWithdrawnRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCase) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspec() .getFlowspec(); checkUnreachFlows(flows, icmpType, icmpCode, tcp, packet, dscp, fragment); diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java index c8e8c3ffa6..1da44f219a 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java @@ -152,7 +152,7 @@ public class SimpleFlowspecIpv6NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspec().getFlowspec(); assertEquals(3, flows.size()); assertEquals(destinationPrefix, flows.get(0).getFlowspecType()); @@ -202,7 +202,7 @@ public class SimpleFlowspecIpv6NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) result.getAdvertizedRoutes().getDestinationType()) .getDestinationFlowspec().getFlowspec(); assertEquals(3, flows.size()); assertEquals(destinationPrefix, flows.get(0).getFlowspecType()); @@ -246,7 +246,7 @@ public class SimpleFlowspecIpv6NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspec().getFlowspec(); assertEquals(2, flows.size()); assertEquals(fragment, flows.get(0).getFlowspecType()); @@ -260,13 +260,13 @@ public class SimpleFlowspecIpv6NlriParserTest { assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } - private FragmentCase createFragment() { + private static FragmentCase createFragment() { final List fragments = Lists.newArrayList(new FragmentsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(new Fragment(false, true, true, true)).build()); return new FragmentCaseBuilder().setFragments(fragments).build(); } - private FlowspecType createLabel() { - final List labels = Lists.newArrayList(); + private static FlowspecType createLabel() { + final List labels = new ArrayList<>(2); labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build()); labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build()); return new FlowLabelCaseBuilder().setFlowLabel(labels).build(); @@ -303,7 +303,7 @@ public class SimpleFlowspecIpv6NlriParserTest { result.setSafi(FlowspecSubsequentAddressFamily.class); this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); - final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) + final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) result.getWithdrawnRoutes().getDestinationType()) .getDestinationFlowspec().getFlowspec(); assertEquals(2, flows.size()); assertEquals(fragment, flows.get(0).getFlowspecType()); diff --git a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java index 9a3681c775..bd41631f9c 100755 --- a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java +++ b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java @@ -15,7 +15,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.List; import java.util.Optional; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java index 7c1ae46e9b..33b3977f10 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java @@ -123,7 +123,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { return regs; } - private void registerBindingSubTlvs(final List regs) { + private static void registerBindingSubTlvs(final List regs) { final SimpleBindingSubTlvsRegistry simpleReg = SimpleBindingSubTlvsRegistry.getInstance(); final SIDParser sidParser = new SIDParser(); @@ -167,7 +167,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(simpleReg.registerBindingSubTlvsSerializer(UnnumberedInterfaceIdBackupEroCase.class, backupUnnumberedParser)); } - private void registerNlriCodecs(final List regs, final SimpleNlriTypeRegistry nlriTypeReg) { + private static void registerNlriCodecs(final List regs, final SimpleNlriTypeRegistry nlriTypeReg) { final NodeNlriParser nodeParser = new NodeNlriParser(); regs.add(nlriTypeReg.registerNlriParser(nodeParser.getNlriType(), nodeParser)); @@ -191,7 +191,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { } - private void registerNlriTlvCodecs(final List regs, final SimpleNlriTypeRegistry nlriTypeReg) { + private static void registerNlriTlvCodecs(final List regs, final SimpleNlriTypeRegistry nlriTypeReg) { final LocalNodeDescriptorTlvParser localParser = new LocalNodeDescriptorTlvParser(); regs.add(nlriTypeReg.registerTlvParser(localParser.getType(), localParser)); diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java index f06663ef19..0437296d72 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java @@ -101,7 +101,7 @@ public final class LinkstateRIBSupport extends AbstractRIBSupport { } } - private NodeIdentifierWithPredicates createRouteKey(final UnkeyedListEntryNode linkstate) { + private static NodeIdentifierWithPredicates createRouteKey(final UnkeyedListEntryNode linkstate) { final ByteBuf buffer = Unpooled.buffer(); final CLinkstateDestination cLinkstateDestination = LinkstateNlriParser.extractLinkstateDestination(linkstate); SimpleNlriTypeRegistry.getInstance().serializeNlriType(cLinkstateDestination, buffer); @@ -124,7 +124,7 @@ public final class LinkstateRIBSupport extends AbstractRIBSupport { setCLinkstateDestination(extractRoutes(routes)).build()).build(); } - private List extractRoutes(final Collection routes) { + private static List extractRoutes(final Collection routes) { return routes.stream().map(LinkstateNlriParser::extractLinkstateDestination).collect(Collectors.toList()); } } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java index d8ca16911e..b9667f1a11 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java @@ -58,7 +58,7 @@ public final class LinkstateAttributeParser implements AttributeParser, Attribut private final RSVPTeObjectRegistry rsvpTeObjectRegistry; public LinkstateAttributeParser(final boolean isIanaAssignedType, final RSVPTeObjectRegistry rsvpTeObjectRegistry) { - this.type = (isIanaAssignedType) ? TYPE : LEGACY_TYPE; + this.type = isIanaAssignedType ? TYPE : LEGACY_TYPE; this.rsvpTeObjectRegistry = rsvpTeObjectRegistry; } @@ -93,7 +93,7 @@ public final class LinkstateAttributeParser implements AttributeParser, Attribut builder.addAugmentation(Attributes1.class, a); } - private CLinkstateDestination getNlriType(final AttributesBuilder pab) { + private static CLinkstateDestination getNlriType(final AttributesBuilder pab) { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.Attributes1 mpr = pab.getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.Attributes1.class); if (mpr != null && mpr.getMpReachNlri() != null) { final DestinationType dt = mpr.getMpReachNlri().getAdvertizedRoutes().getDestinationType(); diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/AbstractPrefixNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/AbstractPrefixNlriParser.java index 0f831d2802..895b56d60f 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/AbstractPrefixNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/AbstractPrefixNlriParser.java @@ -46,7 +46,7 @@ abstract class AbstractPrefixNlriParser extends AbstractNlriTypeCodec { serializePrefixDescriptor(prefix.getPrefixDescriptors(), buffer); } - private PrefixDescriptors parsePrefixDescriptor(final ByteBuf buffer) { + private static PrefixDescriptors parsePrefixDescriptor(final ByteBuf buffer) { final Map tlvs = SimpleNlriTypeRegistry.getInstance().parseSubTlvs(buffer); final PrefixDescriptorsBuilder builder = new PrefixDescriptorsBuilder(); builder.setMultiTopologyId((TopologyIdentifier) tlvs.get(MultiTopoIdTlvParser.MULTI_TOPOLOGY_ID_QNAME)); @@ -55,7 +55,7 @@ abstract class AbstractPrefixNlriParser extends AbstractNlriTypeCodec { return builder.build(); } - private void serializePrefixDescriptor(final PrefixDescriptors tlv, final ByteBuf buffer) { + private static void serializePrefixDescriptor(final PrefixDescriptors tlv, final ByteBuf buffer) { final SimpleNlriTypeRegistry reg = SimpleNlriTypeRegistry.getInstance(); reg.serializeTlv(MultiTopoIdTlvParser.MULTI_TOPOLOGY_ID_QNAME, tlv.getMultiTopologyId(), buffer); reg.serializeTlv(OspfRouteTlvParser.OSPF_ROUTE_TYPE_QNAME, tlv.getOspfRouteType(), buffer); diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkNlriParser.java index c15d5771fd..a105a1f9a2 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkNlriParser.java @@ -16,8 +16,8 @@ import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.Ipv6InterfaceTlvParser; import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.Ipv6NeighborTlvParser; import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.MultiTopoIdTlvParser; import org.opendaylight.protocol.bgp.linkstate.spi.AbstractNlriTypeCodec; -import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry; import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil; +import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.Ipv4InterfaceIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.Ipv6InterfaceIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.LinkLrIdentifiers; @@ -74,7 +74,7 @@ public final class LinkNlriParser extends AbstractNlriTypeCodec { } } - private LinkDescriptors parseLinkDescriptor(final ByteBuf buffer) { + private static LinkDescriptors parseLinkDescriptor(final ByteBuf buffer) { final Map tlvs = SimpleNlriTypeRegistry.getInstance().parseSubTlvs(buffer); final LinkDescriptorsBuilder builder = new LinkDescriptorsBuilder(); @@ -114,7 +114,7 @@ public final class LinkNlriParser extends AbstractNlriTypeCodec { serializeLinkDescriptor(linkNlri.getLinkDescriptors(), buffer); } - private void serializeLinkDescriptor(final LinkDescriptors linkDescriptor, final ByteBuf body) { + private static void serializeLinkDescriptor(final LinkDescriptors linkDescriptor, final ByteBuf body) { final SimpleNlriTypeRegistry reg = SimpleNlriTypeRegistry.getInstance(); if (linkDescriptor.getLinkLocalIdentifier() != null && linkDescriptor.getLinkRemoteIdentifier() != null) { reg.serializeTlv(LinkLrIdentifiers.QNAME, linkDescriptor, body); diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java index 05fd8cc8b0..397fe1c633 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; abstract class AbstractNodeDescriptorTlvCodec { - protected final NodeIdentifier parseNodeDescriptor(final ByteBuf value, final Map parsedSubTlvs) { + protected static final NodeIdentifier parseNodeDescriptor(final ByteBuf value, final Map parsedSubTlvs) { parsedSubTlvs.putAll(SimpleNlriTypeRegistry.getInstance().parseSubTlvs(value)); final AsNumber asNumber = (AsNumber) parsedSubTlvs.get(AsNumTlvParser.AS_NUMBER_QNAME); final DomainIdentifier domainId = (DomainIdentifier) parsedSubTlvs.get(DomainIdTlvParser.DOMAIN_ID_QNAME); @@ -51,7 +51,7 @@ abstract class AbstractNodeDescriptorTlvCodec { }; } - protected final void serializeNodeDescriptor(final NodeIdentifier tlv, final ByteBuf body) { + protected static final void serializeNodeDescriptor(final NodeIdentifier tlv, final ByteBuf body) { final SimpleNlriTypeRegistry tlvReg = SimpleNlriTypeRegistry.getInstance(); tlvReg.serializeTlv(AsNumTlvParser.AS_NUMBER_QNAME, tlv.getAsNumber(), body); tlvReg.serializeTlv(DomainIdTlvParser.DOMAIN_ID_QNAME, tlv.getDomainId(), body); diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java index 9d6ade91ad..69dc8f9432 100644 --- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java +++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java @@ -215,7 +215,7 @@ public class SrAttributeParserTest { assertArrayEquals(tested, ByteArray.getAllBytes(serializedRange)); } - private void addSubTlvs(final List rangeSubTlvs) { + private static void addSubTlvs(final List rangeSubTlvs) { rangeSubTlvs.add(new SubTlvsBuilder().setRangeSubTlv( new SidLabelTlvCaseBuilder() .setSidLabelIndex(new SidCaseBuilder().setSid(16909060L).build()).build()).build()); @@ -233,7 +233,7 @@ public class SrAttributeParserTest { .setBindingSubTlvs(bindingSubTlvs).build()).build()); } - private void addBindingSubTlvs(final List bindingSubTlvs) { + private static void addBindingSubTlvs(final List bindingSubTlvs) { bindingSubTlvs.add(new BindingSubTlvsBuilder().setBindingSubTlv( new PrefixSidCaseBuilder() .setFlags(ISIS_PREFIX_FLAGS) 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 9ff85ff0e4..90032078c1 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 @@ -329,7 +329,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest { stateProvider.close(); } - private BgpNeighborStateAugmentation buildBgpNeighborStateAugmentation() { + private static BgpNeighborStateAugmentation buildBgpNeighborStateAugmentation() { final BgpNeighborStateAugmentation augmentation = new BgpNeighborStateAugmentationBuilder() .setMessages(new MessagesBuilder().setReceived(new ReceivedBuilder() .setNOTIFICATION(BigInteger.ONE).setUPDATE(BigInteger.ONE).build()) @@ -338,7 +338,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest { return augmentation; } - private AfiSafis buildAfiSafis() { + private static AfiSafis buildAfiSafis() { final NeighborAfiSafiStateAugmentationBuilder neighborAfiSafiStateAugmentation = new NeighborAfiSafiStateAugmentationBuilder().setActive(true).setPrefixes( new PrefixesBuilder().setSent(1L).setReceived(2L).setInstalled(1L).build()); @@ -358,7 +358,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest { return new AfiSafisBuilder().setAfiSafi(Collections.singletonList(afiSafi)).build(); } - private ErrorHandling buildErrorHandling() { + private static ErrorHandling buildErrorHandling() { final ErrorHandling errorHandling = new ErrorHandlingBuilder().setState( new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.error.handling. StateBuilder().setTreatAsWithdraw(false) @@ -368,7 +368,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest { return errorHandling; } - private Timers buildTimers() { + private static Timers buildTimers() { final Timers timers = new TimersBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang. bgp.rev151009.bgp.neighbor.group.timers.StateBuilder() .setConnectRetry(BigDecimal.valueOf(30)) @@ -424,7 +424,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest { .build()).build(); } - private PeerGroup buildGroupExpected() { + private static PeerGroup buildGroupExpected() { return new PeerGroupBuilder().setPeerGroupName("test-group").setState(new org.opendaylight.yang.gen.v1.http .openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.StateBuilder() .setSendCommunity(CommunityType.NONE) diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/BGPActivator.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/BGPActivator.java index 5c002f1e91..2b77765f1c 100755 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/BGPActivator.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/BGPActivator.java @@ -126,7 +126,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { return regs; } - private void registerCapabilityParsers(final List regs, final BGPExtensionProviderContext context) { + private static void registerCapabilityParsers(final List regs, final BGPExtensionProviderContext context) { final AddressFamilyRegistry afiReg = context.getAddressFamilyRegistry(); final SubsequentAddressFamilyRegistry safiReg = context.getSubsequentAddressFamilyRegistry(); @@ -159,7 +159,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(context.registerCapabilitySerializer(BgpExtendedMessageCapability.class, bgpextmessage)); } - private void registerAttributeParsers(final List regs, final BGPExtensionProviderContext context) { + private static void registerAttributeParsers(final List regs, final BGPExtensionProviderContext context) { final BgpPrefixSidAttributeParser prefixSidAttributeParser = new BgpPrefixSidAttributeParser(context.getBgpPrefixSidTlvRegistry()); regs.add(context.registerAttributeSerializer(BgpPrefixSid.class, prefixSidAttributeParser)); regs.add(context.registerAttributeParser(BgpPrefixSidAttributeParser.TYPE, prefixSidAttributeParser)); @@ -228,7 +228,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(context.registerAttributeSerializer(UnrecognizedAttributes.class, new UnrecognizedAttributesSerializer())); } - private void registerMessageParsers(final List regs, final BGPExtensionProviderContext context) { + private static void registerMessageParsers(final List regs, final BGPExtensionProviderContext context) { final BGPOpenMessageParser omp = new BGPOpenMessageParser(context.getParameterRegistry()); regs.add(context.registerMessageParser(BGPOpenMessageParser.TYPE, omp)); regs.add(context.registerMessageSerializer(Open.class, omp)); @@ -252,7 +252,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { regs.add(context.registerMessageSerializer(RouteRefresh.class, rrmp)); } - private void registerExtendedCommunities(final List regs, final BGPExtensionProviderContext context) { + private static void registerExtendedCommunities(final List regs, final BGPExtensionProviderContext context) { final AsTwoOctetSpecificEcHandler twoOctetSpecificEcHandler = new AsTwoOctetSpecificEcHandler(); regs.add(context.registerExtendedCommunityParser(twoOctetSpecificEcHandler.getType(true), twoOctetSpecificEcHandler.getSubType(), twoOctetSpecificEcHandler)); diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java index 73b1feeb82..588e1d72c5 100755 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java @@ -153,7 +153,7 @@ public final class BGPUpdateMessageParser implements MessageParser, MessageSeria * @param message Update message * @throws BGPDocumentedException */ - private void checkMandatoryAttributesPresence(final Update message) throws BGPDocumentedException { + private static void checkMandatoryAttributesPresence(final Update message) throws BGPDocumentedException { Preconditions.checkNotNull(message, "Update message cannot be null"); final Attributes attrs = message.getAttributes(); diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java index 00de9ed556..6a0f62d2e8 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java @@ -36,12 +36,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily; public class AddPathCapabilityHandlerTest { - private final static Class afi = Ipv6AddressFamily.class; - @Mock private AddressFamilyRegistry afiRegistry; - @Mock private AddressFamilyRegistry afirExpection; - private final static Class safi = UnicastSubsequentAddressFamily.class; - @Mock private SubsequentAddressFamilyRegistry safiRegistry; - @Mock private SubsequentAddressFamilyRegistry safirException; + private static final Class AFI = Ipv6AddressFamily.class; + private static final Class SAFI = UnicastSubsequentAddressFamily.class; + + @Mock + private AddressFamilyRegistry afiRegistry; + @Mock + private AddressFamilyRegistry afirExpection; + @Mock + private SubsequentAddressFamilyRegistry safiRegistry; + @Mock + private SubsequentAddressFamilyRegistry safirException; private final ByteBuf parseCorrectBytes = Unpooled.copiedBuffer(new byte[] {1, 4, 4, 1}); private final ByteBuf parseWrongBytes = Unpooled.copiedBuffer(new byte[] {1, 4, 4, 4}); private final byte[] serializedBytes = new byte[] {AddPathCapabilityHandler.CODE, 4, 1, 4, 4, 1}; @@ -49,23 +54,23 @@ public class AddPathCapabilityHandlerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(260).when(this.afiRegistry).numberForClass(afi); - Mockito.doReturn(this.afi).when(this.afiRegistry).classForFamily(260); + Mockito.doReturn(260).when(this.afiRegistry).numberForClass(AFI); + Mockito.doReturn(AddPathCapabilityHandlerTest.AFI).when(this.afiRegistry).classForFamily(260); - Mockito.doReturn(null).when(this.afirExpection).numberForClass(afi); + Mockito.doReturn(null).when(this.afirExpection).numberForClass(AFI); Mockito.doReturn(null).when(this.afirExpection).classForFamily(260); - Mockito.doReturn(4).when(this.safiRegistry).numberForClass(safi); - Mockito.doReturn(this.safi).when(this.safiRegistry).classForFamily(4); + Mockito.doReturn(4).when(this.safiRegistry).numberForClass(SAFI); + Mockito.doReturn(AddPathCapabilityHandlerTest.SAFI).when(this.safiRegistry).classForFamily(4); - Mockito.doReturn(null).when(this.safirException).numberForClass(safi); + Mockito.doReturn(null).when(this.safirException).numberForClass(SAFI); Mockito.doReturn(null).when(this.safirException).classForFamily(4); } @Test public void testCapabilityHandler() throws BGPDocumentedException, BGPParsingException { final List family = new ArrayList<>(); - family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(1)).build()); + family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI).setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(1)).build()); final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability( new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build(); @@ -107,7 +112,7 @@ public class AddPathCapabilityHandlerTest { @Test(expected=IllegalArgumentException.class) public void testUnhandledAfi() { final List family = new ArrayList<>(); - family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(2)).build()); + family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI).setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(2)).build()); final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability( new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build(); @@ -120,7 +125,7 @@ public class AddPathCapabilityHandlerTest { @Test(expected=IllegalArgumentException.class) public void testUnhandledSafi() { final List family = new ArrayList<>(); - family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(3)).build()); + family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI).setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(3)).build()); final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability( new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build(); @@ -133,7 +138,7 @@ public class AddPathCapabilityHandlerTest { @Test(expected=IllegalArgumentException.class) public void testUnhandledSendReceive() { final List family = new ArrayList<>(); - family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(4)).build()); + family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI).setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(4)).build()); final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability( new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build(); diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java index c17a60384b..bf749dfb7a 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java @@ -32,33 +32,38 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type public class MultiProtocolCapabilityHandlerTest { - private final static Class afi = Ipv6AddressFamily.class; - @Mock private AddressFamilyRegistry afir; - @Mock private AddressFamilyRegistry afirExpection; - private final static Class safi = UnicastSubsequentAddressFamily.class; - @Mock private SubsequentAddressFamilyRegistry safir; - @Mock private SubsequentAddressFamilyRegistry safirException; + private static final Class AFI = Ipv6AddressFamily.class; + private static final Class SAFI = UnicastSubsequentAddressFamily.class; + + @Mock + private AddressFamilyRegistry afir; + @Mock + private AddressFamilyRegistry afirExpection; + @Mock + private SubsequentAddressFamilyRegistry safir; + @Mock + private SubsequentAddressFamilyRegistry safirException; @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(260).when(this.afir).numberForClass(afi); - Mockito.doReturn(this.afi).when(this.afir).classForFamily(260); + Mockito.doReturn(260).when(this.afir).numberForClass(AFI); + Mockito.doReturn(MultiProtocolCapabilityHandlerTest.AFI).when(this.afir).classForFamily(260); - Mockito.doReturn(null).when(this.afirExpection).numberForClass(afi); + Mockito.doReturn(null).when(this.afirExpection).numberForClass(AFI); Mockito.doReturn(null).when(this.afirExpection).classForFamily(260); - Mockito.doReturn(4).when(this.safir).numberForClass(safi); - Mockito.doReturn(this.safi).when(this.safir).classForFamily(4); + Mockito.doReturn(4).when(this.safir).numberForClass(SAFI); + Mockito.doReturn(MultiProtocolCapabilityHandlerTest.SAFI).when(this.safir).classForFamily(4); - Mockito.doReturn(null).when(this.safirException).numberForClass(safi); + Mockito.doReturn(null).when(this.safirException).numberForClass(SAFI); Mockito.doReturn(null).when(this.safirException).classForFamily(4); } @Test public void testCapabilityHandler() throws BGPDocumentedException, BGPParsingException { final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability( - new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build(); + new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build(); final ByteBuf bytes = Unpooled.buffer(); final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir, this.safir); @@ -71,7 +76,7 @@ public class MultiProtocolCapabilityHandlerTest { @Test(expected=IllegalArgumentException.class) public void testUnhandledAfi() { final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability( - new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build(); + new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build(); final ByteBuf bytes = Unpooled.buffer(); final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afirExpection, this.safir); @@ -81,7 +86,7 @@ public class MultiProtocolCapabilityHandlerTest { @Test(expected=IllegalArgumentException.class) public void testUnhandledSafi() { final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability( - new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build(); + new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build(); final ByteBuf bytes = Unpooled.buffer(); final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir, this.safirException); diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java index e277cd52b1..e4c6859e42 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java @@ -43,7 +43,7 @@ public class OpenTest { .setAs4BytesCapability(new As4BytesCapabilityBuilder().setAsNumber(new AsNumber(1000L)).build()).addAugmentation( CParameters1.class, new CParameters1Builder().setGracefulRestartCapability(new GracefulRestartCapabilityBuilder() .setRestartFlags(new GracefulRestartCapability.RestartFlags(false)).setRestartTime(0).setTables - (Collections.EMPTY_LIST).build()).build()).build()).build(); + (Collections.emptyList()).build()).build()).build()).build(); optionalCapas.add(optionalCapabilitiesBuilder); final List tlvs = Lists.newArrayList(new BgpParametersBuilder().setOptionalCapabilities(optionalCapas).build()); final Open open = new OpenBuilder().setBgpIdentifier(new Ipv4Address("127.0.0.1")).setMyAsNumber(30).setHoldTimer(3).setVersion( @@ -62,10 +62,10 @@ public class OpenTest { grace = true; } assertEquals(open.getBgpParameters().get(0).getOptionalCapabilities().get(0).getCParameters().getAs4BytesCapability(), - openResult.getBgpParameters().get(0).getOptionalCapabilities().get((!grace) ? 1 : 0).getCParameters().getAs4BytesCapability()); + openResult.getBgpParameters().get(0).getOptionalCapabilities().get(!grace ? 1 : 0).getCParameters().getAs4BytesCapability()); assertEquals(open.getBgpParameters().get(0).getOptionalCapabilities().get(0).getCParameters() .getAugmentation(CParameters1.class) - .getGracefulRestartCapability(), openResult.getBgpParameters().get(0).getOptionalCapabilities().get((grace) ? 1 : 0).getCParameters() + .getGracefulRestartCapability(), openResult.getBgpParameters().get(0).getOptionalCapabilities().get(grace ? 1 : 0).getCParameters() .getAugmentation(CParameters1.class).getGracefulRestartCapability()); } diff --git a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java index 876fcfa5e5..bd521ce847 100644 --- a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java +++ b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java @@ -77,7 +77,7 @@ public class BGPMessageParserMockTest { // Creating input bytes and update messages for (int i = 0; i < this.inputBytes.length; i++) { this.inputBytes[i] = this.fillInputBytes(i); - this.messages.add(this.fillMessages(i)); + this.messages.add(fillMessages(i)); } } @@ -143,7 +143,7 @@ public class BGPMessageParserMockTest { * * @param asn this parameter is passed to ASNumber constructor */ - private Update fillMessages(final long asn) throws UnknownHostException { + private static Update fillMessages(final long asn) throws UnknownHostException { final UpdateBuilder builder = new UpdateBuilder(); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java index a2e3ef3364..90205f700c 100755 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MessageUtil.java @@ -60,8 +60,8 @@ public final class MessageUtil { return false; } final Nlri nlri = message.getNlri(); - return (nlri != null && nlri.getNlri() != null && !nlri.getNlri().isEmpty()) - || (getMpReachNlri(message.getAttributes()) != null); + return nlri != null && nlri.getNlri() != null && !nlri.getNlri().isEmpty() + || getMpReachNlri(message.getAttributes()) != null; } /** @@ -73,9 +73,9 @@ public final class MessageUtil { public static MpReachNlri getMpReachNlri(final Attributes attrs) { if (attrs != null && attrs.getAugmentation(Attributes1.class) != null) { return attrs.getAugmentation(Attributes1.class).getMpReachNlri(); - } else { - return null; } + + return null; } /** @@ -87,8 +87,8 @@ public final class MessageUtil { public static MpUnreachNlri getMpUnreachNlri(final Attributes attrs) { if (attrs != null && attrs.getAugmentation(Attributes2.class) != null) { return attrs.getAugmentation(Attributes2.class).getMpUnreachNlri(); - } else { - return null; } + + return null; } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java index fb3c13e3e4..e566a89bab 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java @@ -11,8 +11,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import java.util.AbstractMap; -import java.util.Map; +import java.util.AbstractMap.SimpleEntry; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.opendaylight.bgp.concepts.NextHopUtil; @@ -48,7 +48,7 @@ final class SimpleNlriRegistry implements NlriRegistry { private final ConcurrentMap handlers = new ConcurrentHashMap<>(); private final ConcurrentMap, NlriSerializer> serializers = new ConcurrentHashMap<>(); private final ConcurrentMap nextHopParsers = new ConcurrentHashMap<>(); - private final ConcurrentMap, BgpTableType>, NextHopParserSerializer> nextHopSerializers = new ConcurrentHashMap<>(); + private final ConcurrentMap, BgpTableType>, NextHopParserSerializer> nextHopSerializers = new ConcurrentHashMap<>(); private final SubsequentAddressFamilyRegistry safiReg; private final AddressFamilyRegistry afiReg; @@ -94,10 +94,10 @@ final class SimpleNlriRegistry implements NlriRegistry { this.nextHopParsers.put(key,nextHopSerializer); if (cNextHopClass != null) { - final Map.Entry, BgpTableType> nhKey = new AbstractMap.SimpleEntry(cNextHopClass, key); + final Entry, BgpTableType> nhKey = new SimpleEntry<>(cNextHopClass, key); this.nextHopSerializers.put(nhKey, nextHopSerializer); for (final Class cNextHop : cNextHopClassList) { - final Map.Entry, BgpTableType> nhKeys = new AbstractMap.SimpleEntry(cNextHop, key); + final Entry, BgpTableType> nhKeys = new SimpleEntry<>(cNextHop, key); this.nextHopSerializers.put(nhKeys, nextHopSerializer); } } @@ -110,10 +110,10 @@ final class SimpleNlriRegistry implements NlriRegistry { SimpleNlriRegistry.this.handlers.remove(key); SimpleNlriRegistry.this.nextHopParsers.remove(key); if (cNextHopClass != null) { - final Map.Entry, BgpTableType> nhKey = new AbstractMap.SimpleEntry(cNextHopClass, key); + final Entry, BgpTableType> nhKey = new SimpleEntry<>(cNextHopClass, key); SimpleNlriRegistry.this.nextHopSerializers.remove(nhKey); for (final Class cNextHop : cNextHopClassList) { - final Map.Entry, BgpTableType> nhKeys = new AbstractMap.SimpleEntry(cNextHop, key); + final Entry, BgpTableType> nhKeys = new SimpleEntry<>(cNextHop, key); SimpleNlriRegistry.this.nextHopSerializers.remove(nhKeys); } } @@ -167,8 +167,8 @@ final class SimpleNlriRegistry implements NlriRegistry { final CNextHop cNextHop = mpReachNlri.getCNextHop(); if (cNextHop != null) { - final Map.Entry, BgpTableType> key = new AbstractMap.SimpleEntry(cNextHop.getImplementedInterface(), - new BgpTableTypeImpl(afi, safi)); + final Entry, BgpTableType> key = new SimpleEntry( + cNextHop.getImplementedInterface(), new BgpTableTypeImpl(afi, safi)); final NextHopParserSerializer nextHopSerializer = this.nextHopSerializers.get(key); final ByteBuf nextHopBuffer = Unpooled.buffer(); nextHopSerializer.serializeNextHop(cNextHop, nextHopBuffer); diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java index e2f69e21c6..8f3c9470ee 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java @@ -245,7 +245,7 @@ public final class BestPathStateImpl implements BestPathState { return extracted; } - private List extractAsList(final UnkeyedListEntryNode segment, final NodeIdentifier nid) { + private static List extractAsList(final UnkeyedListEntryNode segment, final NodeIdentifier nid) { final List ases = new ArrayList<>(); final Optional> maybeAsList = NormalizedNodes.findNode(segment, nid); if (maybeAsList.isPresent()) { @@ -282,9 +282,9 @@ public final class BestPathStateImpl implements BestPathState { final int prime = 31; int result = 1; result = prime * result + this.attributes.hashCode(); - result = prime * result + ((this.localPref == null) ? 0 : this.localPref.hashCode()); - result = prime * result + ((this.multiExitDisc == null) ? 0 : this.multiExitDisc.hashCode()); - result = prime * result + ((this.origin == null) ? 0 : this.origin.hashCode()); + result = prime * result + (this.localPref == null ? 0 : this.localPref.hashCode()); + result = prime * result + (this.multiExitDisc == null ? 0 : this.multiExitDisc.hashCode()); + result = prime * result + (this.origin == null ? 0 : this.origin.hashCode()); return result; } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java index b0b75c1660..8dc1ced625 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java @@ -243,11 +243,12 @@ public abstract class AddPathAbstractRouteEntry extends AbstractRouteEntry { return selector.result(); } - private boolean isFirstBestPath(final int bestPathPosition) { + private static boolean isFirstBestPath(final int bestPathPosition) { return bestPathPosition == 0; } - private boolean peersSupportsAddPathOrIsFirstBestPath(final boolean peerSupportsAddPath, final boolean isFirstBestPath) { + private static boolean peersSupportsAddPathOrIsFirstBestPath(final boolean peerSupportsAddPath, + final boolean isFirstBestPath) { return !(!peerSupportsAddPath && !isFirstBestPath); } @@ -271,7 +272,7 @@ public abstract class AddPathAbstractRouteEntry extends AbstractRouteEntry { this.bestPath.get(0).equals(newBestPathList.get(0)); } - private boolean isEmptyOrNull(final List pathList) { + private static boolean isEmptyOrNull(final List pathList) { return pathList == null || pathList.isEmpty(); } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java index 96aed302ef..29eed92f9d 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java @@ -25,11 +25,7 @@ public class AddPathBestNPathSelection implements PathSelectionMode { @Override public RouteEntry createRouteEntry(final boolean isComplex) { - if (isComplex) { - return new ComplexRouteEntry(this.getNBestPaths()); - } else { - return new SimpleRouteEntry(this.getNBestPaths()); - } + return isComplex ? new ComplexRouteEntry(this.getNBestPaths()) : new SimpleRouteEntry(this.getNBestPaths()); } public Long getNBestPaths() { diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java index 84e2546e54..9f6a67798f 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java @@ -46,9 +46,9 @@ public class AbstractBestPathSelector { final Optional> maybeOriginatorId = NormalizedNodes.findNode(attrs, ORIGINATOR_ID); if (maybeOriginatorId.isPresent()) { return RouterIds.routerIdForAddress((String) maybeOriginatorId.get().getValue()); - } else { - return routerId; } + + return routerId; } /** diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java index 48485bd2fd..4297b1dca5 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java @@ -33,7 +33,8 @@ public abstract class AbstractRouteEntry implements RouteEntry { protected static final NodeIdentifier ROUTES_IDENTIFIER = new NodeIdentifier(Routes.QNAME); private static final Logger LOG = LoggerFactory.getLogger(AbstractRouteEntry.class); - protected final void fillLocRib(final YangInstanceIdentifier routeTarget, final NormalizedNode value, final DOMDataWriteTransaction tx) { + protected static final void fillLocRib(final YangInstanceIdentifier routeTarget, final NormalizedNode value, + final DOMDataWriteTransaction tx) { if (value != null) { LOG.debug("Write route to LocRib {}", value); tx.put(LogicalDatastoreType.OPERATIONAL, routeTarget, value); @@ -43,16 +44,17 @@ public abstract class AbstractRouteEntry implements RouteEntry { } } - - protected final void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttr, - final NormalizedNode value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) { + protected static final void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, + final ContainerNode effAttr, final NormalizedNode value, final RIBSupport ribSup, + final DOMDataWriteTransaction tx) { if (!writeRoute(destPeer, routeTarget, effAttr, value, ribSup, tx)) { deleteRoute(destPeer, routeTarget, tx); } } - protected final boolean writeRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttrib, - final NormalizedNode value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) { + protected static final boolean writeRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, + final ContainerNode effAttrib, final NormalizedNode value, final RIBSupport ribSup, + final DOMDataWriteTransaction tx) { if (effAttrib != null && value != null) { LOG.debug("Write route {} to peer AdjRibsOut {}", value, destPeer); tx.put(LogicalDatastoreType.OPERATIONAL, routeTarget, value); @@ -62,16 +64,18 @@ public abstract class AbstractRouteEntry implements RouteEntry { return false; } - private void deleteRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final DOMDataWriteTransaction tx) { + private static void deleteRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, + final DOMDataWriteTransaction tx) { LOG.trace("Removing {} from transaction for peer {}", routeTarget, destPeer); tx.delete(LogicalDatastoreType.OPERATIONAL, routeTarget); } - protected final boolean filterRoutes(final PeerId rootPeer, final PeerId destPeer, final ExportPolicyPeerTracker peerPT, final TablesKey localTK, final PeerRole destPeerRole) { + protected static final boolean filterRoutes(final PeerId rootPeer, final PeerId destPeer, + final ExportPolicyPeerTracker peerPT, final TablesKey localTK, final PeerRole destPeerRole) { return !rootPeer.equals(destPeer) && isTableSupportedAndReady(destPeer, peerPT, localTK) && !PeerRole.Internal.equals(destPeerRole); } - private boolean isTableSupportedAndReady(final PeerId destPeer, final ExportPolicyPeerTracker peerPT, final TablesKey localTK) { + private static boolean isTableSupportedAndReady(final PeerId destPeer, final ExportPolicyPeerTracker peerPT, final TablesKey localTK) { if (!peerPT.isTableSupported(destPeer) || !peerPT.isTableStructureInitialized(destPeer)) { LOG.trace("Route rejected, peer {} does not support this table type {}", destPeer, localTK); return false; @@ -79,8 +83,8 @@ public abstract class AbstractRouteEntry implements RouteEntry { return true; } - protected final YangInstanceIdentifier getAdjRibOutYII(final RIBSupport ribSup, final YangInstanceIdentifier rootPath, final PathArgument routeId, - final TablesKey localTK) { + protected static final YangInstanceIdentifier getAdjRibOutYII(final RIBSupport ribSup, + final YangInstanceIdentifier rootPath, final PathArgument routeId, final TablesKey localTK) { return ribSup.routePath(rootPath.node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(localTK)) .node(ROUTES_IDENTIFIER), routeId); } @@ -88,7 +92,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { protected PeerRole getRoutePeerIdRole(final ExportPolicyPeerTracker peerPT, final PeerId routePeerId) { for (final PeerRole role : PeerRole.values()) { final PeerExportGroup peerGroup = peerPT.getPeerGroup(role); - if(peerGroup != null && peerGroup.containsPeer(routePeerId)) { + if (peerGroup != null && peerGroup.containsPeer(routePeerId)) { return role; } } diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java index 3960f61a74..0d717af071 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.function.BiConsumer; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -160,19 +161,19 @@ public abstract class AbstractRouteEntryTest { final Map peers = new HashMap<>(); doAnswer(invocation -> { - final BiConsumer action = (BiConsumer) invocation.getArguments()[0]; - for (final Map.Entry pid : peers.entrySet()) { + final BiConsumer action = (BiConsumer) invocation.getArguments()[0]; + for (final Entry pid : peers.entrySet()) { action.accept(pid.getKey(), pid.getValue().getYii()); } return null; }).when(this.pegNot).forEach(any()); - doReturn(true).when(this.pegNot).containsPeer(any(PeerId.class)); + doReturn(Boolean.TRUE).when(this.pegNot).containsPeer(any(PeerId.class)); peers.put(PEER_ID, new PeerExportGroup.PeerExporTuple(PEER_YII, PeerRole.Ibgp)); peers.put(PEER_ID2, new PeerExportGroup.PeerExporTuple(PEER_YII2, PeerRole.Ibgp)); doAnswer(invocation -> { - final BiConsumer action = (BiConsumer) invocation.getArguments()[0]; - for (final Map.Entry pid : peers.entrySet()) { + final BiConsumer action = (BiConsumer) invocation.getArguments()[0]; + for (final Entry pid : peers.entrySet()) { action.accept(pid.getKey(), pid.getValue().getYii()); } return null; @@ -180,9 +181,9 @@ public abstract class AbstractRouteEntryTest { } private void mockExportPolicies() { - doReturn(true).when(this.peerPT).isTableStructureInitialized(any(PeerId.class)); - doReturn(true).when(this.peerPT).isTableSupported(PEER_ID); - doReturn(false).when(this.peerPT).isTableSupported(PEER_ID2); + doReturn(Boolean.TRUE).when(this.peerPT).isTableStructureInitialized(any(PeerId.class)); + doReturn(Boolean.TRUE).when(this.peerPT).isTableSupported(PEER_ID); + doReturn(Boolean.FALSE).when(this.peerPT).isTableSupported(PEER_ID2); doAnswer(invocation -> { final Object[] args = invocation.getArguments(); if (PeerRole.Ibgp.equals(args[0])) { @@ -194,8 +195,8 @@ public abstract class AbstractRouteEntryTest { } }).when(this.peerPT).getPeerGroup(any(PeerRole.class)); - doReturn(true).when(this.peerPT).isAddPathSupportedByPeer(PEER_ID); - doReturn(false).when(this.peerPT).isAddPathSupportedByPeer(PEER_ID2); + doReturn(Boolean.TRUE).when(this.peerPT).isAddPathSupportedByPeer(PEER_ID); + doReturn(Boolean.FALSE).when(this.peerPT).isAddPathSupportedByPeer(PEER_ID2); } private void mockRibSupport() { @@ -228,7 +229,7 @@ public abstract class AbstractRouteEntryTest { }).when(this.ribSupport).routePath(any(YangInstanceIdentifier.class), any(PathArgument.class)); } - private NormalizedNode createAttr() { + private static NormalizedNode createAttr() { final ContainerNode attributes = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(ATTRS_EXTENSION_Q)) .addChild(Builders.containerBuilder().withNodeIdentifier(ORIGIN_NID) .addChild(Builders.leafBuilder().withNodeIdentifier(ORIGIN_VALUE_NID).withValue("igp").build()).build()) 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 c6053ef8d9..7923db4bd3 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 @@ -9,7 +9,6 @@ package org.opendaylight.protocol.bgp.mode.impl.base; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import com.google.common.primitives.UnsignedInteger; diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelectorTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelectorTest.java index ab3a3288f1..816ebc4c21 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelectorTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelectorTest.java @@ -44,21 +44,21 @@ public class BasePathSelectorTest { public static final NodeIdentifier SEQ_LEAFLIST_NID = new NodeIdentifier(QName.create(ATTRS_EXTENSION_Q, "as-sequence")); public static final UnkeyedListEntryNode SEQ_SEGMENT = Builders.unkeyedListEntryBuilder().withNodeIdentifier(SEGMENTS_NID) .addChild(Builders.orderedLeafSetBuilder().withNodeIdentifier(SEQ_LEAFLIST_NID) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 1L)).withValue(1L).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 2L)).withValue(2L).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 3L)).withValue(3L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 1L)).withValue(1L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 2L)).withValue(2L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 3L)).withValue(3L).build()) .build()).build(); private static final NodeIdentifier SET_LEAFLIST_NID = new NodeIdentifier(QName.create(ATTRS_EXTENSION_Q, "as-set")); public static final UnkeyedListEntryNode SET_SEGMENT = Builders.unkeyedListEntryBuilder().withNodeIdentifier(SEGMENTS_NID) .addChild(Builders.leafSetBuilder().withNodeIdentifier(SET_LEAFLIST_NID) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 10L)).withValue(10L).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 11L)).withValue(11L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 10L)).withValue(10L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 11L)).withValue(11L).build()) .build()).build(); private static final UnkeyedListEntryNode SEQ_SEGMENT2 = Builders.unkeyedListEntryBuilder().withNodeIdentifier(SEGMENTS_NID) .addChild(Builders.orderedLeafSetBuilder().withNodeIdentifier(SEQ_LEAFLIST_NID) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 20L)).withValue(20L).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 2L)).withValue(2L).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, 3L)).withValue(3L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 20L)).withValue(20L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 2L)).withValue(2L).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, 3L)).withValue(3L).build()) .build()).build(); private static final QName LOCAL_PREF_Q_NAME = QName.create(ATTRS_EXTENSION_Q, "local-pref"); private static final QName MULTI_EXIT_DISC_Q_NAME = QName.create(ATTRS_EXTENSION_Q, "multi-exit-disc"); @@ -154,7 +154,7 @@ public class BasePathSelectorTest { assertNotEquals(this.originBestPath.getState().getAsPathLength(), processedPath.getState().getAsPathLength()); } - private ContainerNode createStateFromPrefMedOrigin() { + private static ContainerNode createStateFromPrefMedOrigin() { DataContainerNodeAttrBuilder dataContBuilder = createContBuilder(ATTRS_EXTENSION_Q); addLowerLocalRef(dataContBuilder); addLowerMultiExitDisc(dataContBuilder); @@ -171,7 +171,7 @@ public class BasePathSelectorTest { return dataContBuilder; } - private void addLowerLocalRef(final DataContainerNodeAttrBuilder dataContBuilder) { + private static void addLowerLocalRef(final DataContainerNodeAttrBuilder dataContBuilder) { dataContBuilder.addChild(createContBuilder(LOCAL_PREF_Q_NAME).addChild(createValueBuilder(123L, LOCAL_PREF_Q_NAME, "pref").build()).build()); } @@ -179,7 +179,7 @@ public class BasePathSelectorTest { dataContBuilder.addChild(createContBuilder(LOCAL_PREF_Q_NAME).addChild(createValueBuilder(321L, LOCAL_PREF_Q_NAME, "pref").build()).build()); } - private void addLowerMultiExitDisc(final DataContainerNodeAttrBuilder dataContBuilder) { + private static void addLowerMultiExitDisc(final DataContainerNodeAttrBuilder dataContBuilder) { dataContBuilder.addChild(createContBuilder(MULTI_EXIT_DISC_Q_NAME).addChild(createValueBuilder(1234L, MULTI_EXIT_DISC_Q_NAME, "med").build()).build()); } @@ -187,7 +187,7 @@ public class BasePathSelectorTest { dataContBuilder.addChild(createContBuilder(MULTI_EXIT_DISC_Q_NAME).addChild(createValueBuilder(4321L, MULTI_EXIT_DISC_Q_NAME, "med").build()).build()); } - private void addIgpOrigin(final DataContainerNodeAttrBuilder dataContBuilder) { + private static void addIgpOrigin(final DataContainerNodeAttrBuilder dataContBuilder) { dataContBuilder.addChild(createContBuilder(ORIGIN_Q_NAME).addChild(createValueBuilder("igp", ORIGIN_Q_NAME, "value").build()).build()); } diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntryTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntryTest.java index 9df001c705..4101e5b406 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntryTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntryTest.java @@ -23,6 +23,7 @@ public class BaseRouteEntryTest extends AbstractRouteEntryTest { private BaseSimpleRouteEntry testBARE; + @Override @Before public void setUp() { super.setUp(); @@ -40,7 +41,7 @@ public class BaseRouteEntryTest extends AbstractRouteEntryTest { private void testRemoveRoute() { Map yiiCount = this.yIIChanges.stream().collect(Collectors.groupingBy(Function.identity(), Collectors.counting())); - assertEquals(8, (long) yiiCount.size()); + assertEquals(8, yiiCount.size()); assertEquals(1, (long) yiiCount.get(this.routePaYii)); this.testBARE.removeRoute(ROUTER_ID, REMOTE_PATH_ID); this.testBARE.selectBest(AS); diff --git a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java index c9dc82eb6c..d7cd1fa867 100644 --- a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java +++ b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java @@ -65,7 +65,7 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable { }); } - private InetSocketAddress getAddress(final IpAddress ipAddress, final PortNumber portNumber) { + private static InetSocketAddress getAddress(final IpAddress ipAddress, final PortNumber portNumber) { final InetAddress inetAddr; try { inetAddr = InetAddress.getByName(ipAddress.getIpv4Address() != null ? diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml index d9eef06aae..0acd2e3f0c 100644 --- a/bgp/rib-impl/pom.xml +++ b/bgp/rib-impl/pom.xml @@ -279,7 +279,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.5 false diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java index e824aedf92..55a50e9f63 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java @@ -54,18 +54,18 @@ public final class BGPDispatcherImplModule extends org.opendaylight.controller.c // instance will be closed via blueprint. return Reflection.newProxy(AutoCloseableBGPDispatcher.class, new AbstractInvocationHandler() { @Override - protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { + protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) throws Throwable { if (method.getName().equals("close")) { tracker.close(); return null; - } else { - return method.invoke(service, args); } + + return method.invoke(service, args); } }); } - void setBundleContext(BundleContext bundleContext) { + void setBundleContext(final BundleContext bundleContext) { this.bundleContext = bundleContext; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java index 1bde992f8e..6f8cd2e4e4 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java @@ -115,9 +115,9 @@ public final class BGPPeerModule extends org.opendaylight.controller.config.yang bgpDeployerTracker.close(); peerTracker.close(); return null; - } else { - return method.invoke(peer, args); } + + return method.invoke(peer, args); } }); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java index 8dfec44b2d..2237996e9d 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java @@ -112,7 +112,7 @@ public final class RIBImplModule extends org.opendaylight.controller.config.yang this.bundleContext = bundleContext; } - private Map mapBestPathSelectionStrategyByFamily(final List bestPathSelectionDependency) { + private static Map mapBestPathSelectionStrategyByFamily(final List bestPathSelectionDependency) { return Collections.unmodifiableMap(bestPathSelectionDependency.stream().collect( Collectors.toMap(st -> new TablesKey(st.getAfi(), st.getSafi()), BGPBestPathSelection::getStrategy))); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java index e0d3e015c0..b27f2c2ed6 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java @@ -48,9 +48,9 @@ public class StrictBgpPeerRegistryModule extends org.opendaylight.controller.con if (method.getName().equals("close")) { tracker.close(); return null; - } else { - return method.invoke(service, args); } + + return method.invoke(service, args); } }); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java index e732a382d7..c6f59ebf9d 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java @@ -43,7 +43,7 @@ abstract class AbstractReflectingExportPolicy extends AbstractExportPolicy { * @param attributes Input attributes, may not be null. * @return Modified (reflected) attributes. */ - @Nonnull protected final ContainerNode reflectedFromInternalAttributes(@Nonnull final ContainerNode attributes) { + @Nonnull protected static final ContainerNode reflectedFromInternalAttributes(@Nonnull final ContainerNode attributes) { return AttributeOperations.getInstance(attributes).reflectedAttributes(attributes); } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java index 11e96da691..fbe3d38c6a 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java @@ -11,10 +11,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Collections; import java.util.Map; import java.util.Map.Entry; @@ -24,7 +24,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.protocol.bgp.rib.impl.ApplicationPeer.RegisterAppPeerListener; @@ -162,7 +161,7 @@ final class AdjRibInWriter { LOG.error("Failed to create Empty Structure", throwable); } } - }); + }, MoreExecutors.directExecutor()); return new AdjRibInWriter(this.ribPath, this.chain, this.role, this.simpleRoutingPolicy, newPeerPath, tb); } @@ -194,8 +193,9 @@ final class AdjRibInWriter { return tb.build(); } - private void installAdjRibInTables(final YangInstanceIdentifier newPeerPath, final TablesKey tableKey, final RIBSupportContext rs, - final NodeIdentifierWithPredicates instanceIdentifierKey, final DOMDataWriteTransaction tx, final Builder tb) { + private static void installAdjRibInTables(final YangInstanceIdentifier newPeerPath, final TablesKey tableKey, + final RIBSupportContext rs, final NodeIdentifierWithPredicates instanceIdentifierKey, + final DOMDataWriteTransaction tx, final Builder tb) { // We will use table keys very often, make sure they are optimized final InstanceIdentifierBuilder idb = YangInstanceIdentifier.builder(newPeerPath.node(EMPTY_ADJRIBIN.getIdentifier()).node(TABLES)); idb.nodeWithKey(instanceIdentifierKey.getNodeType(), instanceIdentifierKey.getKeyValues()); @@ -258,7 +258,7 @@ final class AdjRibInWriter { if(this.peerPath != null) { final DOMDataWriteTransaction tx = this.chain.newWriteOnlyTransaction(); tx.delete(LogicalDatastoreType.OPERATIONAL, this.peerPath); - final CheckedFuture future = tx.submit(); + final ListenableFuture future = tx.submit(); Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(final Void result) { @@ -269,7 +269,7 @@ final class AdjRibInWriter { public void onFailure(final Throwable t) { LOG.warn("Failed to remove Peer {}", AdjRibInWriter.this.peerPath, t); } - }); + }, MoreExecutors.directExecutor()); return future; } return Futures.immediateFuture(null); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java index 6dbb82a773..1b5cc92bf3 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java @@ -145,7 +145,8 @@ final class AttributeOperations { final ListNodeBuilder> asSequenceBuilder = Builders.orderedLeafSetBuilder(); // add local AS - asSequenceBuilder.withNodeIdentifier(this.asPathSequence).addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(this.asNumberQname, localAs)).withValue(localAs).build()); + asSequenceBuilder.withNodeIdentifier(this.asPathSequence).addChild(Builders.leafSetEntryBuilder().withNodeIdentifier( + new NodeWithValue<>(this.asNumberQname, localAs)).withValue(localAs).build()); final Iterator oldAsSegments = ((UnkeyedListNode) maybeOldAsSegments.get()).getValue().iterator(); final UnkeyedListEntryNode firstSegment = oldAsSegments.next(); @@ -153,7 +154,8 @@ final class AttributeOperations { // first segment contains as-sequence with less then 255 elements and it's append to local AS if (reusableAsSeq != null) { for (final LeafSetEntryNode child : reusableAsSeq.getValue()) { - asSequenceBuilder.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(this.asNumberQname, child.getValue())).withValue(child.getValue()).build()); + asSequenceBuilder.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>( + this.asNumberQname, child.getValue())).withValue(child.getValue()).build()); } } // Add the new first segment @@ -173,7 +175,8 @@ final class AttributeOperations { // a single entry segmentsBuilder.withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(this.asPathSegments).withChild( Builders.orderedLeafSetBuilder().withNodeIdentifier(this.asPathSequence).addChild( - Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(this.asNumberQname, localAs)).withValue(localAs).build()).build()).build()); + Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(this.asNumberQname, localAs)) + .withValue(localAs).build()).build()).build()); } containerBuilder.withChild(Builders.containerBuilder().withNodeIdentifier(this.asPathContainer).withChild(segmentsBuilder.build()).build()); @@ -214,8 +217,8 @@ final class AttributeOperations { clusterBuilder.withNodeIdentifier(this.clusterListLeaf); // prepend local CLUSTER_ID - clusterBuilder.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(this.clusterQname, clusterId.getValue())). - withValue(clusterId.getValue()).build()); + clusterBuilder.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>( + this.clusterQname, clusterId.getValue())).withValue(clusterId.getValue()).build()); // if there was a CLUSTER_LIST attribute, add all other entries final Optional> maybeClusterList = NormalizedNodes.findNode(attributes, this.clusterListPath); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java index 0fa5f9a196..88c780a2bb 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java @@ -17,6 +17,7 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; +import io.netty.channel.WriteBufferWaterMark; import io.netty.channel.epoll.Epoll; import io.netty.channel.epoll.EpollChannelOption; import io.netty.channel.epoll.EpollEventLoopGroup; @@ -50,10 +51,10 @@ import org.slf4j.LoggerFactory; public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(BGPDispatcherImpl.class); private static final int SOCKET_BACKLOG_SIZE = 128; - private static final int HIGH_WATER_MARK = 256 * 1024; - private static final int LOW_WATER_MARK = 128 * 1024; private static final long TIMEOUT = 10; + private static final WriteBufferWaterMark WATER_MARK = new WriteBufferWaterMark(128 * 1024, 256 * 1024); + private final BGPHandlerFactory handlerFactory; private final EventLoopGroup bossGroup; private final EventLoopGroup workerGroup; @@ -80,10 +81,11 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { private synchronized Future createClient(final InetSocketAddress remoteAddress, final int retryTimer, final Bootstrap clientBootStrap) { final BGPClientSessionNegotiatorFactory snf = new BGPClientSessionNegotiatorFactory(this.bgpPeerRegistry); - final ChannelPipelineInitializer initializer = BGPChannel.createChannelPipelineInitializer(this.handlerFactory, snf); + final ChannelPipelineInitializer initializer = BGPChannel.createChannelPipelineInitializer( + this.handlerFactory, snf); - final BGPProtocolSessionPromise sessionPromise = new BGPProtocolSessionPromise(remoteAddress, retryTimer, - clientBootStrap, this.bgpPeerRegistry); + final BGPProtocolSessionPromise sessionPromise = new BGPProtocolSessionPromise<>(remoteAddress, + retryTimer, clientBootStrap, this.bgpPeerRegistry); clientBootStrap.handler(BGPChannel.createClientChannelHandler(initializer, sessionPromise)); sessionPromise.connect(); LOG.debug("Client created."); @@ -117,8 +119,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { // Make sure we are doing round-robin processing bootstrap.option(ChannelOption.MAX_MESSAGES_PER_READ, 1); bootstrap.option(ChannelOption.SO_KEEPALIVE, Boolean.TRUE); - bootstrap.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, HIGH_WATER_MARK); - bootstrap.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, LOW_WATER_MARK); + bootstrap.option(ChannelOption.WRITE_BUFFER_WATER_MARK, WATER_MARK); bootstrap.option(ChannelOption.SO_REUSEADDR, reuseAddress); if (bootstrap.group() == null) { @@ -150,7 +151,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { final BGPClientSessionNegotiatorFactory snf = new BGPClientSessionNegotiatorFactory(this.bgpPeerRegistry); final Bootstrap bootstrap = createClientBootStrap(keys, reuseAddress); bootstrap.localAddress(localAddress); - final BGPReconnectPromise reconnectPromise = new BGPReconnectPromise(GlobalEventExecutor.INSTANCE, + final BGPReconnectPromise reconnectPromise = new BGPReconnectPromise<>(GlobalEventExecutor.INSTANCE, remoteAddress, retryTimer, bootstrap, this.bgpPeerRegistry, BGPChannel.createChannelPipelineInitializer(this.handlerFactory, snf)); reconnectPromise.connect(); @@ -160,7 +161,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { @Override public synchronized ChannelFuture createServer(final InetSocketAddress serverAddress) { final BGPServerSessionNegotiatorFactory snf = new BGPServerSessionNegotiatorFactory(this.bgpPeerRegistry); - final ChannelPipelineInitializer initializer = BGPChannel.createChannelPipelineInitializer(this.handlerFactory, snf); + final ChannelPipelineInitializer initializer = BGPChannel.createChannelPipelineInitializer(this.handlerFactory, snf); final ServerBootstrap serverBootstrap = createServerBootstrap(initializer); final ChannelFuture channelFuture = serverBootstrap.bind(serverAddress); LOG.debug("Initiated server {} at {}.", channelFuture, serverAddress); @@ -185,8 +186,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { serverBootstrap.option(ChannelOption.SO_BACKLOG, SOCKET_BACKLOG_SIZE); serverBootstrap.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT); - serverBootstrap.childOption(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, HIGH_WATER_MARK); - serverBootstrap.childOption(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, LOW_WATER_MARK); + serverBootstrap.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, WATER_MARK); // Make sure we are doing round-robin processing serverBootstrap.option(ChannelOption.MAX_MESSAGES_PER_READ, 1); @@ -204,7 +204,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { } - static ChannelPipelineInitializer + static > ChannelPipelineInitializer createChannelPipelineInitializer(final BGPHandlerFactory hf, final T snf) { return (channel, promise) -> { channel.pipeline().addLast(hf.getDecoders()); @@ -213,7 +213,8 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { }; } - static ChannelHandler createClientChannelHandler(final ChannelPipelineInitializer initializer, final Promise promise) { + static ChannelHandler createClientChannelHandler( + final ChannelPipelineInitializer initializer, final Promise promise) { return new ChannelInitializer() { @Override protected void initChannel(final SocketChannel channel) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java index 5a41cf2d36..7caa0faccb 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java @@ -11,6 +11,7 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; +import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.ChannelFuture; import java.util.Set; import java.util.concurrent.Future; @@ -46,10 +47,9 @@ public class BgpPeerRpc implements BgpPeerRpcService { return Futures.transform(JdkFutureAdapters.listenInPoolThread(f), (Function>) input1 -> { if (f.isSuccess()) { return RpcResultBuilder.success().build(); - } else { - return RpcResultBuilder.failed().withError(ErrorType.RPC, FAILURE_MSG).build(); } - }); + return RpcResultBuilder.failed().withError(ErrorType.RPC, FAILURE_MSG).build(); + }, MoreExecutors.directExecutor()); } return RpcResultBuilder.failed().withError(ErrorType.RPC, FAILURE_MSG + " due to unsupported address families.").buildFuture(); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java index 43703542d6..6388547642 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.bgp.rib.impl; import com.google.common.base.Preconditions; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java index d792e04589..d9fea9c8c0 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java @@ -108,7 +108,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements ClusterSingletonSe private final BgpDeployer.WriteConfiguration configurationWriter; private ClusterSingletonServiceRegistration registration; private final DOMDataBrokerExtension service; - private final Map txChainToLocRibWriter = new HashMap<>(); + private final Map, LocRibWriter> txChainToLocRibWriter = new HashMap<>(); private final Map bestPathSelectionStrategies; private final ImportPolicyPeerTracker importPolicyPeerTracker; private final RIBImplRuntimeMXBeanImpl renderStats; @@ -139,7 +139,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements ClusterSingletonSe final InstanceIdentifierBuilder yangRibIdBuilder = YangInstanceIdentifier.builder().node(BgpRib.QNAME).node(Rib.QNAME); this.yangRibId = yangRibIdBuilder.nodeWithKey(Rib.QNAME, RIB_ID_QNAME, ribId.getValue()).build(); this.bestPathSelectionStrategies = Preconditions.checkNotNull(bestPathSelectionStrategies); - final ClusterIdentifier cId = (clusterId == null) ? new ClusterIdentifier(localBgpId) : clusterId; + final ClusterIdentifier cId = clusterId == null ? new ClusterIdentifier(localBgpId) : clusterId; this.ribId = ribId; final PolicyDatabase policyDatabase = new PolicyDatabase(this.localAs.getValue(), localBgpId, cId); this.importPolicyPeerTracker = new ImportPolicyPeerTrackerImpl(policyDatabase); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java index 52c7a6ecf8..9a099b6fc1 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java @@ -13,12 +13,11 @@ import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUti import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getNeighborInstanceName; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getRibInstanceName; -import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.Collection; import java.util.Dictionary; @@ -35,7 +34,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer; import org.opendaylight.protocol.bgp.rib.impl.spi.BgpDeployer; import org.opendaylight.protocol.bgp.rib.impl.spi.InstanceType; @@ -94,7 +92,7 @@ public final class BgpDeployerImpl implements BgpDeployer, ClusteredDataTreeChan public void onFailure(final Throwable t) { LOG.error("Failed to initialize Network Instance {}.", networkInstanceName, t); } - }); + }, MoreExecutors.directExecutor()); this.registration = dataBroker.registerDataTreeChangeListener( new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, this.networkInstanceIId.child(Protocols.class) .child(Protocol.class).augmentation(Protocol1.class).child(Bgp.class)), this); @@ -137,26 +135,25 @@ public final class BgpDeployerImpl implements BgpDeployer, ClusteredDataTreeChan final ListenableFuture> futureOfRelevance = Futures.allAsList(futurePeerCloseList); final ListenableFuture>> maxRelevanceFuture = transform(futureOfRelevance, - (Function, ListenableFuture>>) futurePeersClose -> { + futurePeersClose -> { this.peers.values().forEach(PeerBean::close); BgpDeployerImpl.this.peers.clear(); final List> futureRIBCloseList = BgpDeployerImpl.this.ribs.values().stream() .map(RibImpl::closeServiceInstance).collect(Collectors.toList()); return Futures.allAsList(futureRIBCloseList); - }); + }, MoreExecutors.directExecutor()); - final ListenableFuture ribFutureClose = transform(maxRelevanceFuture, - (Function>, Void>) futurePeersClose -> { - BgpDeployerImpl.this.ribs.values().forEach(RibImpl::close); - this.ribs.clear(); - return null; - }); + final ListenableFuture ribFutureClose = transform(maxRelevanceFuture, futurePeersClose -> { + BgpDeployerImpl.this.ribs.values().forEach(RibImpl::close); + this.ribs.clear(); + return null; + }, MoreExecutors.directExecutor()); ribFutureClose.get(); } - private static CheckedFuture initializeNetworkInstance( + private static ListenableFuture initializeNetworkInstance( final DataBroker dataBroker, final InstanceIdentifier networkInstance) { final WriteTransaction wTx = dataBroker.newWriteOnlyTransaction(); wTx.merge(LogicalDatastoreType.CONFIGURATION, networkInstance, diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java index 26c10fc805..652a965c3f 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java @@ -54,8 +54,7 @@ public final class BGPProtocolSessionPromise extends Defau this.bootstrap = Preconditions.checkNotNull(bootstrap); this.peerRegistry = Preconditions.checkNotNull(peerRegistry); this.listenerRegistration = this.peerRegistry.registerPeerSessionListener( - new BGPProtocolSessionPromise.PeerRegistrySessionListenerImpl(this, - StrictBGPPeerRegistry.getIpAddress(this.address))); + new PeerRegistrySessionListenerImpl(this, StrictBGPPeerRegistry.getIpAddress(this.address))); } public synchronized void connect() { @@ -63,11 +62,11 @@ public final class BGPProtocolSessionPromise extends Defau LOG.debug("Connection to {} already exists", this.address); this.connectSkipped = true; return; - } else { - this.connectSkipped = false; } - final BGPProtocolSessionPromise lock = this; + this.connectSkipped = false; + + final BGPProtocolSessionPromise lock = this; try { LOG.debug("Promise {} attempting connect for {}ms", lock, Integer.valueOf(CONNECT_TIMEOUT)); if (this.address.isUnresolved()) { @@ -77,7 +76,7 @@ public final class BGPProtocolSessionPromise extends Defau this.bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT); this.bootstrap.remoteAddress(this.address); final ChannelFuture connectFuture = this.bootstrap.connect(); - connectFuture.addListener(new BGPProtocolSessionPromise.BootstrapConnectListener(lock)); + connectFuture.addListener(new BootstrapConnectListener(lock)); this.pending = connectFuture; } catch (final Exception e) { LOG.warn("Failed to connect to {}", this.address, e); @@ -92,7 +91,7 @@ public final class BGPProtocolSessionPromise extends Defau return; } - final BGPProtocolSessionPromise lock = this; + final BGPProtocolSessionPromise lock = this; final EventLoop loop = this.pending.channel().eventLoop(); loop.schedule(() -> { synchronized (BGPProtocolSessionPromise.this) { @@ -100,9 +99,9 @@ public final class BGPProtocolSessionPromise extends Defau LOG.debug("Connection to {} already exists", BGPProtocolSessionPromise.this.address); BGPProtocolSessionPromise.this.connectSkipped = true; return; - } else { - BGPProtocolSessionPromise.this.connectSkipped = false; } + + BGPProtocolSessionPromise.this.connectSkipped = false; LOG.debug("Attempting to connect to {}", BGPProtocolSessionPromise.this.address); final ChannelFuture reconnectFuture = BGPProtocolSessionPromise.this.bootstrap.connect(); reconnectFuture.addListener(new BootstrapConnectListener(lock)); @@ -119,9 +118,9 @@ public final class BGPProtocolSessionPromise extends Defau Preconditions.checkNotNull(this.pending); this.pending.cancel(mayInterruptIfRunning); return true; - } else { - return false; } + + return false; } private synchronized void closePeerSessionListener() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java index feadee1076..e3f592453d 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java @@ -31,12 +31,12 @@ public class BGPReconnectPromise extends DefaultPromise initializer; private BGPProtocolSessionPromise pending; public BGPReconnectPromise(@Nonnull final EventExecutor executor, @Nonnull final InetSocketAddress address, final int retryTimer, @Nonnull final Bootstrap bootstrap, @Nonnull final BGPPeerRegistry peerRegistry, - @Nonnull final ChannelPipelineInitializer initializer) { + @Nonnull final ChannelPipelineInitializer initializer) { super(executor); this.bootstrap = bootstrap; this.initializer = Preconditions.checkNotNull(initializer); @@ -67,9 +67,11 @@ public class BGPReconnectPromise extends DefaultPromise connectSessionPromise(final InetSocketAddress address, final int retryTimer, final Bootstrap bootstrap, - final BGPPeerRegistry peerRegistry, final ChannelPipelineInitializer initializer) { - final BGPProtocolSessionPromise sessionPromise = new BGPProtocolSessionPromise(address, retryTimer, bootstrap, peerRegistry); + private BGPProtocolSessionPromise connectSessionPromise(final InetSocketAddress address, final int retryTimer, + final Bootstrap bootstrap, final BGPPeerRegistry peerRegistry, + final ChannelPipelineInitializer initializer) { + final BGPProtocolSessionPromise sessionPromise = new BGPProtocolSessionPromise<>(address, retryTimer, + bootstrap, peerRegistry); final ChannelHandler chInit = new ChannelInitializer() { @Override protected void initChannel(final SocketChannel channel) { @@ -84,7 +86,8 @@ public class BGPReconnectPromise extends DefaultPromise extends DefaultPromise promise; - ClosedChannelHandler(final BGPReconnectPromise promise) { + ClosedChannelHandler(final BGPReconnectPromise promise) { this.promise = promise; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java index 57bc5f82ad..0c0ca39e1a 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java @@ -29,7 +29,7 @@ public final class PerTableTypeRouteCounter { public PerTableTypeRouteCounter() { } - private synchronized void init(@Nonnull Set tablesKeySet) { + private synchronized void init(@Nonnull final Set tablesKeySet) { tablesKeySet.forEach(this::init); } @@ -49,7 +49,6 @@ public final class PerTableTypeRouteCounter { * NOTE: the created empty counter won't be put into the original map * * @param tablesKey - * @return */ @Nonnull public final LongAdder getCounterOrDefault(@Nonnull final TablesKey tablesKey) { return this.counters.getOrDefault(Preconditions.checkNotNull(tablesKey), new LongAdder()); @@ -60,14 +59,13 @@ public final class PerTableTypeRouteCounter { * This method will put the created empty counter back to map * * @param tablesKey - * @return */ public final LongAdder getCounterOrSetDefault(@Nonnull final TablesKey tablesKey) { if (!this.counters.containsKey(tablesKey)) { return init(tablesKey); - } else { - return this.counters.get(Preconditions.checkNotNull(tablesKey)); } + + return this.counters.get(Preconditions.checkNotNull(tablesKey)); } public final Map getCounters() { 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 5720b57ac0..29a8d8f2cf 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 @@ -11,11 +11,11 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import com.google.common.base.Optional; -import com.google.common.base.Throwables; import com.google.common.util.concurrent.CheckedFuture; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.EventListener; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -165,8 +165,10 @@ public class AbstractRIBTestSetup { final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); try { ctx.registerModuleInfo(BindingReflections.getModuleInfo(Ipv4Route.class)); + } catch (final RuntimeException e) { + throw e; } catch (final Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } return ctx; } @@ -190,7 +192,7 @@ public class AbstractRIBTestSetup { Mockito.doNothing().when(this.domTransWrite).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class)); Mockito.doNothing().when(this.domTransWrite).delete(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class)); Mockito.doNothing().when(this.domTransWrite).merge(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class)); - Mockito.doReturn(Optional.absent()).when(readFuture).checkedGet(); + Mockito.doReturn(Optional.absent()).when(readFuture).checkedGet(); Mockito.doReturn(readFuture).when(readTx).read(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(InstanceIdentifier.class)); Mockito.doNothing().when(this.domChain).close(); Mockito.doReturn(this.domTransWrite).when(this.domChain).newWriteOnlyTransaction(); @@ -256,9 +258,9 @@ public class AbstractRIBTestSetup { this.a1.close(); } - private class listenerRegistration implements ListenerRegistration { + private class listenerRegistration implements ListenerRegistration { @Override - public Object getInstance() { + public EventListener getInstance() { return null; } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java index aea8c6341c..4c65791502 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java @@ -72,7 +72,7 @@ public class AdjRibsInWriterTest { MockitoAnnotations.initMocks(this); Mockito.doReturn("MockedTrans").when(this.tx).toString(); Mockito.doReturn(this.tx).when(this.chain).newWriteOnlyTransaction(); - final CheckedFuture checkedFuture = Mockito.mock(CheckedFuture.class); + final CheckedFuture checkedFuture = Mockito.mock(CheckedFuture.class); Mockito.doNothing().when(checkedFuture).addListener(any(), any()); Mockito.doReturn(checkedFuture).when(this.tx).submit(); Mockito.doNothing().when(this.tx).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class)); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperationsTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperationsTest.java index 6688f6e90d..062d916717 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperationsTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperationsTest.java @@ -119,7 +119,7 @@ public class AttributeOperationsTest { assertFalse(exportedAttributes.getChild(ATOMIC_NID).isPresent()); } - private LeafSetNode checkFirstLeafList(final ContainerNode exportedAttributes) { + private static LeafSetNode checkFirstLeafList(final ContainerNode exportedAttributes) { assertTrue(NormalizedNodes.findNode(exportedAttributes, AS_PATH_NID, SEGMENTS_NID).isPresent()); final UnkeyedListNode segments = (UnkeyedListNode) NormalizedNodes.findNode(exportedAttributes, AS_PATH_NID, SEGMENTS_NID).get(); final UnkeyedListEntryNode seg = segments.getValue().iterator().next(); @@ -164,8 +164,10 @@ public class AttributeOperationsTest { .build()) .addChild(Builders.containerBuilder().withNodeIdentifier(CLUSTER_C_NID) .addChild(Builders.orderedLeafSetBuilder().withNodeIdentifier(CLUSTER_NID) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(CLUSTER_NID.getNodeType(), clusterId1.getValue())).withValue(clusterId1.getValue()).build()) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(CLUSTER_NID.getNodeType(), clusterId2.getValue())).withValue(clusterId2.getValue()).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier( + new NodeWithValue<>(CLUSTER_NID.getNodeType(), clusterId1.getValue())).withValue(clusterId1.getValue()).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier( + new NodeWithValue<>(CLUSTER_NID.getNodeType(), clusterId2.getValue())).withValue(clusterId2.getValue()).build()) .build()) .build()) .build(); @@ -191,7 +193,7 @@ public class AttributeOperationsTest { assertEquals(originatorId.getValue(), ((ContainerNode)reflectedAttributes.getChild(ORIGINATOR_C_NID).get()).getChild(ORIGINATOR_NID).get().getValue()); } - private LeafSetNode checkCluster(final ContainerNode reflectedAttributes) { + private static LeafSetNode checkCluster(final ContainerNode reflectedAttributes) { assertTrue(reflectedAttributes.getChild(CLUSTER_C_NID).isPresent()); final ContainerNode clusterContainer = (ContainerNode) reflectedAttributes.getChild(CLUSTER_C_NID).get(); final LeafSetNode clusters = (LeafSetNode) clusterContainer.getChild(CLUSTER_NID).get(); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyTest.java index bc27fee558..8f26e7203f 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyTest.java @@ -136,8 +136,8 @@ public class ExportPolicyTest { final ClusterIdentifier cluster1 = new ClusterIdentifier(new Ipv4Address("1.1.1.1")); final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4Address("1.1.1.2")); return Builders.containerBuilder().withNodeIdentifier(clusterContNid).addChild(Builders.orderedLeafSetBuilder().withNodeIdentifier(clusterNid) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) .build()).build(); } @@ -151,9 +151,9 @@ public class ExportPolicyTest { final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4Address("1.1.1.2")); return Builders.containerBuilder().withNodeIdentifier(clusterContNid).addChild( Builders.orderedLeafSetBuilder().withNodeIdentifier(clusterNid) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, CLUSTER.getValue())).withValue(CLUSTER.getValue()).build()) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, CLUSTER.getValue())).withValue(CLUSTER.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) .build()).build(); } @@ -167,8 +167,8 @@ public class ExportPolicyTest { final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4Address("1.1.1.2")); return Builders.containerBuilder().withNodeIdentifier(clusterContNid).addChild( Builders.orderedLeafSetBuilder().withNodeIdentifier(clusterNid) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) - .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster2.getValue())).withValue(cluster2.getValue()).build()) + .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(clusterQName, cluster1.getValue())).withValue(cluster1.getValue()).build()) .build()).build(); } @@ -204,7 +204,7 @@ public class ExportPolicyTest { private static UnkeyedListEntryNode createSequenceWithLocalAs() { return Builders.unkeyedListEntryBuilder().withNodeIdentifier(SEGMENTS_NID) .addChild(Builders.orderedLeafSetBuilder().withNodeIdentifier(SEQ_LEAFLIST_NID) - .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(AS_NUMBER_Q, LOCAL_AS)).withValue(LOCAL_AS).build()) + .addChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(AS_NUMBER_Q, LOCAL_AS)).withValue(LOCAL_AS).build()) .build()).build(); } } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java index 4fee53aa1a..15b03d611e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java @@ -44,14 +44,14 @@ public class FromExternalImportPolicyTest { @Test public void testEffectiveAttributes() { - DataContainerNodeAttrBuilder dataContBuilder = createContBuilder(this.DATA_QNAME); + DataContainerNodeAttrBuilder dataContBuilder = createContBuilder(DATA_QNAME); // local pref dataContBuilder.addChild(createContBuilder(LOCALPREF).addChild(createValueBuilder(100L, LOCALPREF, "pref").build()).build()); // cluster pref String s = "404.40.40.40"; LeafSetEntryNode entry1 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( - new NodeWithValue(CLUSTER, s)).withValue(s).build(); + new NodeWithValue<>(CLUSTER, s)).withValue(s).build(); dataContBuilder.addChild(createContBuilder(CLUSTERID).addChild(ImmutableLeafSetNodeBuilder.create().withNodeIdentifier( new NodeIdentifier(QName.create(CLUSTER, "cluster"))).withChild(entry1).build()).build()); @@ -83,7 +83,7 @@ public class FromExternalImportPolicyTest { FromExternalImportPolicy importPol = new FromExternalImportPolicy(); final ContainerNode result = importPol.effectiveAttributes(dataContBuilder.build()); - DataContainerNodeAttrBuilder dataContExpected = createContBuilder(this.DATA_QNAME); + DataContainerNodeAttrBuilder dataContExpected = createContBuilder(DATA_QNAME); dataContExpected.addChild(asPath); dataContExpected.addChild(resultNextHop); @@ -92,14 +92,13 @@ public class FromExternalImportPolicyTest { assertEquals(dataContExpected.build(), result); } - private DataContainerNodeAttrBuilder createContBuilder(final QName qname) { + private static DataContainerNodeAttrBuilder createContBuilder(final QName qname) { return ImmutableContainerNodeSchemaAwareBuilder.create().withNodeIdentifier(new NodeIdentifier(qname)); } - private ImmutableLeafNodeBuilder createValueBuilder(final T value, final QName qname, final String localName) { + private static ImmutableLeafNodeBuilder createValueBuilder(final T value, final QName qname, final String localName) { final ImmutableLeafNodeBuilder valueBuilder = new ImmutableLeafNodeBuilder<>(); valueBuilder.withNodeIdentifier(new NodeIdentifier(QName.create(qname, localName))).withValue(value); return valueBuilder; } - } 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 33839dd9f7..b9b40e61ee 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 @@ -15,13 +15,11 @@ import static org.opendaylight.protocol.bgp.rib.impl.AbstractAddPathTest.AS_NUMB import static org.opendaylight.protocol.bgp.rib.impl.AbstractAddPathTest.BGP_ID; import static org.opendaylight.protocol.util.CheckUtil.readDataOperational; -import com.google.common.base.Throwables; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.eventbus.EventBus; import io.netty.util.concurrent.GlobalEventExecutor; -import java.io.IOException; import java.net.InetSocketAddress; import java.util.Collection; import java.util.Collections; @@ -36,9 +34,9 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest; import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTestCustomizer; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory; import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; @@ -88,19 +86,14 @@ public class ParserToSalTest extends AbstractConcurrentDataBrokerTest { private ClusterSingletonServiceProvider clusterSingletonServiceProvider; private BindingCodecTreeFactory codecFactory; - private SchemaService schemaService; + private DOMSchemaService schemaService; @Before public void setUp() throws Exception { super.setup(); MockitoAnnotations.initMocks(this); - final List bgpMessages; - try { - final String hexMessages = "/bgp_hex.txt"; - bgpMessages = HexDumpBGPFileParser.parseMessages(ParserToSalTest.class.getResourceAsStream(hexMessages)); - } catch (final IOException e) { - throw Throwables.propagate(e); - } + final String hexMessages = "/bgp_hex.txt"; + final List bgpMessages = HexDumpBGPFileParser.parseMessages(ParserToSalTest.class.getResourceAsStream(hexMessages)); this.mock = new BGPMock(new EventBus("test"), ServiceLoaderBGPExtensionProviderContext .getSingletonInstance().getMessageRegistry(), Lists.newArrayList(fixMessages(bgpMessages))); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java index 694952c2eb..3c6d09e8c6 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java @@ -51,7 +51,7 @@ public class StrictBGPPeerRegistryTest { private StrictBGPPeerRegistry peerRegistry; private BGPSessionPreferences mockPreferences; - private Open createOpen(final Ipv4Address bgpId, final AsNumber as) { + private static Open createOpen(final Ipv4Address bgpId, final AsNumber as) { final List params = Lists.newArrayList(new BgpParametersBuilder() .setOptionalCapabilities(Lists.newArrayList(new OptionalCapabilitiesBuilder() .setCParameters(new CParametersBuilder() diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java index c2d0f11a96..c01794131e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java @@ -8,11 +8,13 @@ package org.opendaylight.protocol.bgp.rib.impl; -import static org.mockito.Mockito.any; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.times; import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.ATTRIBUTES_UPTODATE_FALSE; @@ -39,7 +41,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.Mockito; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; @@ -128,6 +129,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { .node(RibSupportUtils.toYangTablesKey(new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class))).node(Attributes.QNAME).node(QName.create(Attributes.QNAME, "uptodate")); + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -170,25 +172,25 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { doReturn(this.domChain).when(this.domBroker).createTransactionChain(any()); doReturn(this.tx).when(this.domChain).newWriteOnlyTransaction(); final DOMDataTreeChangeService dOMDataTreeChangeService = mock(DOMDataTreeChangeService.class); - final ListenerRegistration listener = mock(ListenerRegistration.class); - Mockito.doReturn(listener).when(dOMDataTreeChangeService).registerDataTreeChangeListener(any(), any()); - Mockito.doNothing().when(listener).close(); + final ListenerRegistration listener = mock(ListenerRegistration.class); + doReturn(listener).when(dOMDataTreeChangeService).registerDataTreeChangeListener(any(), any()); + doNothing().when(listener).close(); - Mockito.doReturn(Collections.singletonMap(DOMDataTreeChangeService.class, dOMDataTreeChangeService)) + doReturn(Collections.singletonMap(DOMDataTreeChangeService.class, dOMDataTreeChangeService)) .when(this.domBroker).getSupportedExtensions(); - Mockito.doNothing().when(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), + doNothing().when(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - Mockito.doNothing().when(this.tx).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), + doNothing().when(this.tx).put(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - Mockito.doNothing().when(this.tx).delete(Mockito.any(LogicalDatastoreType.class), Mockito.any(YangInstanceIdentifier.class)); - final CheckedFuture future = mock(CheckedFuture.class); - Mockito.doAnswer(invocation -> { + doNothing().when(this.tx).delete(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class)); + final CheckedFuture future = mock(CheckedFuture.class); + doAnswer(invocation -> { final Runnable callback = (Runnable) invocation.getArguments()[0]; callback.run(); return null; - }).when(future).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class)); - Mockito.doReturn(future).when(this.tx).submit(); - Mockito.doReturn(mock(Optional.class)).when(future).checkedGet(); + }).when(future).addListener(any(Runnable.class), any(Executor.class)); + doReturn(future).when(this.tx).submit(); + doReturn(mock(Optional.class)).when(future).checkedGet(); } @Test @@ -222,13 +224,13 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { correct.setAttributes(ab.setLocalPref(new LocalPrefBuilder().setPref((long) 100).build()).build()); bgpSession.handleMessage(correct.build()); - Mockito.verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); bgpSession.handleMessage(wrongMessage.build()); - Mockito.verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); bgpSession.handleMessage(new UpdateBuilder().build()); - Mockito.verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - Mockito.verify(this.tx).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); - Mockito.verify(this.tx, times(0)).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), + verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + verify(this.tx).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); + verify(this.tx, times(0)).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), eq(ImmutableNodes.leafNode(ATTRIBUTES_UPTODATE_FALSE.getNodeType(), Boolean.TRUE))); } @@ -263,12 +265,12 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { correct.setAttributes(ab.setLocalPref(new LocalPrefBuilder().setPref((long) 100).build()).build()); bgpSession.handleMessage(correct.build()); - Mockito.verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + verify(this.tx, times(4)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); bgpSession.handleMessage(new UpdateBuilder().build()); - Mockito.verify(this.tx, times(5)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + verify(this.tx, times(5)).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - Mockito.verify(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), + verify(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), eq(ImmutableNodes.leafNode(ATTRIBUTES_UPTODATE_FALSE.getNodeType(), Boolean.TRUE))); - Mockito.verify(this.tx, times(0)).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); + verify(this.tx, times(0)).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); } } 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 5eb0f33f67..0d8bd0e9b0 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 @@ -82,13 +82,13 @@ class AbstractConfig { @Mock protected BGPDispatcher dispatcher; @Mock - protected ServiceRegistration serviceRegistration; + protected ServiceRegistration serviceRegistration; @Mock protected BGPPeerRegistry bgpPeerRegistry; @Mock - protected ListenerRegistration listener; + protected ListenerRegistration listener; @Mock - protected Future future; + protected Future future; @Mock protected DOMDataWriteTransaction domDW; @Mock @@ -121,7 +121,7 @@ class AbstractConfig { Mockito.doNothing().when(this.domDW).put(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(MapEntryNode.class)); Mockito.doNothing().when(this.domDW).delete(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class)); Mockito.doNothing().when(this.domDW).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - final CheckedFuture checkedFuture = mock(CheckedFuture.class); + final CheckedFuture checkedFuture = mock(CheckedFuture.class); Mockito.doAnswer(invocation -> { final Runnable callback = (Runnable) invocation.getArguments()[0]; callback.run(); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImplTest.java index 557f4b7593..9c132f708e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImplTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImplTest.java @@ -118,7 +118,7 @@ public class BgpDeployerImplTest { private static final short SHORT = 0; @Mock - DataObjectModification dObject; + DataObjectModification dObject; @Mock private BlueprintContainer blueprintContainer; @Mock @@ -132,9 +132,9 @@ public class BgpDeployerImplTest { @Mock private DataTreeModification modification; @Mock - private ListenerRegistration dataTreeRegistration; + private ListenerRegistration dataTreeRegistration; @Mock - private ServiceRegistration registration; + private ServiceRegistration registration; private Collection> collection = Collections.singleton(this.modification); @@ -160,7 +160,7 @@ public class BgpDeployerImplTest { Mockito.doNothing().when(this.wTx).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(NetworkInstance.class)); - final CheckedFuture future = mock(CheckedFuture.class); + final CheckedFuture future = mock(CheckedFuture.class); Mockito.doReturn(future).when(this.wTx).submit(); Mockito.doNothing().when(future).addListener(any(), any()); Mockito.doReturn(this.dataTreeRegistration).when(this.dataBroker).registerDataTreeChangeListener(any(), any()); @@ -398,7 +398,7 @@ public class BgpDeployerImplTest { } - private Neighbor createNeighborExpected(final Class afi) { + private static Neighbor createNeighborExpected(final Class afi) { return new NeighborBuilder() .setAfiSafis(createAfiSafi(afi)) .setConfig(createConfig()) diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java index 7d72fc93ae..b19f92ebb8 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java @@ -77,11 +77,11 @@ public class RibImplTest extends AbstractConfig { @Mock private ClusterSingletonServiceProvider clusterSingletonServiceProvider; @Mock - private ListenerRegistration dataTreeRegistration; + private ListenerRegistration dataTreeRegistration; @Mock private RIBSupport ribSupport; @Mock - private ServiceRegistration serviceRegistration; + private ServiceRegistration serviceRegistration; @Override @Before @@ -143,7 +143,7 @@ public class RibImplTest extends AbstractConfig { verify(this.serviceRegistration).unregister(); } - private Global createGlobal() { + private static Global createGlobal() { return new GlobalBuilder() .setAfiSafis(new AfiSafisBuilder().setAfiSafi(AFISAFIS).build()) .setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java index ea17327e36..dd85492cef 100644 --- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java +++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java @@ -7,17 +7,13 @@ */ package org.opendaylight.protocol.bgp.rib.mock; -import com.google.common.collect.Lists; import com.google.common.eventbus.EventBus; - import io.netty.buffer.Unpooled; - import java.io.Closeable; +import java.util.ArrayList; import java.util.List; - import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; - import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.BGPParsingException; @@ -46,16 +42,16 @@ public final class BGPMock implements Closeable { private final EventBus eventBus; @GuardedBy("this") - private final List openRegistrations = Lists.newLinkedList(); + private final List openRegistrations = new ArrayList<>(); public BGPMock(final EventBus eventBus, final MessageRegistry registry, final List bgpMessages) { - this.allPreviousByteMessages = Lists.newLinkedList(bgpMessages); + this.allPreviousByteMessages = new ArrayList<>(bgpMessages); this.eventBus = eventBus; - this.allPreviousBGPMessages = this.parsePrevious(registry, this.allPreviousByteMessages); + this.allPreviousBGPMessages = parsePrevious(registry, this.allPreviousByteMessages); } - private List parsePrevious(final MessageRegistry registry, final List msgs) { - final List messages = Lists.newArrayList(); + private static List parsePrevious(final MessageRegistry registry, final List msgs) { + final List messages = new ArrayList<>(); try { for (final byte[] b : msgs) { diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index 48d0f7c745..e17f074532 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -259,9 +259,9 @@ public abstract class AbstractRIBSupport implements RIBSupport { final DataContainerChild ret = maybeRet.get(); if (ret instanceof ContainerNode) { return (ContainerNode)ret; - } else { - LOG.debug("Specified node {} is not a container, ignoring it", ret); } + + LOG.debug("Specified node {} is not a container, ignoring it", ret); } else { LOG.debug("Specified container {} is not present in destination {}", destinationId, destination); } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ExportPolicyPeerTracker.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ExportPolicyPeerTracker.java index d2539027af..0225c243aa 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ExportPolicyPeerTracker.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ExportPolicyPeerTracker.java @@ -17,7 +17,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.SimpleRoutingPolicy; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; /** * Tracks peers for adj-rib-out writeout. @@ -31,7 +30,8 @@ public interface ExportPolicyPeerTracker { * @param peerRole Role of the peer * @param simpleRoutingPolicy */ - AbstractRegistration registerPeer(@Nonnull PeerId peerId, @Nullable SendReceive sendReceive, @Nonnull YangInstanceIdentifier peerPath, @Nonnull PeerRole peerRole, + AbstractRegistration registerPeer(@Nonnull PeerId peerId, @Nullable SendReceive sendReceive, + @Nonnull YangInstanceIdentifier peerPath, @Nonnull PeerRole peerRole, @Nonnull Optional simpleRoutingPolicy); /** diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java index 68adfc86c6..ffcf7f8979 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java @@ -8,8 +8,6 @@ package org.opendaylight.protocol.bgp.rib.spi; -import java.util.Collection; -import java.util.Map; import java.util.function.BiConsumer; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole; diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java index bc48aa97d3..3189c63ae9 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java @@ -123,9 +123,9 @@ public class MultiPathAbstractRIBSupportTest { .getLocalName().intern()))).build(); final ContainerNode destination = Mockito.mock(ContainerNode.class); final ContainerNode route = Mockito.mock(ContainerNode.class); - final Optional optional = Mockito.mock(Optional.class); - final Optional destinationOptional = Mockito.mock(Optional.class); - final Optional destinationsOptional = Mockito.mock(Optional.class); + final Optional optional = Mockito.mock(Optional.class); + final Optional destinationOptional = Mockito.mock(Optional.class); + final Optional destinationsOptional = Mockito.mock(Optional.class); final ChoiceNode destinations = Mockito.mock(ChoiceNode.class); doReturn(optional).when(this.nlri).getChild(new NodeIdentifier(WithdrawnRoutes.QNAME)); diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java index dc5dfef7b5..0edc3896b7 100644 --- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java +++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java @@ -75,7 +75,7 @@ final class BGPTestTool { } while (numberOfSpeakers > 0); } - private BGPDispatcher initializeActivator() { + private static BGPDispatcher initializeActivator() { final BGPActivator activator = new BGPActivator(); final BGPExtensionProviderContext ctx = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance(); activator.start(ctx); diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml index 7af07db855..bbb038b709 100644 --- a/bgp/topology-provider/pom.xml +++ b/bgp/topology-provider/pom.xml @@ -238,7 +238,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.5 false diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java index b10fdce981..c32403d46d 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java @@ -69,7 +69,7 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst super(dataProvider, locRibReference, topologyId, topologyTypes, afi, safi); } - private NodeId advertizingNode(final Attributes attrs) { + private static NodeId advertizingNode(final Attributes attrs) { final CNextHop nh = attrs.getCNextHop(); if (nh == null) { LOG.warn("Next hop value is null"); 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 3892243725..6bf77c7155 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 @@ -9,10 +9,10 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Collection; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; @@ -201,7 +201,7 @@ public abstract class AbstractTopologyBuilder implements Cluste // we do nothing but print out the log. Transaction chain restart will be done in #onTransactionChainFailed() LOG.error("Failed to propagate change (transaction {}) by listener {}", trans.getIdentifier(), AbstractTopologyBuilder.this, t); } - }); + }, MoreExecutors.directExecutor()); } @VisibleForTesting @@ -240,7 +240,7 @@ public abstract class AbstractTopologyBuilder implements Cluste LOG.error("Failed to initialize topology {} (transaction {}) by listener {}", AbstractTopologyBuilder.this.topology, trans.getIdentifier(), AbstractTopologyBuilder.this, t); } - }); + }, MoreExecutors.directExecutor()); } /** @@ -251,7 +251,7 @@ public abstract class AbstractTopologyBuilder implements Cluste Preconditions.checkNotNull(this.chain, "A valid transaction chain must be provided."); final WriteTransaction trans = this.chain.newWriteOnlyTransaction(); trans.delete(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier()); - final CheckedFuture future = trans.submit(); + final ListenableFuture future = trans.submit(); Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(final Void result) { @@ -263,7 +263,7 @@ public abstract class AbstractTopologyBuilder implements Cluste LOG.error("Unable to reset operational topology {} (transaction {})", AbstractTopologyBuilder.this.topology, trans.getIdentifier(), t); } - }); + }, MoreExecutors.directExecutor()); clearTopology(); return future; } @@ -356,9 +356,9 @@ public abstract class AbstractTopologyBuilder implements Cluste this.listenerScheduledRestartEnforceCounter = 0; resetListener(); return true; - } else { - resetTransactionChain(); } + + resetTransactionChain(); } return false; } diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java index aabf76a697..cfb0354edb 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java @@ -580,7 +580,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder nid = getNodeInstanceIdentifier(new NodeKey((NodeId) snh.getNodeId())); + final InstanceIdentifier nid = getNodeInstanceIdentifier(new NodeKey(snh.getNodeId())); trans.put(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, srcTp.getKey()), srcTp); } @@ -594,7 +594,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder nid = getInstanceIdentifier().child( org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class, - new NodeKey((NodeId) dnh.getNodeId())); + new NodeKey(dnh.getNodeId())); trans.put(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, dstTp.getKey()), dstTp); } @@ -609,7 +609,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId())); + final InstanceIdentifier nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId())); trans.delete(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, new TerminationPointKey(tp))); nh.removeTp(tp, link, isRemote); checkNodeForRemoval(trans, nh); @@ -865,7 +865,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId())); + final InstanceIdentifier nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId())); final InstanceIdentifier inaId = nid.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build(); trans.put(LogicalDatastoreType.OPERATIONAL, inaId.child(Prefix.class, pk), pfx); } @@ -876,7 +876,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId())); + final InstanceIdentifier nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId())); final InstanceIdentifier inaId = nid.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build(); final IpPrefix ippfx = p.getPrefixDescriptors().getIpReachabilityInformation(); if (ippfx == null) { diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java index 65d0c65341..1a11d1d7e7 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java @@ -15,7 +15,6 @@ import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer; import org.opendaylight.bgpcep.bgp.topology.provider.spi.TopologyReferenceSingletonService; import org.opendaylight.bgpcep.topology.TopologyReference; import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.Rib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.RibKey; @@ -55,9 +54,9 @@ public final class BackwardsCssTopologyProvider { deployerTracker.close(); topologyTracker.close(); return null; - } else { - return method.invoke(topologyService, args); } + + return method.invoke(topologyService, args); } }); } diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java index 2b51597056..4b3ab51da3 100755 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java @@ -112,7 +112,7 @@ public class Ipv4ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder wTx.submit(); } - private Ipv4Route createIpv4Route(final String nextHop) { + private static Ipv4Route createIpv4Route(final String nextHop) { final Attributes attribute = new AttributesBuilder() .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()) .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder() diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java index 3b2ac97a52..49072321c4 100755 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java @@ -113,7 +113,7 @@ public class Ipv6ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder wTx.submit(); } - private Ipv6Route createIpv6Route(final String netxHop) { + private static Ipv6Route createIpv6Route(final String netxHop) { final Attributes attribute = new AttributesBuilder() .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()) .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop( 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 347a7cac1e..bd7ecc1891 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 @@ -339,7 +339,8 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { wTx.submit(); } - private LinkstateRoute createLinkstateNodeRoute(final ProtocolId protocolId, final String nodeName, final AsNumber asNumber, final String ipv4RouterId) { + private static LinkstateRoute createLinkstateNodeRoute(final ProtocolId protocolId, final String nodeName, + final AsNumber asNumber, final String ipv4RouterId) { return createBaseBuilder(protocolId) .setObjectType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.linkstate.object.type.NodeCaseBuilder().setNodeDescriptors(new NodeDescriptorsBuilder().setCRouterIdentifier(new IsisNodeCaseBuilder().setIsisNode(new IsisNodeBuilder().setIsoSystemId(new IsoSystemIdentifier(new byte[]{0, 0, 1, 2, 3, 4})).build()).build()).setAsNumber(asNumber).build()).build()) .setAttributes(new AttributesBuilder() @@ -350,7 +351,8 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .setIsisAreaId(Collections.singletonList(new IsisAreaIdentifier(new byte[]{0x47}))).build()).build()).build()).build()).build(); } - private LinkstateRoute createLinkstatePrefixRoute(final ProtocolId protocolId, final AsNumber asNumber, final String ipv4Prefix, final long igpMetric, final String ospfFwdAddress) { + private static LinkstateRoute createLinkstatePrefixRoute(final ProtocolId protocolId, final AsNumber asNumber, + final String ipv4Prefix, final long igpMetric, final String ospfFwdAddress) { return createBaseBuilder(protocolId) .setObjectType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.linkstate.object.type.PrefixCaseBuilder() .setAdvertisingNodeDescriptors(new AdvertisingNodeDescriptorsBuilder().setAsNumber(asNumber).build()) @@ -362,7 +364,8 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .build(); } - private LinkstateRoute createLinkstateLinkRoute(final ProtocolId protocolId, final AsNumber localAs, final AsNumber remoteAs, final String linkName) { + private static LinkstateRoute createLinkstateLinkRoute(final ProtocolId protocolId, final AsNumber localAs, + final AsNumber remoteAs, final String linkName) { return createBaseBuilder(protocolId) .setObjectType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.linkstate.object.type.LinkCaseBuilder() .setLocalNodeDescriptors(new LocalNodeDescriptorsBuilder().setAsNumber(localAs).setCRouterIdentifier(new IsisNodeCaseBuilder().setIsisNode(new IsisNodeBuilder().setIsoSystemId(new IsoSystemIdentifier(new byte[]{0, 0, 1, 2, 3, 4})).build()).build()).build()) @@ -381,7 +384,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .build(); } - private LinkstateRouteBuilder createBaseBuilder(final ProtocolId protocolId) { + private static LinkstateRouteBuilder createBaseBuilder(final ProtocolId protocolId) { return new LinkstateRouteBuilder() .setIdentifier(IDENTIFIER) .setKey(new LinkstateRouteKey(LINKSTATE_ROUTE_KEY)) diff --git a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java index ee0703b336..3047c8f586 100644 --- a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java +++ b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java @@ -47,7 +47,7 @@ public class BGPBinaryFileParserTest { } - private List extractFromFile(final String fileName) throws IOException { + private static List extractFromFile(final String fileName) throws IOException { final InputStream is = BGPBinaryFileParserTest.class.getResourceAsStream(fileName); assertNotNull("File not found - " + fileName); if (is == null) { diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java index d1e6c0f5b0..0d7b8608a9 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java @@ -18,6 +18,7 @@ import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.lang.reflect.Method; @@ -34,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitAddLspInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitTriggerSyncInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitTriggerSyncInputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitTriggerSyncOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitUpdateLspInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev131106.SubmitUpdateLspInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.AddLspInput; @@ -54,6 +56,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @@ -221,17 +224,17 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } @SuppressWarnings("unchecked") - private void initMock(final NetworkTopologyPcepService pcepService) { + private static void initMock(final NetworkTopologyPcepService pcepService) { @SuppressWarnings("rawtypes") final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); - final ListenableFuture futureSyncTrigger = Futures.immediateFuture(RpcResultBuilder.success().build()); + final ListenableFuture> futureSyncTrigger = Futures.immediateFuture( + RpcResultBuilder.success().build()); when(pcepService.addLsp(Mockito.any())).thenReturn(future); when(pcepService.removeLsp(Mockito.any())).thenReturn(future); when(pcepService.triggerSync(Mockito.any())).thenReturn(futureSyncTrigger); when(pcepService.ensureLspOperational(Mockito.any())).thenReturn(future); when(pcepService.updateLsp(Mockito.any())).thenReturn(future); - } @Test @@ -344,10 +347,11 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } @SuppressWarnings("unchecked") - private void initMock(final NetworkTopologyPcepProgrammingService pcepService) { + private static void initMock(final NetworkTopologyPcepProgrammingService pcepService) { @SuppressWarnings("rawtypes") final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); - final ListenableFuture futureTriggerSync = Futures.immediateFuture(RpcResultBuilder.success().build()); + final ListenableFuture> futureTriggerSync = Futures.immediateFuture( + RpcResultBuilder.success().build()); when(pcepService.submitAddLsp(Mockito.any())).thenReturn(future); when(pcepService.submitRemoveLsp(Mockito.any())).thenReturn(future); when(pcepService.submitTriggerSync(Mockito.any())).thenReturn(futureTriggerSync); @@ -446,12 +450,11 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { this.broker.registerConsumer(consumer); } - private void initMock(final TopologyTunnelPcepProgrammingService pcepService) { - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") + private static void initMock(final TopologyTunnelPcepProgrammingService pcepService) { final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); when(pcepService.pcepCreateP2pTunnel(Mockito.any())).thenReturn(future); when(pcepService.pcepDestroyTunnel(Mockito.any())).thenReturn(future); when(pcepService.pcepUpdateTunnel(Mockito.any())).thenReturn(future); } - } diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java index 2c19298bbc..54bc5c06f6 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java @@ -37,8 +37,8 @@ public interface PCEPDispatcher { * @return instance of PCEPServer */ @Deprecated - default ChannelFuture createServer(InetSocketAddress address, Optional keys, - PCEPSessionListenerFactory listenerFactory, PCEPPeerProposal peerProposal) { + default ChannelFuture createServer(final InetSocketAddress address, final Optional keys, + final PCEPSessionListenerFactory listenerFactory, final PCEPPeerProposal peerProposal) { if(keys.isPresent()) { return createServer(address, keys.get(), listenerFactory, peerProposal); } @@ -57,5 +57,5 @@ public interface PCEPDispatcher { ChannelFuture createServer(InetSocketAddress address, KeyMapping keys, PCEPSessionListenerFactory listenerFactory, PCEPPeerProposal peerProposal); - PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory(); + PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory(); } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java index 81eb9da355..9219597fde 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java @@ -193,7 +193,7 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro return regs; } - private void registerObjectParsers(final List regs, final PCEPExtensionProviderContext context) { + private static void registerObjectParsers(final List regs, final PCEPExtensionProviderContext context) { final TlvRegistry tlvReg = context.getTlvHandlerRegistry(); final VendorInformationTlvRegistry viTlvReg = context.getVendorInformationTlvRegistry(); final PCEPOpenObjectParser openParser = new PCEPOpenObjectParser(tlvReg, viTlvReg); @@ -266,8 +266,9 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro registerExtensionsObjectParsers(regs, context, tlvReg, viTlvReg, eroSubReg); } - private void registerExtensionsObjectParsers(final List regs, final PCEPExtensionProviderContext context, - final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg, final EROSubobjectRegistry eroSubReg) { + private static void registerExtensionsObjectParsers(final List regs, + final PCEPExtensionProviderContext context, final TlvRegistry tlvReg, + final VendorInformationTlvRegistry viTlvReg, final EROSubobjectRegistry eroSubReg) { final PCEPPathKeyObjectParser pathKeyParser = new PCEPPathKeyObjectParser(eroSubReg); regs.add(context.registerObjectParser(PCEPPathKeyObjectParser.CLASS, PCEPPathKeyObjectParser.TYPE, pathKeyParser)); regs.add(context.registerObjectSerializer( @@ -293,7 +294,8 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro registerMonitoringExtensionParsers(regs, context, tlvReg, viTlvReg); } - private void registerEROParsers(final List regs, final PCEPExtensionProviderContext context, final LabelRegistry labelReg) { + private static void registerEROParsers(final List regs, final PCEPExtensionProviderContext context, + final LabelRegistry labelReg) { final EROIpv4PrefixSubobjectParser ipv4prefixParser = new EROIpv4PrefixSubobjectParser(); regs.add(context.registerEROSubobjectParser(EROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerEROSubobjectSerializer(IpPrefixCase.class, ipv4prefixParser)); @@ -317,7 +319,8 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro regs.add(context.registerEROSubobjectSerializer(LabelCase.class, labelParser)); } - private void registerRROParsers(final List regs, final PCEPExtensionProviderContext context, final LabelRegistry labelReg) { + private static void registerRROParsers(final List regs, final PCEPExtensionProviderContext context, + final LabelRegistry labelReg) { final RROIpv4PrefixSubobjectParser ipv4prefixParser = new RROIpv4PrefixSubobjectParser(); regs.add(context.registerRROSubobjectParser(RROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerRROSubobjectSerializer( @@ -345,7 +348,7 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro labelParser)); } - private void registerXROParsers(final List regs, final PCEPExtensionProviderContext context) { + private static void registerXROParsers(final List regs, final PCEPExtensionProviderContext context) { final XROIpv4PrefixSubobjectParser ipv4prefixParser = new XROIpv4PrefixSubobjectParser(); regs.add(context.registerXROSubobjectParser(XROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerXROSubobjectSerializer(IpPrefixCase.class, ipv4prefixParser)); @@ -369,7 +372,7 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro regs.add(context.registerXROSubobjectSerializer(PathKeyCase.class, pathKeyParser)); } - private void registerLabelParsers(final List regs, final PCEPExtensionProviderContext context) { + private static void registerLabelParsers(final List regs, final PCEPExtensionProviderContext context) { final Type1LabelParser type1Parser = new Type1LabelParser(); regs.add(context.registerLabelParser(Type1LabelParser.CTYPE, type1Parser)); regs.add(context.registerLabelSerializer(Type1LabelCase.class, type1Parser)); @@ -383,7 +386,7 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro regs.add(context.registerLabelSerializer(WavebandSwitchingLabelCase.class, wavebandParser)); } - private void registerTlvParsers(final List regs, final PCEPExtensionProviderContext context) { + private static void registerTlvParsers(final List regs, final PCEPExtensionProviderContext context) { final NoPathVectorTlvParser noPathParser = new NoPathVectorTlvParser(); regs.add(context.registerTlvParser(NoPathVectorTlvParser.TYPE, noPathParser)); regs.add(context.registerTlvSerializer(NoPathVector.class, noPathParser)); @@ -409,8 +412,9 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro regs.add(context.registerTlvSerializer(PathSetupType.class, pstParser)); } - private void registerMonitoringExtensionParsers(final List regs, final PCEPExtensionProviderContext context, - final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) { + private static void registerMonitoringExtensionParsers(final List regs, + final PCEPExtensionProviderContext context, final TlvRegistry tlvReg, + final VendorInformationTlvRegistry viTlvReg) { final PCEPMonitoringObjectParser monParser = new PCEPMonitoringObjectParser(tlvReg, viTlvReg); regs.add(context.registerObjectParser(PCEPMonitoringObjectParser.CLASS, PCEPMonitoringObjectParser.TYPE, monParser)); regs.add(context.registerObjectSerializer(Monitoring.class, monParser)); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java index a2404346e5..3cc283a56d 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java @@ -130,11 +130,12 @@ public class PCEPErrorMessageParser extends AbstractMessageParser { return new PcerrBuilder().setPcerrMessage(b.setErrors(errorObjects).build()).build(); } - private State insertObject(final State state, final List errorObjects, final Object obj, final List requestParameters, final PcerrMessageBuilder b) { + private static State insertObject(final State state, final List errorObjects, final Object obj, + final List requestParameters, final PcerrMessageBuilder b) { switch (state) { case RP_IN: if (obj instanceof Rp) { - final Rp o = ((Rp) obj); + final Rp o = (Rp) obj; requestParameters.add(new RpsBuilder().setRp(o).build()); return State.RP_IN; } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java index 81e4def6db..0638f8bade 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java @@ -113,7 +113,8 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser { return new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build(); } - private void validateSpecificMetrics(final List objects, final PcmonrepMessageBuilder builder) throws PCEPDeserializerException { + private static void validateSpecificMetrics(final List objects, final PcmonrepMessageBuilder builder) + throws PCEPDeserializerException { final List specificMetrics = new ArrayList<>(); while (!objects.isEmpty()) { final SpecificMetricsBuilder smb = new SpecificMetricsBuilder(); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java index e02439973a..7ebb12f612 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java @@ -82,7 +82,7 @@ public class PCEPReplyMessageParser extends AbstractMessageParser { return; } if (reply.getResult() instanceof FailureCase) { - final FailureCase f = ((FailureCase) reply.getResult()); + final FailureCase f = (FailureCase) reply.getResult(); serializeFailure(f, buffer); return; } @@ -249,7 +249,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser { } } - private State insertObject(final State state, final Object obj, final FailureCaseBuilder builder, final List pathMetrics) { + private static State insertObject(final State state, final Object obj, final FailureCaseBuilder builder, + final List pathMetrics) { switch (state) { case INIT: if (obj instanceof Lspa) { @@ -296,7 +297,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser { } } - private State insertObject(final State state, final Object obj, final PathsBuilder builder, final List pathMetrics) { + private static State insertObject(final State state, final Object obj, final PathsBuilder builder, + final List pathMetrics) { switch (state) { case INIT: if (obj instanceof Lspa) { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java index 18d1d2dfd6..a1b6abe466 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java @@ -271,7 +271,9 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { return new SegmentComputationBuilder().setP2p(builder.build()).build(); } - private State insertObject(final State state, final List objects, final List viObjects, final P2pBuilder builder, final List metrics, final List errors, final Rp rp) { + private static State insertObject(final State state, final List objects, + final List viObjects, final P2pBuilder builder, final List metrics, + final List errors, final Rp rp) { final Object obj = objects.get(0); switch (state) { case INIT: @@ -352,7 +354,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { INIT, REPORTED_IN, VENDOR_INFO_LIST, LOAD_BIN, LSPA_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, RRO_IN, XRO_IN, OF_IN, CT_IN, END } - private Svec getValidSvec(final SvecBuilder builder, final List objects) { + private static Svec getValidSvec(final SvecBuilder builder, final List objects) { Preconditions.checkArgument(objects != null && !objects.isEmpty(), "Passed list can't be null or empty."); if (objects.get(0) instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.svec.object.Svec) { @@ -380,7 +382,8 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { return builder.build(); } - private SvecState insertObject(final SvecState state, final Object obj, final SvecBuilder builder, final List metrics, final List viObjects) { + private static SvecState insertObject(final SvecState state, final Object obj, final SvecBuilder builder, + final List metrics, final List viObjects) { switch (state) { case INIT: if (obj instanceof Of) { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java index 7ff06c6acd..6c440fbb07 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java @@ -101,7 +101,7 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser metrics) { + private static State insertObject(final State state, final Object obj, final RequestsBuilder builder, + final List metrics) { switch (state) { case INIT: if (obj instanceof EndpointsObj) { diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java index 2f6b8a043d..dac536fd1f 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java @@ -75,7 +75,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { Preconditions.checkArgument(tlv instanceof PathBinding, "The TLV must be PathBinding type, but was %s", tlv.getClass()); final PathBinding pTlv = (PathBinding) tlv; final BindingTypeValue bindingTypeValue = pTlv.getBindingTypeValue(); - Preconditions.checkArgument((pTlv.getBindingValue() != null && pTlv.getBindingType() != null) || bindingTypeValue != null, "Missing Binding Value in Path Bidning TLV: %s", pTlv); + Preconditions.checkArgument(pTlv.getBindingValue() != null && pTlv.getBindingType() != null || bindingTypeValue != null, "Missing Binding Value in Path Bidning TLV: %s", pTlv); final ByteBuf body = Unpooled.buffer(MPLS_BINDING_LENGTH); if (bindingTypeValue == null) { backwardsSerializer(pTlv, body); @@ -103,7 +103,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { return builder.setBindingTypeValue(codec.deserialize(buffer)).build(); } - private void backwardsParser(final int type, final ByteBuf buffer, final PathBindingBuilder builder) { + private static void backwardsParser(final int type, final ByteBuf buffer, final PathBindingBuilder builder) { builder.setBindingType((short) type); final byte[] value = new byte[buffer.readableBytes()]; //codec will do the reading from buffer @@ -111,7 +111,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { builder.setBindingValue(value); } - private void backwardsSerializer(final PathBinding pTlv, final ByteBuf body) { + private static void backwardsSerializer(final PathBinding pTlv, final ByteBuf body) { ByteBufWriteUtil.writeUnsignedShort((int)pTlv.getBindingType(), body); body.writeBytes(pTlv.getBindingValue()); } @@ -143,7 +143,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { @Override public ByteBuf serialize(final BindingTypeValue bindingValue) { - final MplsLabelEntry mplsEntry = ((MplsLabelEntry) bindingValue); + final MplsLabelEntry mplsEntry = (MplsLabelEntry) bindingValue; final ByteBuf value = Unpooled.buffer(MPLS_ENTRY_LENGTH); final long entry = getMplsStackEntry(mplsEntry.getLabel()) | mplsEntry.getTrafficClass() << TC_SHIFT @@ -158,8 +158,8 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { final MplsLabelEntryBuilder builder = new MplsLabelEntryBuilder(); final long entry = buffer.readUnsignedInt(); builder.setLabel(getMplsLabel(entry)); - builder.setTrafficClass((short) ((entry >> TC_SHIFT) & TC_MASK)); - builder.setBottomOfStack(((entry >> S_SHIFT) & S_MASK) == 1); + builder.setTrafficClass((short) (entry >> TC_SHIFT & TC_MASK)); + builder.setBottomOfStack((entry >> S_SHIFT & S_MASK) == 1); builder.setTimeToLive((short) (entry & TTL_MASK)); return builder.build(); } @@ -177,7 +177,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { private static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel getMplsLabel( final long mplsStackEntry) { return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel( - (mplsStackEntry >> LABEL_SHIFT) & LABEL_MASK); + mplsStackEntry >> LABEL_SHIFT & LABEL_MASK); } private static long getMplsStackEntry( diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java index aeb91de6d3..1e2b6e39a1 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java @@ -123,7 +123,8 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser { return new PcerrBuilder().setPcerrMessage(b.setErrors(errorObjects).build()).build(); } - private State insertObject(final State state, final Object obj, final List errorObjects, final List requestParameters, final List srps, final PcerrMessageBuilder b){ + private static State insertObject(final State state, final Object obj, final List errorObjects, + final List requestParameters, final List srps, final PcerrMessageBuilder b){ switch (state) { case ERROR_IN: if (obj instanceof ErrorObject) { @@ -133,13 +134,13 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser { } case RP_IN: if (obj instanceof Rp) { - final Rp o = ((Rp) obj); + final Rp o = (Rp) obj; requestParameters.add(new RpsBuilder().setRp(o).build()); return State.RP_IN; } case SRP_IN: if (obj instanceof Srp) { - final Srp o = ((Srp) obj); + final Srp o = (Srp) obj; srps.add(new SrpsBuilder().setSrp(o).build()); return State.SRP_IN; } diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java index 1f1b3169ff..1c3b3da02b 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java @@ -133,7 +133,8 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { return null; } - private boolean validateLsp(final Object object, final boolean lspViaSR, final List errors, final ReportsBuilder builder) { + private static boolean validateLsp(final Object object, final boolean lspViaSR, final List errors, + final ReportsBuilder builder) { if (object instanceof Lsp) { final Lsp lsp = (Lsp) object; final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.Tlvs tlvs = lsp.getTlvs(); @@ -141,17 +142,18 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { final Message errorMsg = createErrorMsg(PCEPErrors.LSP_IDENTIFIERS_TLV_MISSING, Optional.absent()); errors.add(errorMsg); return false; - } else { - builder.setLsp(lsp); } - } else { - errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); - return false; + + builder.setLsp(lsp); + return true; } - return true; + + errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); + return false; } - private boolean validatePath(final List objects, final List errors, final ReportsBuilder builder) { + private static boolean validatePath(final List objects, final List errors, + final ReportsBuilder builder) { final PathBuilder pBuilder = new PathBuilder(); Object object = objects.remove(0); if (object instanceof Ero) { @@ -165,7 +167,7 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { return true; } - private void parsePath(final List objects, final PathBuilder builder) { + private static void parsePath(final List objects, final PathBuilder builder) { final List pathMetrics = Lists.newArrayList(); Object obj; State state = State.INIT; @@ -181,7 +183,8 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { } } - private State insertObject(final State state, final Object obj, final PathBuilder builder, final List pathMetrics) { + private static State insertObject(final State state, final Object obj, final PathBuilder builder, + final List pathMetrics) { switch (state) { case INIT: if (obj instanceof Lspa) { diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java index e1285b87cc..29bf7135e0 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java @@ -126,7 +126,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse return null; } - private boolean validateLsp(final Object object, final List errors, final UpdatesBuilder builder) { + private static boolean validateLsp(final Object object, final List errors, final UpdatesBuilder builder) { if (object instanceof Lsp) { builder.setLsp((Lsp) object); } else { @@ -136,7 +136,8 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse return true; } - private boolean validatePath(final List objects, final List errors, final UpdatesBuilder builder) { + private static boolean validatePath(final List objects, final List errors, + final UpdatesBuilder builder) { final PathBuilder pBuilder = new PathBuilder(); Object object = objects.remove(0); if (object instanceof Ero) { @@ -150,7 +151,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse return true; } - private void parsePath(final List objects, final PathBuilder pBuilder) { + private static void parsePath(final List objects, final PathBuilder pBuilder) { final List pathMetrics = Lists.newArrayList(); Object obj; State state = State.INIT; @@ -166,7 +167,8 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse } } - private State insertObject(final State state, final Object obj, final PathBuilder pBuilder, final List pathMetrics) { + private static State insertObject(final State state, final Object obj, final PathBuilder pBuilder, + final List pathMetrics) { switch (state) { case INIT: if (obj instanceof Lspa) { diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java index 24699e7036..67708b72a7 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java @@ -95,7 +95,7 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer } } - private UserCase parseUserError(final ByteBuf buffer) { + private static UserCase parseUserError(final ByteBuf buffer) { final UserErrorBuilder error = new UserErrorBuilder(); error.setEnterprise(new EnterpriseNumber(buffer.readUnsignedInt())); error.setSubOrg(buffer.readUnsignedByte()); @@ -106,8 +106,8 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer return new UserCaseBuilder().setUserError(error.build()).build(); } - private void serializerUserError(final UserError ue, final ByteBuf body) { - final byte[] desc = (ue.getDescription() == null) ? new byte[0] : ue.getDescription().getBytes(StandardCharsets.UTF_8); + private static void serializerUserError(final UserError ue, final ByteBuf body) { + final byte[] desc = ue.getDescription() == null ? new byte[0] : ue.getDescription().getBytes(StandardCharsets.UTF_8); final ByteBuf userErrorBuf = Unpooled.buffer(); Preconditions.checkArgument(ue.getEnterprise() != null, "EnterpriseNumber is mandatory"); writeUnsignedInt(ue.getEnterprise().getValue(), userErrorBuf); @@ -120,7 +120,7 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer formatRSVPObject(USER_ERROR_CLASS_NUM, USER_ERROR_CLASS_TYPE, userErrorBuf, body); } - private RsvpCase parseRsvp(final int classType, final ByteBuf buffer) { + private static RsvpCase parseRsvp(final int classType, final ByteBuf buffer) { final RsvpErrorBuilder builder = new RsvpErrorBuilder(); if (classType == RSVP_IPV4_ERROR_CLASS_TYPE) { builder.setNode(new IpAddress(Ipv4Util.addressForByteBuf(buffer))); @@ -136,7 +136,7 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer return new RsvpCaseBuilder().setRsvpError(builder.build()).build(); } - private void serializeRsvp(final RsvpError rsvp, final ByteBuf body) { + private static void serializeRsvp(final RsvpError rsvp, final ByteBuf body) { final BitArray flags = new BitArray(FLAGS_SIZE); flags.set(IN_PLACE, rsvp.getFlags().isInPlace()); flags.set(NOT_GUILTY, rsvp.getFlags().isNotGuilty()); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsLspObjectParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsLspObjectParser.java index a4f785222b..dbc95b629b 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsLspObjectParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsLspObjectParser.java @@ -7,12 +7,10 @@ */ package org.opendaylight.protocol.pcep.sync.optimizations; -import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00LspObjectParser; import org.opendaylight.protocol.pcep.spi.TlvRegistry; import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.LspDbVersionTlv; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.lsp.db.version.tlv.LspDbVersion; @@ -35,12 +33,9 @@ public class SyncOptimizationsLspObjectParser extends CInitiated00LspObjectParse } private void serializeAugmentation(final Tlvs1 tlv, final ByteBuf body) { - if (tlv == null) { - return; + if (tlv != null) { + serializeTlv(tlv.getLspDbVersion(), body); } - Preconditions.checkArgument(tlv instanceof LspDbVersionTlv, "TLV object is not instance of LspDbVersionTlv."); - final LspDbVersionTlv dbVersion = tlv; - serializeTlv(dbVersion.getLspDbVersion(), body); } @Override diff --git a/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java b/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java index 74b26a3e1b..182caf59db 100644 --- a/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java +++ b/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java @@ -49,18 +49,18 @@ public final class PCEPDispatcherImplModule extends AbstractPCEPDispatcherImplMo return Reflection.newProxy(AutoCloseablePCEPDispatcher.class, new AbstractInvocationHandler() { @Override - protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { + protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) throws Throwable { if (method.getName().equals("close")) { tracker.close(); return null; - } else { - return method.invoke(service, args); } + + return method.invoke(service, args); } }); } - void setBundleContext(BundleContext bundleContext) { + void setBundleContext(final BundleContext bundleContext) { this.bundleContext = bundleContext; } diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java index b0e1ee5a43..1e534690d0 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java @@ -361,7 +361,7 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot @Override protected void negotiationFailed(final Throwable cause) { - this.LOG.debug("Negotiation on channel {} failed", this.channel, cause); + LOG.debug("Negotiation on channel {} failed", this.channel, cause); this.channel.close(); this.promise.setFailure(cause); } diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java index 674c308a7b..17c81945e0 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java @@ -107,7 +107,7 @@ public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable { b.childHandler(new ChannelInitializer() { @Override protected void initChannel(final SocketChannel ch) { - initializer.initializeChannel(ch, new DefaultPromise(PCEPDispatcherImpl.this.executor)); + initializer.initializeChannel(ch, new DefaultPromise<>(PCEPDispatcherImpl.this.executor)); } }); b.option(ChannelOption.SO_BACKLOG, SOCKET_BACKLOG_SIZE); @@ -151,7 +151,7 @@ public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable { } @Override - public final PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory() { + public final PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory() { return this.snf; } } diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java index d8de880e07..9c8de66f22 100755 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java @@ -19,10 +19,8 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; - import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; - import org.opendaylight.protocol.pcep.PCEPSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +45,7 @@ public final class PCEPProtocolSessionPromise extends Def } synchronized void connect() { - final PCEPProtocolSessionPromise lock = this; + final PCEPProtocolSessionPromise lock = this; try { LOG.debug("Promise {} attempting connect for {}ms", lock, Integer.valueOf(this.connectTimeout)); @@ -58,7 +56,7 @@ public final class PCEPProtocolSessionPromise extends Def this.b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, this.connectTimeout); this.b.remoteAddress(this.address); final ChannelFuture connectFuture = this.b.connect(); - connectFuture.addListener(new PCEPProtocolSessionPromise.BootstrapConnectListener(lock)); + connectFuture.addListener(new BootstrapConnectListener(lock)); this.pending = connectFuture; } catch (Exception e) { LOG.info("Failed to connect to {}", this.address, e); @@ -71,9 +69,9 @@ public final class PCEPProtocolSessionPromise extends Def if (super.cancel(mayInterruptIfRunning)) { this.pending.cancel(mayInterruptIfRunning); return true; - } else { - return false; } + + return false; } @Override @@ -113,7 +111,7 @@ public final class PCEPProtocolSessionPromise extends Def final EventLoop loop = cf.channel().eventLoop(); loop.schedule(() -> { PCEPProtocolSessionPromise.LOG.debug("Attempting to connect to {}", PCEPProtocolSessionPromise.this.address); - final Future reconnectFuture = PCEPProtocolSessionPromise.this.b.connect(); + final Future reconnectFuture = PCEPProtocolSessionPromise.this.b.connect(); reconnectFuture.addListener(BootstrapConnectListener.this); PCEPProtocolSessionPromise.this.pending = reconnectFuture; }, PCEPProtocolSessionPromise.this.retryTimer, TimeUnit.SECONDS); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java index 4a56635b0a..598c3df508 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java @@ -33,12 +33,12 @@ public final class Util { final PcerrBuilder errMessageBuilder = new PcerrBuilder(); final ErrorObject err = new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue()).build(); if (t == null) { - return errMessageBuilder.setPcerrMessage( - new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).build()).build(); - } else { - final ErrorType type = new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(t).build()).build(); - return errMessageBuilder.setPcerrMessage( - new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build(); + return errMessageBuilder.setPcerrMessage(new PcerrMessageBuilder().setErrors(Collections.singletonList( + new ErrorsBuilder().setErrorObject(err).build())).build()).build(); } + + final ErrorType type = new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(t).build()).build(); + return errMessageBuilder.setPcerrMessage( + new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build(); } } diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java index c5e5a00933..269b0a3c9e 100755 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java @@ -190,7 +190,7 @@ public class PCEPDispatcherImplTest { private final EventExecutor executor; private final EventLoopGroup workerGroup; - PCCMock(final PCEPSessionNegotiatorFactory negotiatorFactory, final PCEPHandlerFactory factory) { + PCCMock(final PCEPSessionNegotiatorFactory negotiatorFactory, final PCEPHandlerFactory factory) { this.workerGroup = Preconditions.checkNotNull(new NioEventLoopGroup()); this.negotiatorFactory = Preconditions.checkNotNull(negotiatorFactory); this.factory = Preconditions.checkNotNull(factory); @@ -210,9 +210,9 @@ public class PCEPDispatcherImplTest { Future createClient(final InetSocketAddress address, final int retryTimer, final int connectTimeout, final PCEPDispatcherImpl.ChannelPipelineInitializer initializer) { final Bootstrap b = new Bootstrap(); - final PCEPProtocolSessionPromise p = new PCEPProtocolSessionPromise(this.executor, address, retryTimer, + final PCEPProtocolSessionPromise p = new PCEPProtocolSessionPromise<>(this.executor, address, retryTimer, connectTimeout, b); - (b.option(ChannelOption.SO_KEEPALIVE, Boolean.TRUE)).handler(new ChannelInitializer() { + b.option(ChannelOption.SO_KEEPALIVE, Boolean.TRUE).handler(new ChannelInitializer() { @Override protected void initChannel(final SocketChannel ch) { initializer.initializeChannel(ch, p); @@ -225,12 +225,11 @@ public class PCEPDispatcherImplTest { return p; } - private void setChannelFactory(final Bootstrap b) { + private static void setChannelFactory(final Bootstrap b) { try { b.channel(NioSocketChannel.class); } catch (final IllegalStateException ignored) { } - } private void setWorkerGroup(final Bootstrap b) { diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java index 43ff056218..fca250b95f 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java @@ -489,7 +489,7 @@ public class PCEPObjectParserTest { assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result.slice(4, result.readableBytes() - 4))); final ByteBuf buf = Unpooled.buffer(); - parser.serializeObject(builder.build(), buf); + PCEPEndPointsIpv6ObjectParser.serializeObject(builder.build(), buf); assertArrayEquals(result.array(),ByteArray.getAllBytes(buf)); try { diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java index 18a833557f..30789bde9d 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java @@ -179,7 +179,7 @@ public class PCEPRROSubobjectParserTest { subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(pathKey128Bytes, 2)))); final ByteBuf buff = Unpooled.buffer(); - parser.serializeSubobject(subs.build(), buff); + RROPathKey128SubobjectParser.serializeSubobject(subs.build(), buff); assertArrayEquals(pathKey128Bytes, ByteArray.getAllBytes(buff)); try { diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java index 1704c5264e..033324a078 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java @@ -20,7 +20,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.Messages; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.PeerPref; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.messages.ErrorMessages; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.CloseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Pcerr; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Pcreq; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcreqBuilder; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java index 14d292d896..3d27578c47 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java @@ -235,7 +235,7 @@ public class PCEPXROSubobjectParserTest { subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(pathKey128Bytes, 2)), true)); final ByteBuf buff = Unpooled.buffer(); - parser.serializeSubobject(subs.build(), buff); + XROPathKey128SubobjectParser.serializeSubobject(subs.build(), buff); assertArrayEquals(pathKey128Bytes, ByteArray.getAllBytes(buff)); try { diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCDispatcherImpl.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCDispatcherImpl.java index b6b7e86df4..57566055c6 100755 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCDispatcherImpl.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCDispatcherImpl.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.pcep.pcc.mock.protocol; -import com.google.common.base.Optional; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -59,7 +58,7 @@ public final class PCCDispatcherImpl implements PCCDispatcher, AutoCloseable { @Override public Future createClient(@Nonnull final InetSocketAddress remoteAddress, final long reconnectTime, - @Nonnull final PCEPSessionListenerFactory listenerFactory, @Nonnull final PCEPSessionNegotiatorFactory negotiatorFactory, + @Nonnull final PCEPSessionListenerFactory listenerFactory, @Nonnull final PCEPSessionNegotiatorFactory negotiatorFactory, @Nullable final KeyMapping keys, @Nonnull final InetSocketAddress localAddress) { return createClient(remoteAddress, reconnectTime, listenerFactory, negotiatorFactory, keys, localAddress, BigInteger.ONE); } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java index 9399b3f2ee..b30fccc48c 100755 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java @@ -63,12 +63,11 @@ final class PCCReconnectPromise extends DefaultPromise { if (super.cancel(mayInterruptIfRunning)) { this.pending.cancel(mayInterruptIfRunning); return true; - } else { - return false; } + + return false; } - @SuppressWarnings("deprecation") @Override public synchronized Promise setSuccess(final PCEPSession result) { final Promise promise = super.setSuccess(result); @@ -113,7 +112,7 @@ final class PCCReconnectPromise extends DefaultPromise { loop.schedule(() -> { synchronized (PCCReconnectPromise.this) { PCCReconnectPromise.LOG.debug("Attempting to connect to {}", PCCReconnectPromise.this.address); - final Future reconnectFuture = PCCReconnectPromise.this.b.connect(); + final Future reconnectFuture = PCCReconnectPromise.this.b.connect(); reconnectFuture.addListener(this); PCCReconnectPromise.this.pending = reconnectFuture; } diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java index 4f5ea70985..2ef707f851 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java @@ -52,7 +52,7 @@ public class PCCTriggeredFullDBResyncTest extends PCCMockCommon { channel.close().get(); } - private Message createTriggerLspResync() { + private static Message createTriggerLspResync() { final SrpBuilder srpBuilder = new SrpBuilder(); srpBuilder.setOperationId(new SrpIdNumber(1L)); srpBuilder.setProcessingRule(Boolean.TRUE); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java index 1c923231e0..5d715a2238 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java @@ -52,7 +52,7 @@ public class PCCTriggeredLspResyncTest extends PCCMockCommon { channel.close().get(); } - private Message createTriggerLspResync() { + private static Message createTriggerLspResync() { final SrpBuilder srpBuilder = new SrpBuilder(); srpBuilder.setOperationId(new SrpIdNumber(1L)); srpBuilder.setProcessingRule(Boolean.TRUE); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java index b337c76b7a..c7f8e4c9ad 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java @@ -48,7 +48,7 @@ public class PCCTriggeredSyncTest extends PCCMockCommon { channel.close().get(); } - private Message createTriggerMsg() { + private static Message createTriggerMsg() { final UpdatesBuilder rb = new UpdatesBuilder(); // create PCUpd with mandatory objects and LSP object set to 1 final SrpBuilder srpBuilder = new SrpBuilder(); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java index f059f769ad..0b7cc2b0b6 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java @@ -291,11 +291,12 @@ public class PCCTunnelManagerImplTest { Mockito.verify(this.session1, Mockito.times(3)).sendReport(Mockito.any(Pcrpt.class)); Mockito.verify(this.session2, Mockito.times(2)).sendReport(Mockito.any(Pcrpt.class)); } - private Updates createUpdateDelegate(final long plspId) { - return createUpdate(plspId, Optional.of(true)); + + private static Updates createUpdateDelegate(final long plspId) { + return createUpdate(plspId, Optional.of(Boolean.TRUE)); } - private Updates createUpdate(final long plspId) { + private static Updates createUpdate(final long plspId) { return createUpdate(plspId, Optional.absent()); } @@ -303,7 +304,7 @@ public class PCCTunnelManagerImplTest { final UpdatesBuilder updsBuilder = new UpdatesBuilder(); final LspBuilder lsp = new LspBuilder().setPlspId(new PlspId(plspId)); if (delegate.isPresent()) { - lsp.setDelegate(true); + lsp.setDelegate(Boolean.TRUE); } updsBuilder.setLsp(lsp.build()); final PathBuilder pathBuilder = new PathBuilder(); @@ -319,24 +320,24 @@ public class PCCTunnelManagerImplTest { final LspBuilder lsp = new LspBuilder().setTlvs(new TlvsBuilder().setSymbolicPathName(new SymbolicPathNameBuilder().setPathName( new SymbolicPathName(SYMBOLIC_NAME)).build()).build()).setPlspId(new PlspId(plspId)); if (delegate.isPresent()) { - lsp.setDelegate(true); + lsp.setDelegate(Boolean.TRUE); } reqBuilder.setLsp(lsp.build()); final SrpBuilder srpBuilder = new SrpBuilder(); if (remove.isPresent()) { - srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()); + srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(Boolean.TRUE).build()); } reqBuilder.setSrp(srpBuilder.setOperationId(new SrpIdNumber(0L)).build()); return reqBuilder.build(); } private static Requests createRequestsRemove(final long plspId) { - return createRequests(plspId, Optional.of(true), Optional.absent()); + return createRequests(plspId, Optional.of(Boolean.TRUE), Optional.absent()); } private static Requests createRequestsDelegate(final long plspId) { - return createRequests(plspId, Optional.absent(), Optional.of(true)); + return createRequests(plspId, Optional.absent(), Optional.of(Boolean.TRUE)); } private static Requests createRequests(final long plspId) { 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 0c9e055a0b..5429c1a4c1 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 @@ -30,7 +30,7 @@ public class TestingSessionListener implements PCEPSessionListener, ListenerChec private final CountDownLatch sessionLatch = new CountDownLatch(1); @GuardedBy("this") - private final List messages = new ArrayList(); + private final List messages = new ArrayList<>(); private boolean up = false; private PCEPSession session = null; diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java index 16e6ad5b8d..5eff636063 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java @@ -139,7 +139,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer } } - protected final List addVendorInformationObjects(final List objects) { + protected static final List addVendorInformationObjects(final List objects) { final List vendorInfo = new ArrayList<>(); while (!objects.isEmpty() && objects.get(0) instanceof VendorInformationObject) { final VendorInformationObject viObject = (VendorInformationObject) objects.get(0); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java index 5e7b0843de..6ab46472d9 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java @@ -106,7 +106,7 @@ public final class PCEPTopologyProvider extends DefaultTopologyReference { new TopologyProgramming(this.scheduler, this.manager))); this.network.registerPath(NetworkTopologyContext.class, this.topology); try { - this.manager.instantiateServiceInstance().checkedGet(); + this.manager.instantiateServiceInstance().get(); final ChannelFuture channelFuture = this.dependenciesProvider.getPCEPDispatcher() .createServer(this.address, this.keys, this.manager, this.manager); channelFuture.get(); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java index 228e33f9f8..7c0145bf82 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java @@ -8,10 +8,10 @@ package org.opendaylight.bgpcep.pcep.topology.provider; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -86,7 +86,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology * * @throws TransactionCommitFailedException exception */ - synchronized CheckedFuture instantiateServiceInstance() { + synchronized ListenableFuture instantiateServiceInstance() { final TopologyKey key = InstanceIdentifier.keyOf(this.topology); final TopologyId topologyId = key.getTopologyId(); final WriteTransaction tx = this.broker.newWriteOnlyTransaction(); @@ -95,7 +95,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology .addAugmentation(TopologyTypes1.class, new TopologyTypes1Builder().setTopologyPcep( new TopologyPcepBuilder().build()).build()).build()) .setNode(new ArrayList<>()).build(), true); - final CheckedFuture future = tx.submit(); + final ListenableFuture future = tx.submit(); Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(final Void result) { @@ -106,7 +106,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology public void onFailure(final Throwable t) { LOG.error("Failed to create PCEP Topology {}.", topologyId.getValue(), t); } - }); + }, MoreExecutors.directExecutor()); return future; } @@ -163,31 +163,31 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology @Override public synchronized ListenableFuture addLsp(final AddLspArgs input) { final TopologySessionListener l = checkSessionPresence(input.getNode()); - return (l != null) ? l.addLsp(input) : OperationResults.UNSENT.future(); + return l != null ? l.addLsp(input) : OperationResults.UNSENT.future(); } @Override public synchronized ListenableFuture removeLsp(final RemoveLspArgs input) { final TopologySessionListener l = checkSessionPresence(input.getNode()); - return (l != null) ? l.removeLsp(input) : OperationResults.UNSENT.future(); + return l != null ? l.removeLsp(input) : OperationResults.UNSENT.future(); } @Override public synchronized ListenableFuture updateLsp(final UpdateLspArgs input) { final TopologySessionListener l = checkSessionPresence(input.getNode()); - return (l != null) ? l.updateLsp(input) : OperationResults.UNSENT.future(); + return l != null ? l.updateLsp(input) : OperationResults.UNSENT.future(); } @Override public synchronized ListenableFuture ensureLspOperational(final EnsureLspOperationalInput input) { final TopologySessionListener l = checkSessionPresence(input.getNode()); - return (l != null) ? l.ensureLspOperational(input) : OperationResults.UNSENT.future(); + return l != null ? l.ensureLspOperational(input) : OperationResults.UNSENT.future(); } @Override public synchronized ListenableFuture triggerSync(final TriggerSyncArgs input) { final TopologySessionListener l = checkSessionPresence(input.getNode()); - return (l != null) ? l.triggerSync(input) : OperationResults.UNSENT.future(); + return l != null ? l.triggerSync(input) : OperationResults.UNSENT.future(); } synchronized ListenableFuture closeServiceInstance() { @@ -209,7 +209,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology this.state.clear(); final WriteTransaction t = this.broker.newWriteOnlyTransaction(); t.delete(LogicalDatastoreType.OPERATIONAL, this.topology); - final CheckedFuture future = t.submit(); + final ListenableFuture future = t.submit(); Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(final Void result) { @@ -220,7 +220,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology public void onFailure(final Throwable t) { LOG.warn("Failed to remove Topology {}", ServerSessionManager.this.topology, t); } - }); + }, MoreExecutors.directExecutor()); return future; } @@ -234,6 +234,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology return this.runtimeRootRegistration.get(); } + @Override public void setPeerSpecificProposal(final InetSocketAddress address, final TlvsBuilder openBuilder) { Preconditions.checkNotNull(address); this.peerProposal.setPeerProposal(createNodeId(address.getAddress()), openBuilder); diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java index e564d59f38..1480f33476 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java @@ -150,7 +150,7 @@ public abstract class AbstractPCEPSessionTest s = invokeOperation(); - Futures.addCallback(s, new InstructionCallback(insn)); + Futures.addCallback(s, new InstructionCallback(insn), MoreExecutors.directExecutor()); } } diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java index 1ba365350c..968619ca15 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java @@ -8,11 +8,11 @@ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.List; import org.opendaylight.bgpcep.pcep.topology.spi.AbstractInstructionExecutor; import org.opendaylight.bgpcep.programming.topology.TopologyProgrammingUtil; @@ -107,7 +107,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor return Futures.transform( (ListenableFuture>) this.topologyService.addLsp(addLspInput), - (Function, OperationResult>) RpcResult::getResult); + RpcResult::getResult, MoreExecutors.directExecutor()); } } @@ -154,7 +154,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor final AdministrativeStatus adminStatus = this.p2pTunnelInput.getAugmentation(PcepCreateP2pTunnelInput1.class).getAdministrativeStatus(); if (adminStatus != null) { - args.addAugmentation(Arguments2.class, new Arguments2Builder().setLsp(new LspBuilder().setAdministrative((adminStatus == AdministrativeStatus.Active) ? true : false).build()).build()); + args.addAugmentation(Arguments2.class, new Arguments2Builder().setLsp(new LspBuilder().setAdministrative(adminStatus == AdministrativeStatus.Active).build()).build()); } return args.build(); } diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java index d906dce77d..57ba2a69e2 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java @@ -8,9 +8,9 @@ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import org.opendaylight.bgpcep.pcep.topology.spi.AbstractInstructionExecutor; import org.opendaylight.bgpcep.programming.topology.TopologyProgrammingUtil; import org.opendaylight.bgpcep.programming.tunnel.TunnelProgrammingUtil; @@ -67,7 +67,7 @@ final class DestroyTunnelInstructionExecutor extends AbstractInstructionExecutor ab.setNode(node.getSupportingNode().get(0).getKey().getNodeRef()); return Futures.transform( (ListenableFuture>) this.topologyService.removeLsp(ab.build()), - (Function, OperationResult>) RpcResult::getResult); + RpcResult::getResult, MoreExecutors.directExecutor()); } } } diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java index 5c55f807ea..50db2fb71c 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java @@ -13,6 +13,7 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -414,7 +415,7 @@ public final class NodeChangedListener implements ClusteredDataTreeChangeListene public void onFailure(final Throwable t) { LOG.error("Failed to propagate a topology change, target topology became inconsistent", t); } - }); + }, MoreExecutors.directExecutor()); } private void handleChangedNode(final DataObjectModification changedNode, final InstanceIdentifier iid, diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java index 7e9ff4298e..5148c7e430 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java @@ -8,10 +8,10 @@ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import org.opendaylight.bgpcep.pcep.topology.spi.AbstractInstructionExecutor; import org.opendaylight.bgpcep.programming.topology.TopologyProgrammingUtil; import org.opendaylight.bgpcep.programming.tunnel.TunnelProgrammingUtil; @@ -74,7 +74,7 @@ final class UpdateTunnelInstructionExecutor extends AbstractInstructionExecutor } return Futures.transform( (ListenableFuture>) this.topologyService.updateLsp(buildUpdateInput(link, node)), - (Function, OperationResult>) RpcResult::getResult); + RpcResult::getResult, MoreExecutors.directExecutor()); } } @@ -93,7 +93,7 @@ final class UpdateTunnelInstructionExecutor extends AbstractInstructionExecutor final AdministrativeStatus adminStatus = this.updateTunnelInput.getAugmentation(PcepUpdateTunnelInput1.class).getAdministrativeStatus(); if (adminStatus != null) { args.addAugmentation(Arguments3.class, new Arguments3Builder().setLsp(new LspBuilder(). - setAdministrative((adminStatus == AdministrativeStatus.Active) ? true : false).build()).build()); + setAdministrative(adminStatus == AdministrativeStatus.Active).build()).build()); } ab.setArguments(args.build()); return ab.build(); diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java index f65fdb4f5b..24c0d3f1b4 100644 --- a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java +++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java @@ -224,8 +224,8 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.update.lsp.args.Arguments updArgs = this.updateLspInput.getArguments(); Assert.assertEquals(2, updArgs.getEro().getSubobject().size()); final List subObjects = updArgs.getEro().getSubobject(); - final IpPrefixCase prefix1 = ((IpPrefixCase)subObjects.get(0).getSubobjectType()); - final IpPrefixCase prefix2 = ((IpPrefixCase)subObjects.get(1).getSubobjectType()); + final IpPrefixCase prefix1 = (IpPrefixCase)subObjects.get(0).getSubobjectType(); + final IpPrefixCase prefix2 = (IpPrefixCase)subObjects.get(1).getSubobjectType(); Assert.assertEquals(IPV4_PREFIX1, prefix1.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue()); Assert.assertEquals(IPV4_PREFIX2, prefix2.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue()); @@ -250,7 +250,7 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest { wTx.submit().checkedGet(); } - private Node createNode(final NodeId nodeId, final TpId tpId, final String ipv4Address) { + private static Node createNode(final NodeId nodeId, final TpId tpId, final String ipv4Address) { final TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.setTpId(tpId); tpBuilder.setKey(new TerminationPointKey(tpId)); @@ -264,7 +264,7 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest { return nodeBuilder.build(); } - private ExplicitHops createExplicitHop(final String ipv4Prefix) { + private static ExplicitHops createExplicitHop(final String ipv4Prefix) { final ExplicitHopsBuilder explcitHopsBuilder = new ExplicitHopsBuilder(); explcitHopsBuilder.addAugmentation(ExplicitHops1.class, new ExplicitHops1Builder().setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(new IpPrefixBuilder().setIpPrefix(new IpPrefix(new Ipv4Prefix(ipv4Prefix))).build()).build()).build()); return explcitHopsBuilder.build(); diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/RSVPActivator.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/RSVPActivator.java index 5563eeafb7..2545effaac 100644 --- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/RSVPActivator.java +++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/RSVPActivator.java @@ -114,7 +114,7 @@ public class RSVPActivator extends AbstractRSVPExtensionProviderActivator { return regs; } - private void registerRSVPTEParsers(final RSVPExtensionProviderContext context) { + private static void registerRSVPTEParsers(final RSVPExtensionProviderContext context) { final DetourObjectIpv4Parser detourIpv4 = new DetourObjectIpv4Parser(); context.registerRsvpObjectParser(DetourObjectIpv4Parser.CLASS_NUM, DetourObjectIpv4Parser.CTYPE, detourIpv4); context.registerRsvpObjectSerializer(Ipv4DetourObject.class, detourIpv4); @@ -211,7 +211,7 @@ public class RSVPActivator extends AbstractRSVPExtensionProviderActivator { context.registerRsvpObjectSerializer(SecondaryRecordRouteObject.class, srroTypeParser); } - private void registerLabelParsers(final List regs, final RSVPExtensionProviderContext context) { + private static void registerLabelParsers(final List regs, final RSVPExtensionProviderContext context) { final Type1LabelParser type1Parser = new Type1LabelParser(); regs.add(context.registerLabelParser(Type1LabelParser.CTYPE, type1Parser)); regs.add(context.registerLabelSerializer(Type1LabelCase.class, type1Parser)); @@ -225,7 +225,8 @@ public class RSVPActivator extends AbstractRSVPExtensionProviderActivator { regs.add(context.registerLabelSerializer(WavebandSwitchingLabelCase.class, wavebandParser)); } - private void registerRROParsers(final List regs, final RSVPExtensionProviderContext context, final LabelRegistry labelReg) { + private static void registerRROParsers(final List regs, final RSVPExtensionProviderContext context, + final LabelRegistry labelReg) { final RROIpv4PrefixSubobjectParser ipv4prefixParser = new RROIpv4PrefixSubobjectParser(); regs.add(context.registerRROSubobjectParser(RROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerRROSubobjectSerializer( @@ -259,7 +260,7 @@ public class RSVPActivator extends AbstractRSVPExtensionProviderActivator { regs.add(context.registerRROSubobjectSerializer(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.secondary.record.route.object.secondary.record.route.object.subobject.container.subobject.type.DynamicControlProtectionCase.class, srroDynamicParser)); } - private void registerXROParsers(final List regs, final RSVPExtensionProviderContext context) { + private static void registerXROParsers(final List regs, final RSVPExtensionProviderContext context) { final XROIpv4PrefixSubobjectParser ipv4prefixParser = new XROIpv4PrefixSubobjectParser(); regs.add(context.registerXROSubobjectParser(XROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerXROSubobjectSerializer(IpPrefixCase.class, ipv4prefixParser)); @@ -283,7 +284,8 @@ public class RSVPActivator extends AbstractRSVPExtensionProviderActivator { regs.add(context.registerXROSubobjectSerializer(PathKeyCase.class, pathKeyParser)); } - private void registerEROParsers(final List regs, final RSVPExtensionProviderContext context, final LabelRegistry labelReg) { + private static void registerEROParsers(final List regs, final RSVPExtensionProviderContext context, + final LabelRegistry labelReg) { final EROIpv4PrefixSubobjectParser ipv4prefixParser = new EROIpv4PrefixSubobjectParser(); regs.add(context.registerEROSubobjectParser(EROIpv4PrefixSubobjectParser.TYPE, ipv4prefixParser)); regs.add(context.registerEROSubobjectSerializer(IpPrefixCase.class, ipv4prefixParser)); diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/ProtectionCommonParser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/ProtectionCommonParser.java index 24de5d563e..e055e00034 100644 --- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/ProtectionCommonParser.java +++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/ProtectionCommonParser.java @@ -101,7 +101,8 @@ public class ProtectionCommonParser { return sub.build(); } - protected final void serializeBody(final Short cType, final ProtectionSubobject protObj, final ByteBuf output) { + protected static final void serializeBody(final Short cType, final ProtectionSubobject protObj, + final ByteBuf output) { output.writeZero(BYTE_SIZE); writeUnsignedByte(cType, output); switch (cType) { @@ -117,7 +118,8 @@ public class ProtectionCommonParser { } } - protected final ProtectionSubobject parseCommonProtectionBody(final short cType, final ByteBuf byteBuf) throws RSVPParsingException { + protected static final ProtectionSubobject parseCommonProtectionBody(final short cType, final ByteBuf byteBuf) + throws RSVPParsingException { ProtectionSubobject protectionSubobject = null; switch (cType) { case PROTECTION_SUBOBJECT_TYPE_1: diff --git a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/RROSubobjectParserTest.java b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/RROSubobjectParserTest.java index 9819bdb6b8..43acc6858b 100644 --- a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/RROSubobjectParserTest.java +++ b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/RROSubobjectParserTest.java @@ -177,7 +177,7 @@ public class RROSubobjectParserTest { subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(pathKey128Bytes, 2)))); final ByteBuf buff = Unpooled.buffer(); - parser.serializeSubobject(subs.build(), buff); + RROPathKey128SubobjectParser.serializeSubobject(subs.build(), buff); Assert.assertArrayEquals(pathKey128Bytes, ByteArray.getAllBytes(buff)); try { diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java index caf496033d..a16429741a 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; public class CommonPathKeyParser { - public final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route + public static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route .subobjects.subobject.type.path.key._case.PathKey parsePathKey(final int pceIdFLength, final ByteBuf buffer) { final int pathKey = buffer.readUnsignedShort(); final byte[] pceId = ByteArray.readBytes(buffer, pceIdFLength); @@ -29,8 +29,8 @@ public class CommonPathKeyParser { return pBuilder.build(); } - public final ByteBuf serializePathKey(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp - .rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKey pk) { + public static final ByteBuf serializePathKey(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang + .rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKey pk) { final ByteBuf body = Unpooled.buffer(); Preconditions.checkArgument(pk.getPathKey() != null, "PathKey is mandatory."); writeUnsignedShort(pk.getPathKey().getValue(), body); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java index 955fd97243..bf8a74a49d 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java @@ -19,14 +19,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; public class CommonUnnumberedInterfaceSubobjectParser { - protected final UnnumberedCase parseUnnumeredInterface(final ByteBuf buffer) { + protected static final UnnumberedCase parseUnnumeredInterface(final ByteBuf buffer) { final UnnumberedBuilder ubuilder = new UnnumberedBuilder(); ubuilder.setRouterId(buffer.readUnsignedInt()); ubuilder.setInterfaceId(buffer.readUnsignedInt()); return new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build(); } - protected final void serializeUnnumeredInterface(final Unnumbered unnumbered, final ByteBuf body) { + protected static final void serializeUnnumeredInterface(final Unnumbered unnumbered, final ByteBuf body) { Preconditions.checkArgument(unnumbered.getRouterId() != null, "RouterId is mandatory."); writeUnsignedInt(unnumbered.getRouterId(), body); Preconditions.checkArgument(unnumbered.getInterfaceId() != null, "InterfaceId is mandatory."); diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CUISubobjectParserTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CUISubobjectParserTest.java index 4fa27fd74f..5f19dad89a 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CUISubobjectParserTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CUISubobjectParserTest.java @@ -9,6 +9,7 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; @@ -28,23 +29,23 @@ public class CUISubobjectParserTest { final ByteBuf input = Unpooled.buffer(8); input.writeInt(this.routerId.intValue()); input.writeInt(this.interfaceId.intValue()); - final UnnumberedCase output = this.parser.parseUnnumeredInterface(input); + final UnnumberedCase output = CommonUnnumberedInterfaceSubobjectParser.parseUnnumeredInterface(input); assertEquals(this.routerId, output.getUnnumbered().getRouterId()); assertEquals(this.interfaceId, output.getUnnumbered().getInterfaceId()); final ByteBuf bytebuf = Unpooled.buffer(8); - this.parser.serializeUnnumeredInterface(output.getUnnumbered(), bytebuf); + CommonUnnumberedInterfaceSubobjectParser.serializeUnnumeredInterface(output.getUnnumbered(), bytebuf); assertArrayEquals(input.array(), bytebuf.array()); } @Test(expected=IllegalArgumentException.class) public void testException1() { - this.parser.serializeUnnumeredInterface(this.unnumbered1, Unpooled.EMPTY_BUFFER); + CommonUnnumberedInterfaceSubobjectParser.serializeUnnumeredInterface(this.unnumbered1, Unpooled.EMPTY_BUFFER); } @Test(expected=IllegalArgumentException.class) public void testException2() { - this.parser.serializeUnnumeredInterface(this.unnumbered2, Unpooled.buffer(4)); + CommonUnnumberedInterfaceSubobjectParser.serializeUnnumeredInterface(this.unnumbered2, Unpooled.buffer(4)); } } diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParserTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParserTest.java index fc9a206aea..a561d51d44 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParserTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParserTest.java @@ -20,7 +20,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; public class CommonPathKeyParserTest { - private final CommonPathKeyParser parser = new CommonPathKeyParser(); private PathKey key1; private PathKey key2; private PathKey key3; @@ -40,22 +39,22 @@ public class CommonPathKeyParserTest { @Test(expected=IllegalArgumentException.class) public void testSerializationExcption1() { - this.parser.serializePathKey(this.key1); + CommonPathKeyParser.serializePathKey(this.key1); } @Test(expected=IllegalArgumentException.class) public void testSerializationExcption2() { - this.parser.serializePathKey(this.key2); + CommonPathKeyParser.serializePathKey(this.key2); } @Test public void testSerialization() { - final ByteBuf output = this.parser.serializePathKey(this.key3); + final ByteBuf output = CommonPathKeyParser.serializePathKey(this.key3); assertArrayEquals(this.bytes, ByteArray.readAllBytes(output)); } @Test public void testParsing() { - assertEquals(this.key3, this.parser.parsePathKey(2, Unpooled.copiedBuffer(this.bytes))); + assertEquals(this.key3, CommonPathKeyParser.parsePathKey(2, Unpooled.copiedBuffer(this.bytes))); } } diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParserTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParserTest.java index 6d6cf4ab5a..43af25a55f 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParserTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParserTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.Arrays; @@ -79,13 +80,13 @@ public class EROSubobjectListParserTest { public void testAbstractRSVPObjParser() throws RSVPParsingException { final ByteBuf byteAggregator = Unpooled.buffer(4); byte[] output = new byte[] {0, 1, 2, 3}; - this.parser.serializeAttributeHeader(1, (short) 2, (short) 3, byteAggregator); + EroListParser.serializeAttributeHeader(1, (short) 2, (short) 3, byteAggregator); assertArrayEquals(output, byteAggregator.array()); final ByteBuf body = Unpooled.buffer(4); output = new byte[] {0, 0, 0, 1}; final AttributeFilter filter = new AttributeFilter(1L); - this.parser.writeAttributeFilter(filter, body); + EroListParser.writeAttributeFilter(filter, body); assertArrayEquals(output, body.array()); final ByteBuf parseTeObj = Unpooled.buffer(1); diff --git a/testtool-util/src/main/java/org/opendaylight/protocol/util/CheckUtil.java b/testtool-util/src/main/java/org/opendaylight/protocol/util/CheckUtil.java index 2bc17aa99d..26b2029198 100644 --- a/testtool-util/src/main/java/org/opendaylight/protocol/util/CheckUtil.java +++ b/testtool-util/src/main/java/org/opendaylight/protocol/util/CheckUtil.java @@ -35,8 +35,7 @@ public final class CheckUtil { throw new UnsupportedOperationException(); } - @SuppressWarnings("unchecked") - public static void waitFutureSuccess(final T future) { + public static > void waitFutureSuccess(final T future) { final CountDownLatch latch = new CountDownLatch(1); future.addListener(future1 -> latch.countDown()); Uninterruptibles.awaitUninterruptibly(latch, LATCH_TIMEOUT, TimeUnit.SECONDS); 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 33c74e7a9d..bb11f3dd6e 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 @@ -44,9 +44,9 @@ public class CheckUtilTest { @Mock private ReadOnlyTransaction readOnlyTransaction; @Mock - private CheckedFuture checkedFuture; + private CheckedFuture checkedFuture; @Mock - private Optional opt; + private Optional opt; @Mock private MockInterface mockInterface; @Mock @@ -91,15 +91,15 @@ public class CheckUtilTest { @Test(expected = NullPointerException.class) public void testReadDataNull() throws Exception { - doReturn(false).when(this.opt).isPresent(); - final InstanceIdentifier instanceIdentifier = null; + doReturn(Boolean.FALSE).when(this.opt).isPresent(); + final InstanceIdentifier instanceIdentifier = null; readDataOperational(this.dataBroker, instanceIdentifier, test -> false); } @Test(expected = AssertionError.class) public void testReadDataNotEquall() throws Exception { - doReturn(true).when(this.opt).isPresent(); - doReturn(false).when(this.mockInterface).getResult(); + doReturn(Boolean.TRUE).when(this.opt).isPresent(); + doReturn(Boolean.FALSE).when(this.mockInterface).getResult(); readDataOperational(this.dataBroker, this.instanceIdentifier, test -> { assertTrue(test.getResult()); return test; @@ -108,7 +108,7 @@ public class CheckUtilTest { @Test(expected = AssertionError.class) public void testCheckNotPresent() throws Exception { - doReturn(true).when(this.opt).isPresent(); + doReturn(Boolean.TRUE).when(this.opt).isPresent(); checkNotPresentOperational(this.dataBroker, this.instanceIdentifier); } -- 2.36.6