From 141ff6fd5b7304185bc81b4141d3a61540f16a67 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 23 Nov 2017 13:51:31 +0100 Subject: [PATCH] Bump to odlparent-3.0.2 and yangtools-2.0.0 This is a combined upgrade of dependencies, adopting them in one go. Since yangtools has switched to using java.util.Optional, mirror that decision in interfacing expected do directly interact with NormalizedNodes. Change-Id: I87977f2757777c3cefe2a59acb0ec1f2d3beed21 Signed-off-by: Robert Varga Signed-off-by: Claudio D. Gasparini --- .gitignore | 1 + bgp/cli/pom.xml | 21 ------- .../bgp/concepts/RouteDistinguisherUtil.java | 2 +- .../bgp/evpn/impl/EvpnRibSupport.java | 2 +- .../protocol/bgp/evpn/impl/EvpnTestUtil.java | 4 ++ .../PMSITunnelAttributeHandlerTestUtil.java | 4 ++ .../flowspec/AbstractFlowspecNlriParser.java | 2 +- .../flowspec/AbstractFlowspecRIBSupport.java | 2 +- .../ipv4/FlowspecIpv4NlriParserHelper.java | 2 +- .../ipv6/FlowspecIpv6NlriParserHelper.java | 2 +- .../bgp/inet/AbstractIPRibSupport.java | 6 +- .../bgp/l3vpn/AbstractVpnRIBSupport.java | 2 +- .../AbstractLabeledUnicastRIBSupport.java | 2 +- .../linkstate/impl/LinkstateRIBSupport.java | 2 +- .../impl/nlri/LinkstateNlriParser.java | 4 +- .../linkstate/impl/nlri/NodeNlriParser.java | 2 +- .../impl/tlvs/OspfRouteTlvParser.java | 2 +- .../protocol/bgp/parser/spi/PathIdUtil.java | 22 +++---- .../protocol/bgp/mode/BesthPathStateUtil.java | 2 +- .../bgp/mode/impl/BestPathStateImpl.java | 2 +- .../impl/add/AddPathAbstractRouteEntry.java | 2 +- .../impl/base/BaseAbstractRouteEntry.java | 2 +- .../mode/spi/AbstractBestPathSelector.java | 2 +- .../peer/acceptor/BGPPeerAcceptorImpl.java | 28 ++++----- .../bgp/rib/impl/AdjRibOutListener.java | 4 +- .../bgp/rib/impl/AttributeOperations.java | 2 +- .../bgp/rib/impl/EffectiveRibInWriter.java | 10 +-- .../protocol/bgp/rib/impl/LocRibWriter.java | 4 +- .../bgp/rib/impl/AbstractAddPathTest.java | 2 +- .../bgp/rib/impl/AbstractRIBTestSetup.java | 2 +- .../bgp/rib/impl/config/RibImplTest.java | 4 +- .../bgp/rib/spi/AbstractRIBSupport.java | 4 +- .../spi/MultiPathAbstractRIBSupportTest.java | 16 ++--- .../provider/AbstractTopologyBuilder.java | 4 +- .../provider/LinkstateTopologyBuilder.java | 8 +-- .../impl/app/BmpMonitoringStationImpl.java | 4 +- .../protocol/bmp/impl/app/BmpRouterImpl.java | 4 +- .../protocol/bmp/mock/BmpMockSession.java | 4 +- .../bmp/BmpMonitorConfigFileProcessor.java | 2 +- .../config/loader/impl/ConfigLoaderImpl.java | 4 +- .../loader/impl/AbstractConfigLoader.java | 1 - .../protocol/pcep/pcc/mock/PCCsBuilder.java | 9 +-- .../protocol/pcep/pcc/mock/TimerHandler.java | 4 +- .../pcc/mock/protocol/PCCSessionListener.java | 16 ++--- .../protocol/pcep/pcc/mock/PCCMockCommon.java | 4 +- .../pcep/pcc/mock/TestingSessionListener.java | 12 ++-- .../protocol/pcep/testtool/PCCMock.java | 6 +- pcep/topology/cli/pom.xml | 21 ------- .../AbstractTopologySessionListener.java | 62 +++++++++---------- .../topology/provider/TopologyNodeState.java | 4 +- .../programming/impl/InstructionImpl.java | 16 ++--- .../impl/te/ProtectionCommonParser.java | 4 ++ .../rsvp/parser/impl/te/TEObjectUtil.java | 4 ++ .../spi/subobjects/CommonPathKeyParser.java | 4 ++ ...monUnnumberedInterfaceSubobjectParser.java | 5 +- .../rsvp/parser/spi/EROSubobjectUtilTest.java | 2 +- ...oaderRSVPExtensionProviderContextTest.java | 2 +- testtool-parent/pom.xml | 2 +- 58 files changed, 178 insertions(+), 200 deletions(-) diff --git a/.gitignore b/.gitignore index f59e2f621c..ef6e9fe6a9 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ maven-eclipse.xml .DS_STORE .metadata .checkstyle +.factorypath diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml index e1e84d89d5..78723f6e44 100644 --- a/bgp/cli/pom.xml +++ b/bgp/cli/pom.xml @@ -69,27 +69,6 @@ - - - - org.apache.felix - maven-bundle-plugin - true - - - - - org.apache.karaf.shell.commands;version="[3.0.0,4.1)", - org.apache.karaf.shell.console;version="[3.0.0,4.1)", - org.apache.karaf.shell.table;version="[3.0.0,4.1)", - * - - - - - - - scm:git:ssh://git.opendaylight.org:29418/bgpcep.git scm:git:ssh://git.opendaylight.org:29418/bgpcep.git diff --git a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java index 99a9627fb3..f6a69c9507 100644 --- a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java +++ b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java @@ -125,7 +125,7 @@ public final class RouteDistinguisherUtil { public static RouteDistinguisher extractRouteDistinguisher(final DataContainerNode route, final NodeIdentifier rdNid) { - final NormalizedNode rdNode = NormalizedNodes.findNode(route, rdNid).orNull(); + final NormalizedNode rdNode = NormalizedNodes.findNode(route, rdNid).orElse(null); if (rdNode != null) { return parseRouteDistinguisher(rdNode.getValue()); } 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 0099ac6842..7f96c1a707 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 @@ -7,7 +7,6 @@ */ package org.opendaylight.protocol.bgp.evpn.impl; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import io.netty.buffer.ByteBuf; @@ -15,6 +14,7 @@ import io.netty.buffer.Unpooled; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java index 4d328497f2..249f47c8bf 100644 --- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java +++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java @@ -43,6 +43,10 @@ public final class EvpnTestUtil { public static final String RD_MODEL = "1.2.3.4:258"; public static final RouteDistinguisher RD = RouteDistinguisherBuilder.getDefaultInstance(RD_MODEL); + private EvpnTestUtil() { + throw new UnsupportedOperationException(); + } + public static DataContainerNodeAttrBuilder createContBuilder( final NodeIdentifier nid) { return ImmutableContainerNodeSchemaAwareBuilder.create().withNodeIdentifier(nid); diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java index 8caf7b84a9..86184f53c5 100644 --- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java +++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java @@ -258,6 +258,10 @@ final class PMSITunnelAttributeHandlerTestUtil { static final IpAddress IP_ADDRESS = new IpAddress(new Ipv4Address("1.1.1.1")); private static final Short NO_SUPPORTED_OPAQUE = 200; + private PMSITunnelAttributeHandlerTestUtil() { + throw new UnsupportedOperationException(); + } + static class MockTunnelIdentifier implements TunnelIdentifier { @Override public Class getImplementedInterface() { 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 360f7d9b8d..15cb0dc253 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 @@ -11,12 +11,12 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java index 09e865fe0e..bafebd74c6 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java @@ -9,11 +9,11 @@ package org.opendaylight.protocol.bgp.flowspec; import static java.util.Objects.requireNonNull; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import java.util.Collection; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.protocol.bgp.parser.spi.PathIdUtil; diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java index 84bddab39b..795c94b8a3 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java @@ -7,9 +7,9 @@ */ package org.opendaylight.protocol.bgp.flowspec.ipv4; -import com.google.common.base.Optional; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Set; import org.opendaylight.protocol.bgp.flowspec.AbstractFlowspecNlriParser; import org.opendaylight.protocol.bgp.flowspec.handlers.NumericOneByteOperandParser; diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java index 6110324eba..e251338e1c 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java @@ -7,9 +7,9 @@ */ package org.opendaylight.protocol.bgp.flowspec.ipv6; -import com.google.common.base.Optional; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Set; import org.opendaylight.protocol.bgp.flowspec.AbstractFlowspecNlriParser; import org.opendaylight.protocol.bgp.flowspec.handlers.NumericOneByteOperandParser; diff --git a/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java b/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java index 1cd2b9be1d..e06cb257de 100644 --- a/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java +++ b/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java @@ -7,10 +7,10 @@ */ package org.opendaylight.protocol.bgp.inet; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.protocol.bgp.parser.spi.PathIdUtil; @@ -43,9 +43,9 @@ abstract class AbstractIPRibSupport extends MultiPathAbstractRIBSupport { protected AbstractIPRibSupport(final Class prefixClass, final Class addressFamilyClass, - final Class cazeClass, + final Class cazeClass, final Class containerClass, final Class listClass, - final QName destinationQname, final QName prefixesQname) { + final QName destinationQname, final QName prefixesQname) { super(cazeClass, containerClass, listClass, addressFamilyClass, UnicastSubsequentAddressFamily.class, "prefix", destinationQname); this.prefixNid = new NodeIdentifier(routeKeyQName()); diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java index d0f461455d..413d63ba79 100644 --- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java +++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java @@ -7,7 +7,6 @@ */ package org.opendaylight.protocol.bgp.l3vpn; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; @@ -16,6 +15,7 @@ import io.netty.buffer.Unpooled; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.opendaylight.bgp.concepts.RouteDistinguisherUtil; diff --git a/bgp/labeled-unicast/src/main/java/org/opendaylight/protocol/bgp/labeled/unicast/AbstractLabeledUnicastRIBSupport.java b/bgp/labeled-unicast/src/main/java/org/opendaylight/protocol/bgp/labeled/unicast/AbstractLabeledUnicastRIBSupport.java index 0a39473844..b58000423e 100644 --- a/bgp/labeled-unicast/src/main/java/org/opendaylight/protocol/bgp/labeled/unicast/AbstractLabeledUnicastRIBSupport.java +++ b/bgp/labeled-unicast/src/main/java/org/opendaylight/protocol/bgp/labeled/unicast/AbstractLabeledUnicastRIBSupport.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.bgp.labeled.unicast; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import io.netty.buffer.ByteBuf; @@ -17,6 +16,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.protocol.bgp.parser.spi.PathIdUtil; 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 3a3d6c3c7d..1ee205b908 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 @@ -7,13 +7,13 @@ */ package org.opendaylight.protocol.bgp.linkstate.impl; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java index 7c07a42803..c028d54193 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/LinkstateNlriParser.java @@ -8,12 +8,12 @@ package org.opendaylight.protocol.bgp.linkstate.impl.nlri; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import org.opendaylight.protocol.bgp.linkstate.spi.AbstractTeLspNlriCodec; import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry; import org.opendaylight.protocol.bgp.parser.BGPParsingException; @@ -136,7 +136,7 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer { final Attributes1 pathAttributes1 = pathAttributes.getAugmentation(Attributes1.class); final Attributes2 pathAttributes2 = pathAttributes.getAugmentation(Attributes2.class); if (pathAttributes1 != null) { - serializeAdvertisedRoutes((pathAttributes1.getMpReachNlri()).getAdvertizedRoutes(), byteAggregator); + serializeAdvertisedRoutes(pathAttributes1.getMpReachNlri().getAdvertizedRoutes(), byteAggregator); } else if (pathAttributes2 != null) { serializeWithDrawnRoutes(pathAttributes2.getMpUnreachNlri().getWithdrawnRoutes(), byteAggregator); } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java index e410ba8359..c5a3289492 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java @@ -8,8 +8,8 @@ package org.opendaylight.protocol.bgp.linkstate.impl.nlri; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import io.netty.buffer.ByteBuf; +import java.util.Optional; import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.AreaIdTlvParser; import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.AsNumTlvParser; import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.BgpRouterIdTlvParser; diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java index 6b7538a052..34d07a9a2d 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/OspfRouteTlvParser.java @@ -7,8 +7,8 @@ */ package org.opendaylight.protocol.bgp.linkstate.impl.tlvs; -import com.google.common.base.Optional; import io.netty.buffer.ByteBuf; +import java.util.Optional; import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser; import org.opendaylight.protocol.util.ByteBufWriteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev171207.OspfRouteType; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java index 9fe8c32044..47e4814a3a 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java @@ -8,10 +8,10 @@ package org.opendaylight.protocol.bgp.parser.spi; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import io.netty.buffer.ByteBuf; +import java.util.Optional; import org.opendaylight.protocol.util.ByteBufWriteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.PathId; import org.opendaylight.yangtools.yang.common.QName; @@ -62,11 +62,7 @@ public final class PathIdUtil { * @return The path identifier from data change */ public static Long extractPathId(final NormalizedNode data, final NodeIdentifier pathNii) { - final NormalizedNode pathId = NormalizedNodes.findNode(data, pathNii).orNull(); - if (pathId == null) { - return null; - } - return (Long) pathId.getValue(); + return (Long) NormalizedNodes.findNode(data, pathNii).map(NormalizedNode::getValue).orElse(null); } /** @@ -80,7 +76,8 @@ public final class PathIdUtil { * @return Route Key Nid */ public static NodeIdentifierWithPredicates createNidKey(final long pathId, final PathArgument routeId, - final QName routeQname, final QName pathidQname, final QName routeKeyQname) { + final QName routeQname, + final QName pathidQname, final QName routeKeyQname) { return createNodeIdentifierWithPredicates(routeQname, pathidQname, pathId, routeKeyQname, getObjectKey(routeId, routeKeyQname)); } @@ -93,11 +90,11 @@ public final class PathIdUtil { * @return key */ public static Object getObjectKey(final PathArgument routeId, final QName routeKeyQname) { - return (((NodeIdentifierWithPredicates) routeId).getKeyValues()).get(routeKeyQname); + return ((NodeIdentifierWithPredicates) routeId).getKeyValues().get(routeKeyQname); } - public static NodeIdentifierWithPredicates createNodeIdentifierWithPredicates(final QName routeQname, - final QName pathidQname, final Object pathId, final QName routeKeyQname, final Object keyObject) { + public static NodeIdentifierWithPredicates createNodeIdentifierWithPredicates(final QName routeQname, final QName pathidQname, final Object pathId, + final QName routeKeyQname, final Object keyObject) { final ImmutableMap keyValues = ImmutableMap.of(pathidQname, pathId, routeKeyQname, keyObject); return new NodeIdentifierWithPredicates(routeQname, keyValues); } @@ -124,14 +121,15 @@ public final class PathIdUtil { * @param pathIdQname path Id Qname * @param routeKeyValue route key value * @param maybePathIdLeaf path id container, it might me supported or not, in that case default 0 value will - * be assigned + * be + * assigned * @return Route Key Nid */ public static NodeIdentifierWithPredicates createNidKey(final QName routeQname, final QName routeKeyQname, final QName pathIdQname, final Object routeKeyValue, final Optional> maybePathIdLeaf) { // FIXME: a cache here would mean we instantiate the same identifier for each route making comparison quicker. - final Object pathId = maybePathIdLeaf.isPresent() ? (maybePathIdLeaf.get()).getValue() : NON_PATH_ID; + final Object pathId = maybePathIdLeaf.isPresent() ? maybePathIdLeaf.get().getValue() : NON_PATH_ID; return createNodeIdentifierWithPredicates(routeQname, pathIdQname, pathId, routeKeyQname, routeKeyValue); } } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/BesthPathStateUtil.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/BesthPathStateUtil.java index b7625ab075..0aa1e9efb9 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/BesthPathStateUtil.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/BesthPathStateUtil.java @@ -12,7 +12,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.as.path.Segments; public final class BesthPathStateUtil { - BesthPathStateUtil() { + private BesthPathStateUtil() { throw new UnsupportedOperationException(); } 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 3a3159f0b0..0368b6e095 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 @@ -11,13 +11,13 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Optional; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.protocol.bgp.mode.BesthPathStateUtil; 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 0f156347a2..ef91b92b0a 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 @@ -93,7 +93,7 @@ public abstract class AddPathAbstractRouteEntry extends AbstractRouteEntry { final NormalizedNode data) { LOG.trace("Find {} in {}", attributesIdentifier, data); final ContainerNode advertisedAttrs - = (ContainerNode) NormalizedNodes.findNode(data, attributesIdentifier).orNull(); + = (ContainerNode) NormalizedNodes.findNode(data, attributesIdentifier).orElse(null); return addRoute(key, advertisedAttrs); } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java index 12aa4a60a2..e3381a83c9 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java @@ -83,7 +83,7 @@ abstract class BaseAbstractRouteEntry extends AbstractRouteEntry { final NodeIdentifier attributesIdentifier, final NormalizedNode data) { LOG.trace("Find {} in {}", attributesIdentifier, data); final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes - .findNode(data, attributesIdentifier).orNull(); + .findNode(data, attributesIdentifier).orElse(null); int offset = this.offsets.offsetOf(routerId); if (offset < 0) { final OffsetMap newOffsets = this.offsets.with(routerId); 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 05fae4d2d3..ef4da5a97d 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 @@ -8,10 +8,10 @@ package org.opendaylight.protocol.bgp.mode.spi; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.primitives.UnsignedInteger; import java.util.Collection; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.protocol.bgp.rib.spi.RouterIds; 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 eeb2e29371..69cf0706c8 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 @@ -44,24 +44,13 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable { final BGPDispatcher bgpDispatcher) { this.bgpDispatcher = requireNonNull(bgpDispatcher); this.address = getAddress(requireNonNull(bindingAddress), requireNonNull(portNumber)); - if (!PlatformDependent.isWindows() && !PlatformDependent.isRoot() + if (!PlatformDependent.isWindows() && !PlatformDependent.maybeSuperUser() && portNumber.getValue() < PRIVILEGED_PORTS) { throw new AccessControlException("Unable to bind port " + portNumber.getValue() + " while running as non-root user."); } } - private static InetSocketAddress getAddress(final IpAddress ipAddress, final PortNumber portNumber) { - final InetAddress inetAddr; - try { - inetAddr = InetAddress.getByName(ipAddress.getIpv4Address() != null - ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue()); - } catch (final UnknownHostException e) { - throw new IllegalArgumentException("Illegal binding address " + ipAddress, e); - } - return new InetSocketAddress(inetAddr, portNumber.getValue()); - } - public void start() { LOG.debug("Instantiating BGP Peer Acceptor : {}", this.address); @@ -69,15 +58,26 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable { // Validate future success this.futureChannel.addListener(future -> { Preconditions.checkArgument(future.isSuccess(), "Unable to start bgp server on %s", - this.address, future.cause()); + this.address, future.cause()); final Channel channel = this.futureChannel.channel(); if (Epoll.isAvailable()) { this.listenerRegistration = this.bgpDispatcher.getBGPPeerRegistry().registerPeerRegisterListener( - new BGPPeerAcceptorImpl.PeerRegistryListenerImpl(channel.config())); + new BGPPeerAcceptorImpl.PeerRegistryListenerImpl(channel.config())); } }); } + private static InetSocketAddress getAddress(final IpAddress ipAddress, final PortNumber portNumber) { + final InetAddress inetAddr; + try { + inetAddr = InetAddress.getByName(ipAddress.getIpv4Address() != null + ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue()); + } catch (final UnknownHostException e) { + throw new IllegalArgumentException("Illegal binding address " + ipAddress, e); + } + return new InetSocketAddress(inetAddr, portNumber.getValue()); + } + /** * This closes the acceptor and no new bgp connections will be accepted * Connections already established will be preserved. diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java index 7f69cadd28..81291c19de 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java @@ -9,10 +9,10 @@ package org.opendaylight.protocol.bgp.rib.impl; import static java.util.Objects.requireNonNull; -import com.google.common.base.Optional; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.concurrent.atomic.LongAdder; import java.util.stream.Collectors; import javax.annotation.Nonnull; @@ -151,7 +151,7 @@ final class AdjRibOutListener implements ClusteredDOMDataTreeChangeListener, Pre LOG.debug("AdjRibOut parsing route {}", NormalizedNodes.toStringTree(route)); } final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes.findNode(route, - this.support.routeAttributesIdentifier()).orNull(); + this.support.routeAttributesIdentifier()).orElse(null); return this.codecs.deserializeAttributes(advertisedAttrs); } 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 1a422febae..94ca8d1f99 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 @@ -7,13 +7,13 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.Iterator; +import java.util.Optional; import org.opendaylight.protocol.util.Values; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.AsPath; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index 65c21974d7..215ec9eff7 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -9,12 +9,12 @@ package org.opendaylight.protocol.bgp.rib.impl; import static java.util.Objects.requireNonNull; -import com.google.common.base.Optional; import com.google.common.base.Verify; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.LongAdder; import javax.annotation.Nonnull; @@ -81,7 +81,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn AdjInTracker(final DOMDataTreeChangeService service, final RIBSupportContextRegistry registry, final DOMTransactionChain chain, final YangInstanceIdentifier peerIId, - @Nonnull Set tables) { + @Nonnull final Set tables) { this.registry = requireNonNull(registry); this.chain = requireNonNull(chain); this.peerIId = requireNonNull(peerIId); @@ -122,7 +122,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn tx.put(LogicalDatastoreType.OPERATIONAL, routeId, route.getDataAfter().get()); CountersUtil.increment(this.prefixesReceived.get(tablesKey), tablesKey); // Lookup per-table attributes from RIBSupport - final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes.findNode(route.getDataAfter(), ribSupport.routeAttributesIdentifier()).orNull(); + final ContainerNode advertisedAttrs = (ContainerNode) NormalizedNodes.findNode(route.getDataAfter(), ribSupport.routeAttributesIdentifier()).orElse(null); final ContainerNode effectiveAttrs; if (advertisedAttrs != null) { @@ -340,7 +340,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn @Nonnull final ImportPolicyPeerTracker importPolicyPeerTracker, @Nonnull final RIBSupportContextRegistry registry, final PeerRole peerRole, - @Nonnull Set tables) { + @Nonnull final Set tables) { return new EffectiveRibInWriter(service, chain, peerIId, importPolicyPeerTracker, registry, peerRole, tables); } @@ -350,7 +350,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn final ImportPolicyPeerTracker importPolicyPeerTracker, final RIBSupportContextRegistry registry, final PeerRole peerRole, - @Nonnull Set tables) { + @Nonnull final Set tables) { importPolicyPeerTracker.peerRoleChanged(peerIId, peerRole); this.importPolicy = importPolicyPeerTracker.policyFor(IdentifierUtils.peerId((NodeIdentifierWithPredicates) peerIId.getLastPathArgument())); this.adjInTracker = new AdjInTracker(service, registry, chain, peerIId, tables); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java index 03b58fc5bf..bdd4fb8000 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java @@ -9,11 +9,11 @@ package org.opendaylight.protocol.bgp.rib.impl; import static java.util.Objects.requireNonNull; -import com.google.common.base.Optional; import com.google.common.primitives.UnsignedInteger; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.LongAdder; import javax.annotation.Nonnull; @@ -216,7 +216,7 @@ final class LocRibWriter implements AutoCloseable, TotalPrefixesCounter, TotalPa final Map routes) { for (final DataTreeCandidateNode child : table.getChildNodes()) { LOG.debug("Modification type {}", child.getModificationType()); - if ((Attributes.QNAME).equals(child.getIdentifier().getNodeType())) { + if (Attributes.QNAME.equals(child.getIdentifier().getNodeType())) { if (child.getDataAfter().isPresent()) { // putting uptodate attribute in LOG.trace("Uptodate found for {}", child.getDataAfter()); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java index 7a0cf6ec21..1eda3a5f84 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java @@ -110,7 +110,7 @@ import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -class AbstractAddPathTest extends AbstractConcurrentDataBrokerTest { +public abstract class AbstractAddPathTest extends AbstractConcurrentDataBrokerTest { private static final int RETRY_TIMER = 10; static final String RIB_ID = "127.0.0.1"; static final BgpId BGP_ID = new BgpId(RIB_ID); 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 08b4041d89..d063372dc2 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 @@ -244,7 +244,7 @@ public class AbstractRIBTestSetup { final DataTreeCandidateNode child = mock(DataTreeCandidateNode.class); doReturn(createIdentifier(p)).when(child).getIdentifier(); - doReturn(Optional.of(b.build())).when(child).getDataAfter(); + doReturn(java.util.Optional.of(b.build())).when(child).getDataAfter(); doReturn(type).when(child).getModificationType(); children.add(child); } 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 65daec2108..8a779ba34a 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 @@ -87,13 +87,13 @@ public class RibImplTest extends AbstractConfig { Mockito.doReturn(mock(GeneratedClassLoadingStrategy.class)).when(this.extension).getClassLoadingStrategy(); Mockito.doReturn(this.ribSupport).when(this.extension).getRIBSupport(any(TablesKey.class)); - final NodeIdentifier nii = new NodeIdentifier(QName.create("test").intern()); + final NodeIdentifier nii = new NodeIdentifier(QName.create("", "test").intern()); Mockito.doReturn(nii).when(this.ribSupport).routeAttributesIdentifier(); Mockito.doReturn(ImmutableSet.of()).when(this.ribSupport).cacheableAttributeObjects(); final ChoiceNode choiceNode = mock(ChoiceNode.class); Mockito.doReturn(choiceNode).when(this.ribSupport).emptyRoutes(); Mockito.doReturn(nii).when(choiceNode).getIdentifier(); - Mockito.doReturn(QName.create("test").intern()).when(choiceNode).getNodeType(); + Mockito.doReturn(QName.create("", "test").intern()).when(choiceNode).getNodeType(); Mockito.doReturn(this.domTx).when(this.domDataBroker).createTransactionChain(any()); final DOMDataTreeChangeService dOMDataTreeChangeService = mock(DOMDataTreeChangeService.class); Mockito.doReturn(Collections.singletonMap(DOMDataTreeChangeService.class, dOMDataTreeChangeService)) 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 bc5d4c6325..5a60813de3 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 @@ -10,9 +10,9 @@ package org.opendaylight.protocol.bgp.rib.spi; import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import java.util.Collection; import java.util.Collections; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; @@ -256,7 +256,7 @@ public abstract class AbstractRIBSupport implements RIBSupport { private static ContainerNode getDestination(final DataContainerChild routes, final NodeIdentifier destinationId) { if (routes instanceof ContainerNode) { - final Optional> maybeDestination = + final java.util.Optional> maybeDestination = ((ContainerNode) routes).getChild(DESTINATION_TYPE); if (maybeDestination.isPresent()) { final DataContainerChild destination = maybeDestination.get(); 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 7f8fd961b7..69d1e2be08 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 @@ -15,13 +15,13 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -126,22 +126,16 @@ public class MultiPathAbstractRIBSupportTest { .withNodeIdentifier(new NodeIdentifier(QName.create(Ipv4Routes.QNAME, Attributes.QNAME .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 ChoiceNode destinations = Mockito.mock(ChoiceNode.class); + final ContainerNode route = Mockito.mock(ContainerNode.class); + final Optional optional = Optional.of(destination); + final Optional destinationOptional = Optional.of(destinations); + final Optional destinationsOptional = Optional.of(route); doReturn(optional).when(this.nlri).getChild(new NodeIdentifier(WithdrawnRoutes.QNAME)); doReturn(optional).when(this.nlri).getChild(new NodeIdentifier(AdvertizedRoutes.QNAME)); - doReturn(true).when(optional).isPresent(); - doReturn(destination).when(optional).get(); doReturn(destinationOptional).when(destination).getChild(new NodeIdentifier(DestinationType.QNAME)); - doReturn(true).when(destinationOptional).isPresent(); - doReturn(destinations).when(destinationOptional).get(); doReturn(destinationsOptional).when(destinations).getChild(new NodeIdentifier(Ipv4Prefixes.QNAME)); - doReturn(true).when(destinationsOptional).isPresent(); - doReturn(route).when(destinationsOptional).get(); doReturn(emptyCollection).when(route).getValue(); doAnswer(invocation -> { 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 fdc0b572ae..bc451ed8a0 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 @@ -396,7 +396,7 @@ public abstract class AbstractTopologyBuilder implements Cluste } @Override - public final synchronized void onTransactionChainFailed(final TransactionChain chain, + public final synchronized void onTransactionChainFailed(final TransactionChain transactionChain, final AsyncTransaction transaction, final Throwable cause) { LOG.error("Topology builder for {} failed in transaction {}.", getInstanceIdentifier(), transaction != null ? transaction.getIdentifier() : null, cause); @@ -405,7 +405,7 @@ public abstract class AbstractTopologyBuilder implements Cluste } @Override - public final void onTransactionChainSuccessful(final TransactionChain chain) { + public final void onTransactionChainSuccessful(final TransactionChain transactionChain) { LOG.info("Topology builder for {} shut down", getInstanceIdentifier()); } } 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 14f1bff09d..ddc6a037ae 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 @@ -232,11 +232,11 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder dto) { final ContainerNode bmpMonitorsConfigsContainer = (ContainerNode) dto; final MapNode monitorsList = (MapNode) bmpMonitorsConfigsContainer.getChild( - this.bmpMonitorsYii.getLastPathArgument()).orNull(); + this.bmpMonitorsYii.getLastPathArgument()).orElse(null); if (monitorsList == null) { return; } diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java index 24e73a93d6..081fc8719d 100644 --- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java +++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java @@ -160,10 +160,10 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable { } } - private synchronized void handleChanges(final WatchService watchService) { + private synchronized void handleChanges(final WatchService watch) { final WatchKey key; try { - key = watchService.take(); + key = watch.take(); } catch (final InterruptedException | ClosedWatchServiceException e) { if (!ConfigLoaderImpl.this.closed) { LOG.warn(INTERRUPTED, e); diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java index 032e94a56a..8373a11078 100644 --- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java +++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java @@ -91,7 +91,6 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT this.eventList.add(this.watchEvent); } - @After public final void tearDown() throws Exception { ((ConfigLoaderImpl) this.configLoader).close(); diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java index 689590df25..1951ddca9e 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java @@ -87,13 +87,14 @@ final class PCCsBuilder { } } - private void createPCC(@Nonnull final InetSocketAddress localAddress, @Nonnull final PCCTunnelManager tunnelManager, - final BigInteger initialDBVersion) throws InterruptedException, ExecutionException { + private void createPCC(@Nonnull final InetSocketAddress plocalAddress, + final PCCTunnelManager tunnelManager, final BigInteger initialDBVersion) + throws InterruptedException, ExecutionException { final PCEPSessionNegotiatorFactory snf = getSessionNegotiatorFactory(); for (final InetSocketAddress pceAddress : this.remoteAddress) { this.pccDispatcher.createClient(pceAddress, this.reconnectTime, () -> new PCCSessionListener( - this.remoteAddress.indexOf(pceAddress), tunnelManager, this.pcError), snf, - KeyMapping.getKeyMapping(pceAddress.getAddress(), this.password), localAddress, initialDBVersion); + this.remoteAddress.indexOf(pceAddress), tunnelManager, this.pcError), snf, + KeyMapping.getKeyMapping(pceAddress.getAddress(), this.password), plocalAddress, initialDBVersion); } } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java index 1141965c09..9ce15d2a10 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java @@ -64,7 +64,7 @@ public class TimerHandler { } } - public void setPCCDispatcher(final PCCDispatcherImpl pccDispatcher) { - this.pccDispatcher = pccDispatcher; + public void setPCCDispatcher(final PCCDispatcherImpl dispatcher) { + this.pccDispatcher = dispatcher; } } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCSessionListener.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCSessionListener.java index 9c13931db3..dd3eb77c01 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCSessionListener.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCSessionListener.java @@ -43,11 +43,11 @@ public final class PCCSessionListener implements PCEPSessionListener, PCCSession } @Override - public void onMessage(final PCEPSession session, final Message message) { + public void onMessage(final PCEPSession psession, final Message message) { LOG.trace("Received message: {}", message); if (this.errorMode) { //random error message - session.sendMessage(createErrorMessage(message)); + psession.sendMessage(createErrorMessage(message)); return; } if (message instanceof Pcupd) { @@ -60,26 +60,26 @@ public final class PCCSessionListener implements PCEPSessionListener, PCCSession } @Override - public void onSessionUp(final PCEPSession session) { + public void onSessionUp(final PCEPSession psession) { LOG.debug("Session up."); - this.session = session; + this.session = psession; this.tunnelManager.onSessionUp(this); } @Override @SuppressWarnings("checkstyle:IllegalCatch") - public void onSessionDown(final PCEPSession session, final Exception exception) { + public void onSessionDown(final PCEPSession psession, final Exception exception) { LOG.info("Session down with cause : {} or exception: {}", exception.getCause(), exception, exception); this.tunnelManager.onSessionDown(this); try { - session.close(); + psession.close(); } catch (Exception ie) { LOG.warn("Error closing session", ie); } } @Override - public void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason cause) { + public void onSessionTerminated(final PCEPSession psession, final PCEPTerminationReason cause) { LOG.info("Session terminated. Cause : {}", cause.toString()); } @@ -105,7 +105,7 @@ public final class PCCSessionListener implements PCEPSessionListener, PCCSession @Override public Tlvs localSessionCharacteristics() { - return this.session.localSessionCharacteristics(); + return this.session.getLocalTlvs(); } private final Random rnd = new Random(); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java index 8bd729c6ba..8da18d8d43 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java @@ -149,7 +149,7 @@ public abstract class PCCMockCommon { assertTrue(session.getRemoteTlvs().getAugmentation(Tlvs1.class).getStateful() .getAugmentation(Stateful1.class).isInitiation()); - assertNull(session.localSessionCharacteristics().getAugmentation(Tlvs3.class) + assertNull(session.getLocalTlvs().getAugmentation(Tlvs3.class) .getLspDbVersion().getLspDbVersionValue()); } @@ -174,7 +174,7 @@ public abstract class PCCMockCommon { assertTrue(session.getRemoteTlvs().getAugmentation(Tlvs1.class).getStateful() .getAugmentation(Stateful1.class).isInitiation()); - final BigInteger pceDBVersion = session.localSessionCharacteristics().getAugmentation(Tlvs3.class) + final BigInteger pceDBVersion = session.getLocalTlvs().getAugmentation(Tlvs3.class) .getLspDbVersion().getLspDbVersionValue(); assertEquals(startingDBVersion, pceDBVersion); } 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 b23c928532..9a90e7ccff 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 @@ -24,7 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestingSessionListener implements PCEPSessionListener, ListenerCheck { +public final class TestingSessionListener implements PCEPSessionListener, ListenerCheck { private static final Logger LOG = LoggerFactory.getLogger(TestingSessionListener.class); private final CountDownLatch sessionLatch = new CountDownLatch(1); @@ -36,29 +36,29 @@ public class TestingSessionListener implements PCEPSessionListener, ListenerChec private PCEPSession session = null; @Override - public synchronized void onMessage(final PCEPSession session, final Message message) { + public synchronized void onMessage(final PCEPSession psession, final Message message) { LOG.debug("Received message: {}", message); this.messages.add(message); } @Override - public void onSessionUp(final PCEPSession session) { + public void onSessionUp(final PCEPSession psession) { LOG.debug("Session up."); this.up = true; - this.session = session; + this.session = psession; this.sessionLatch.countDown(); } @Override - public void onSessionDown(final PCEPSession session, final Exception exception) { + public void onSessionDown(final PCEPSession psession, final Exception exception) { LOG.debug("Session down. Cause : {} ", exception, exception); this.up = false; this.session = null; } @Override - public void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason cause) { + public void onSessionTerminated(final PCEPSession psession, final PCEPTerminationReason cause) { LOG.debug("Session terminated. Cause : {}", cause); } diff --git a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java index 473df47e1c..8bec65ec20 100644 --- a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java +++ b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java @@ -23,7 +23,11 @@ import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCDispatcherImpl; import org.opendaylight.protocol.pcep.spi.pojo.ServiceLoaderPCEPExtensionProviderContext; import org.opendaylight.protocol.util.InetSocketAddressUtil; -public class PCCMock { +public final class PCCMock { + + private PCCMock() { + throw new UnsupportedOperationException(); + } public static void main(final String[] args) throws InterruptedException, ExecutionException { Preconditions.checkArgument(args.length > 0, "Host and port of server must be provided."); diff --git a/pcep/topology/cli/pom.xml b/pcep/topology/cli/pom.xml index e555f4c091..9428d29166 100644 --- a/pcep/topology/cli/pom.xml +++ b/pcep/topology/cli/pom.xml @@ -81,27 +81,6 @@ - - - - org.apache.felix - maven-bundle-plugin - true - - - - - org.apache.karaf.shell.commands;version="[3.0.0,4.1)", - org.apache.karaf.shell.console;version="[3.0.0,4.1)", - org.apache.karaf.shell.table;version="[3.0.0,4.1)", - * - - - - - - - scm:git:ssh://git.opendaylight.org:29418/bgpcep.git scm:git:ssh://git.opendaylight.org:29418/bgpcep.git diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index 6e0eb2e5f2..b43b1c0147 100755 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -118,35 +118,35 @@ public abstract class AbstractTopologySessionListener implements TopologyS } @Override - public final synchronized void onSessionUp(final PCEPSession session) { + public final synchronized void onSessionUp(final PCEPSession psession) { /* * The session went up. Look up the router in Inventory model, * create it if it is not there (marking that fact for later * deletion), and mark it as synchronizing. Also create it in * the topology model, with empty LSP list. */ - final InetAddress peerAddress = session.getRemoteAddress(); + final InetAddress peerAddress = psession.getRemoteAddress(); - this.syncOptimization = new SyncOptimization(session); + this.syncOptimization = new SyncOptimization(psession); final TopologyNodeState state = this.serverSessionManager.takeNodeState(peerAddress, this, isLspDbRetreived()); // takeNodeState(..) may fail when the server session manager is being restarted due to configuration change if (state == null) { - LOG.error("Unable to fetch topology node state for PCEP session. Closing session {}", session); - session.close(TerminationReason.UNKNOWN); - this.onSessionTerminated(session, new PCEPCloseTermination(TerminationReason.UNKNOWN)); + LOG.error("Unable to fetch topology node state for PCEP session. Closing session {}", psession); + psession.close(TerminationReason.UNKNOWN); + this.onSessionTerminated(psession, new PCEPCloseTermination(TerminationReason.UNKNOWN)); return; } if (this.session != null || this.nodeState != null) { - LOG.error("PCEP session is already up with {}. Closing session {}", session.getRemoteAddress(), session); - session.close(TerminationReason.UNKNOWN); - this.onSessionTerminated(session, new PCEPCloseTermination(TerminationReason.UNKNOWN)); + LOG.error("PCEP session is already up with {}. Closing session {}", psession.getRemoteAddress(), psession); + psession.close(TerminationReason.UNKNOWN); + this.onSessionTerminated(psession, new PCEPCloseTermination(TerminationReason.UNKNOWN)); return; } - this.session = session; + this.session = psession; this.nodeState = state; this.serverSessionManager.bind(this.nodeState.getNodeId(), this.listenerState); @@ -155,7 +155,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS // Our augmentation in the topology node final PathComputationClientBuilder pccBuilder = new PathComputationClientBuilder(); - onSessionUp(session, pccBuilder); + onSessionUp(psession, pccBuilder); this.synced.set(isSynchronized()); pccBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(peerAddress.getHostAddress())); @@ -169,8 +169,8 @@ public abstract class AbstractTopologySessionListener implements TopologyS .getPathComputationClient().getReportedLsp()); } writeNode(pccBuilder, state, topologyAugment); - this.listenerState.init(session); - LOG.info("Session with {} attached to topology node {}", session.getRemoteAddress(), state.getNodeId()); + this.listenerState.init(psession); + LOG.info("Session with {} attached to topology node {}", psession.getRemoteAddress(), state.getNodeId()); } private void writeNode(final PathComputationClientBuilder pccBuilder, final TopologyNodeState state, @@ -237,19 +237,19 @@ public abstract class AbstractTopologySessionListener implements TopologyS */ @GuardedBy("this") @SuppressWarnings("checkstyle:IllegalCatch") - private synchronized void tearDown(final PCEPSession session) { + private synchronized void tearDown(final PCEPSession psession) { - requireNonNull(session); - this.serverSessionManager.releaseNodeState(this.nodeState, session, isLspDbPersisted()); + requireNonNull(psession); + this.serverSessionManager.releaseNodeState(this.nodeState, psession, isLspDbPersisted()); clearNodeState(); try { if (this.session != null) { this.session.close(); } - session.close(); + psession.close(); } catch (final Exception e) { - LOG.error("Session {} cannot be closed.", session, e); + LOG.error("Session {} cannot be closed.", psession, e); } this.session = null; this.syncOptimization = null; @@ -280,28 +280,28 @@ public abstract class AbstractTopologySessionListener implements TopologyS } @Override - public final synchronized void onSessionDown(final PCEPSession session, final Exception exception) { - LOG.warn("Session {} went down unexpectedly", session, exception); - tearDown(session); + public final synchronized void onSessionDown(final PCEPSession psession, final Exception exception) { + LOG.warn("Session {} went down unexpectedly", psession, exception); + tearDown(psession); } @Override - public final synchronized void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason reason) { - LOG.info("Session {} terminated by peer with reason {}", session, reason); - tearDown(session); + public final synchronized void onSessionTerminated(final PCEPSession psession, final PCEPTerminationReason reason) { + LOG.info("Session {} terminated by peer with reason {}", psession, reason); + tearDown(psession); } @Override - public final synchronized void onMessage(final PCEPSession session, final Message message) { + public final synchronized void onMessage(final PCEPSession psession, final Message message) { if (this.nodeState == null) { - LOG.warn("Topology node state is null. Unhandled message {} on session {}", message, session); - session.close(TerminationReason.UNKNOWN); + LOG.warn("Topology node state is null. Unhandled message {} on session {}", message, psession); + psession.close(TerminationReason.UNKNOWN); return; } final MessageContext ctx = new MessageContext(this.nodeState.beginTransaction()); if (onMessage(ctx, message)) { - LOG.warn("Unhandled message {} on session {}", message, session); + LOG.warn("Unhandled message {} on session {}", message, psession); //cancel not supported, submit empty transaction ctx.trans.submit(); return; @@ -310,15 +310,15 @@ public abstract class AbstractTopologySessionListener implements TopologyS Futures.addCallback(ctx.trans.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) { - LOG.trace("Internal state for session {} updated successfully", session); + LOG.trace("Internal state for session {} updated successfully", psession); ctx.notifyRequests(); } @Override public void onFailure(final Throwable throwable) { - LOG.error("Failed to update internal state for session {}, closing it", session, throwable); + LOG.error("Failed to update internal state for session {}, closing it", psession, throwable); ctx.notifyRequests(); - session.close(TerminationReason.UNKNOWN); + psession.close(TerminationReason.UNKNOWN); } }, MoreExecutors.directExecutor()); } diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java index 77ec63792a..f0d28066c4 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java @@ -151,7 +151,7 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener } @Override - public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, + public void onTransactionChainFailed(final TransactionChain pchain, final AsyncTransaction transaction, final Throwable cause) { // FIXME: flip internal state, so that the next attempt to update fails, triggering node reconnect LOG.error("Unexpected transaction failure in node {} transaction {}", @@ -159,7 +159,7 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener } @Override - public void onTransactionChainSuccessful(final TransactionChain chain) { + public void onTransactionChainSuccessful(final TransactionChain pchain) { LOG.info("Node {} shutdown successfully", this.nodeId); } diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java index 5eed2e1ff1..cd11f43c46 100644 --- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java +++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java @@ -58,15 +58,15 @@ final class InstructionImpl implements Instruction { return this.status; } - private synchronized void setStatus(final InstructionStatus status, final Details details) { + private synchronized void setStatus(final InstructionStatus newStatus, final Details details) { // Set the status - this.status = status; - LOG.debug("Instruction {} transitioned to status {}", this.id, status); + this.status = newStatus; + LOG.debug("Instruction {} transitioned to status {}", this.id, newStatus); // Send out a notification - this.queue.instructionUpdated(status, details); + this.queue.instructionUpdated(newStatus, details); - switch (status) { + switch (newStatus) { case Cancelled: case Failed: case Unknown: @@ -186,7 +186,7 @@ final class InstructionImpl implements Instruction { } @Override - public void executionCompleted(final InstructionStatus status, final Details details) { + public void executionCompleted(final InstructionStatus newStatus, final Details details) { final ExecutionResult
result; synchronized (this) { @@ -195,8 +195,8 @@ final class InstructionImpl implements Instruction { cancelTimeout(); // We reuse the preconditions set down in this class - result = new ExecutionResult<>(status, details); - setStatus(status, details); + result = new ExecutionResult<>(newStatus, details); + setStatus(newStatus, details); this.executionFuture.set(result); } } 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 f21ec395a8..eda5405980 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 @@ -36,6 +36,10 @@ public class ProtectionCommonParser { private static final int FLAGS_SIZE = 8; private static final Logger LOG = LoggerFactory.getLogger(ProtectionCommonParser.class); + protected ProtectionCommonParser() { + + } + protected static void serializeBodyType1(final ProtectionSubobject protObj, final ByteBuf output) { final BitArray flagBitArray = new BitArray(FLAGS_SIZE); flagBitArray.set(SECONDARY, protObj.isSecondary()); diff --git a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectUtil.java b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectUtil.java index 43ef2ae46b..9019aeb3cd 100644 --- a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectUtil.java +++ b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectUtil.java @@ -598,4 +598,8 @@ final class TEObjectUtil { (byte) 0xa5, 0x08, 0x00, 0x01, (byte) 0x00, 0x00, 0x00, 0x08, }; + + private TEObjectUtil() { + + } } 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 9cf96b08e7..500a254ca9 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,6 +19,10 @@ 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 { + protected CommonPathKeyParser() { + + } + public static 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(); 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 32f00f1373..66ca6e7863 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 @@ -9,7 +9,6 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; import com.google.common.base.Preconditions; - import io.netty.buffer.ByteBuf; import org.opendaylight.protocol.util.ByteBufWriteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.UnnumberedCase; @@ -18,6 +17,10 @@ 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 CommonUnnumberedInterfaceSubobjectParser() { + + } + protected static UnnumberedCase parseUnnumeredInterface(final ByteBuf buffer) { final UnnumberedBuilder ubuilder = new UnnumberedBuilder(); ubuilder.setRouterId(buffer.readUnsignedInt()); diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/EROSubobjectUtilTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/EROSubobjectUtilTest.java index 746a971a5f..abc1cfcc53 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/EROSubobjectUtilTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/EROSubobjectUtilTest.java @@ -18,7 +18,7 @@ import org.junit.Test; public class EROSubobjectUtilTest { @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings({"checkstyle:IllegalCatch", "checkstyle:IllegalThrows"}) + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) public void testPrivateConstructor() throws Throwable { final Constructor c = EROSubobjectUtil.class.getDeclaredConstructor(); c.setAccessible(true); diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java index 5446932329..d9becf854d 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java @@ -167,7 +167,7 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { } @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings("checkstyle:IllegalThrows") + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) public void testPrivateConstructor() throws Throwable { final Constructor c = ServiceLoaderRSVPExtensionProviderContext.class.getDeclaredConstructor(); diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 994eb77b51..9ced09df85 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -1,6 +1,6 @@