From fd549f397a7343d7df9fe65a58dfb3b998108fc5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 5 Sep 2019 18:36:01 +0200 Subject: [PATCH] Bump odlparent to 6.0.0 This bumps odlparent to 6.0.0 as part of Magnesium MRI. Change-Id: I19505dd80b832cd6ed8b68daf471d9e90d3dfdd2 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- bgp/bgp-artifacts/pom.xml | 2 +- bgp/config-example/pom.xml | 2 +- bgp/extensions/pom.xml | 2 +- .../openconfig/routing/policy/impl/BGPRibPolicyImpl.java | 3 +++ .../policy/statement/AbstractCommunityHandler.java | 3 +++ .../policy/statement/AbstractExtCommunityHandler.java | 3 +++ .../statement/conditions/MatchAsPathSetHandler.java | 3 +++ .../statement/conditions/MatchBgpNeighborSetHandler.java | 3 +++ .../statement/conditions/MatchClusterIdSetHandler.java | 3 +++ .../conditions/MatchOriginatorIdSetHandler.java | 3 +++ .../policy/statement/conditions/MatchRoleSetHandler.java | 3 +++ .../protocol/bgp/state/StateProviderImpl.java | 3 +++ bgp/pom.xml | 2 +- .../protocol/bgp/rib/impl/CodecsRegistryImpl.java | 3 +++ .../bgp/rib/impl/RIBSupportContextRegistryImpl.java | 3 +++ .../protocol/bgp/rib/impl/config/BgpDeployerImpl.java | 3 +++ .../protocol/bgp/rib/impl/config/BgpPeer.java | 9 +++++++-- .../bgp/rib/impl/protocol/BGPReconnectPromise.java | 5 +++++ bmp/bmp-artifacts/pom.xml | 2 +- bmp/bmp-config-example/pom.xml | 2 +- bmp/pom.xml | 2 +- config-loader/config-loader-artifacts/pom.xml | 2 +- config-loader/pom.xml | 2 +- distribution-karaf/pom.xml | 2 +- feature-repo-parent/pom.xml | 2 +- features/bgp/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/bgpcep-extras/pom.xml | 2 +- features/bmp/pom.xml | 2 +- features/concepts/pom.xml | 2 +- features/config-loader/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/pcep/pom.xml | 2 +- features/pom.xml | 2 +- features/rsvp/pom.xml | 2 +- features/topology/pom.xml | 2 +- parent/pom.xml | 2 +- pcep/config-example/pom.xml | 2 +- pcep/pcep-artifacts/pom.xml | 2 +- pcep/pom.xml | 2 +- pcep/topology/pom.xml | 2 +- pcep/tunnel/pom.xml | 2 +- pom.xml | 2 +- .../bgpcep/programming/impl/ProgrammingServiceImpl.java | 3 +++ programming/pom.xml | 2 +- programming/programming-artifacts/pom.xml | 2 +- rsvp/pom.xml | 2 +- rsvp/rsvp-artifacts/pom.xml | 2 +- single-feature-parent/pom.xml | 2 +- testtool-parent/pom.xml | 2 +- topology/pom.xml | 2 +- topology/topology-artifacts/pom.xml | 2 +- 53 files changed, 89 insertions(+), 40 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d6598c5c6e..b3a94e8fe3 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/bgp/bgp-artifacts/pom.xml b/bgp/bgp-artifacts/pom.xml index 3b07dafc4f..02004f593a 100644 --- a/bgp/bgp-artifacts/pom.xml +++ b/bgp/bgp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml index 297e314eb1..aff7543186 100644 --- a/bgp/config-example/pom.xml +++ b/bgp/config-example/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml index 790615d1b0..39cf9a48f8 100644 --- a/bgp/extensions/pom.xml +++ b/bgp/extensions/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java index fc90a335b4..390a48dbd0 100644 --- a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java +++ b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java @@ -14,6 +14,7 @@ import static org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.regist import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -85,6 +86,8 @@ final class BGPRibPolicyImpl implements BGPRibRoutingPolicy { this.ribBaseParameters = new PolicyRIBBaseParametersImpl(localAs, originatorId, clusterId); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List loadStatements(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.databroker.newReadOnlyTransaction(); final Optional result = diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractCommunityHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractCommunityHandler.java index 6f081c0a0a..10a759d89f 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractCommunityHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractCommunityHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -49,6 +50,8 @@ public class AbstractCommunityHandler { this.databroker = requireNonNull(dataBroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List loadCommunitySet(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.databroker.newReadOnlyTransaction(); final Optional result = diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java index 6d557a699e..f6f57312c6 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -50,6 +51,8 @@ public class AbstractExtCommunityHandler { this.databroker = requireNonNull(databroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List loadCommunitySet(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.databroker.newReadOnlyTransaction(); diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchAsPathSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchAsPathSetHandler.java index 505698fbd8..faa449024f 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchAsPathSetHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchAsPathSetHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -66,6 +67,8 @@ public final class MatchAsPathSetHandler implements BgpConditionsPolicy result = tr.read(LogicalDatastoreType.CONFIGURATION, diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java index a0dfe01926..7f14294ab9 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -62,6 +63,8 @@ public final class MatchBgpNeighborSetHandler this.dataBroker = requireNonNull(dataBroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List loadRoleSets(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction(); final Optional result = tr.read(LogicalDatastoreType.CONFIGURATION, diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchClusterIdSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchClusterIdSetHandler.java index 5f784b7f0e..01917c09b3 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchClusterIdSetHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchClusterIdSetHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -63,6 +64,8 @@ public final class MatchClusterIdSetHandler this.dataBroker = requireNonNull(dataBroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private ClusterIdSet loadSets(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction(); final Optional result = tr.read(LogicalDatastoreType.CONFIGURATION, diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchOriginatorIdSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchOriginatorIdSetHandler.java index 2edead40d5..be9e63d16d 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchOriginatorIdSetHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchOriginatorIdSetHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Optional; import java.util.concurrent.ExecutionException; import org.apache.commons.lang3.StringUtils; @@ -60,6 +61,8 @@ public final class MatchOriginatorIdSetHandler this.dataBroker = requireNonNull(dataBroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private OriginatorIdSet loadSets(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction(); final Optional result = tr.read(LogicalDatastoreType.CONFIGURATION, diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchRoleSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchRoleSetHandler.java index d805444f4d..800ea14501 100644 --- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchRoleSetHandler.java +++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchRoleSetHandler.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -63,6 +64,8 @@ public final class MatchRoleSetHandler implements BgpConditionsAugmentationPolic this.dataBroker = requireNonNull(dataBroker); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List loadRoleSets(final String key) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction(); final Optional result = tr.read(LogicalDatastoreType.CONFIGURATION, diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java index c813bc8f5d..b2c0db760a 100644 --- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java +++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java @@ -12,6 +12,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -126,6 +127,8 @@ public final class StateProviderImpl implements TransactionChainListener, AutoCl this.scheduleTask = this.scheduler.scheduleAtFixedRate(task, 0, this.timeout, SECONDS); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private synchronized void updateBGPStats(final WriteTransaction wtx) { final Set oldStats = new HashSet<>(this.instanceIdentifiersCache.keySet()); this.stateCollector.getRibStats().stream().filter(BGPRibState::isActive).forEach(bgpStateConsumer -> { diff --git a/bgp/pom.xml b/bgp/pom.xml index 34a4e33f43..1adbd53031 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java index 60e9068de4..fefa55bfed 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory; import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; @@ -49,6 +50,8 @@ public final class CodecsRegistryImpl implements CodecsRegistry { return new CodecsRegistryImpl(codecFactory, classStrategy); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private Codecs createContext(final RIBSupport ribSupport) { final Codecs codecs = new CodecsImpl(ribSupport); if (this.latestCodecTree != null) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java index 3a7c53846d..2f0aaaff8f 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.protocol.bgp.rib.impl.spi.CodecsRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext; import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry; @@ -50,6 +51,8 @@ final class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry { return new RIBSupportContextRegistryImpl(extensions, codecs); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private RIBSupportContextImpl createRIBSupportContext(final RIBSupport support) { return new RIBSupportContextImpl(support, this.codecs); } 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 6b118ff4f7..22a9daadd6 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 @@ -16,6 +16,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -117,6 +118,8 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener loadPeerGroup(final InstanceIdentifier peerGroupIid) throws ExecutionException, InterruptedException { final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction(); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java index e6d6a8ffcc..4dd599dfad 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java @@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.util.concurrent.Future; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -85,6 +86,8 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer { this.rpcRegistry = rpcRegistry; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static List getBgpCapabilities(final AfiSafis afiSafis, final RIB rib, final BGPTableTypeRegistryConsumer tableTypeRegistry) { final List caps = new ArrayList<>(); @@ -122,6 +125,8 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer { return caps; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static Optional getPassword(final KeyMapping key) { if (key != null) { return Optional.of(Iterables.getOnlyElement(key.values())); @@ -310,7 +315,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer { Collections.emptySet(), gracefulRestartTimer, false, llGracefulRestarts)); } - private synchronized void instantiateServiceInstance() { + synchronized void instantiateServiceInstance() { this.isServiceInstantiated = true; LOG.info("Peer instantiated {}", this.neighborAddress); this.bgpPeer.instantiateServiceInstance(); @@ -321,7 +326,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer { } } - private synchronized FluentFuture closeServiceInstance() { + synchronized FluentFuture closeServiceInstance() { if (!this.isServiceInstantiated) { LOG.info("Peer {} already closed", this.neighborAddress); return CommitInfo.emptyFluentFuture(); 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 b9d3189b34..ceb813f5b9 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 @@ -9,6 +9,7 @@ package org.opendaylight.protocol.bgp.rib.impl.protocol; import static java.util.Objects.requireNonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -96,11 +97,15 @@ public class BGPReconnectPromise extends DefaultPromise org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml index 2ead7d4998..6917f4984b 100644 --- a/bmp/bmp-config-example/pom.xml +++ b/bmp/bmp-config-example/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 diff --git a/bmp/pom.xml b/bmp/pom.xml index 1293eed250..b18c1ac38a 100644 --- a/bmp/pom.xml +++ b/bmp/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/config-loader/config-loader-artifacts/pom.xml b/config-loader/config-loader-artifacts/pom.xml index bb1490bd75..5748d3ebad 100644 --- a/config-loader/config-loader-artifacts/pom.xml +++ b/config-loader/config-loader-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/config-loader/pom.xml b/config-loader/pom.xml index 8bfc9368d3..d2a1e57d0c 100644 --- a/config-loader/pom.xml +++ b/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 4fc5c5d5e9..1691c549cf 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 5.0.2 + 6.0.0 diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml index eb057d041d..78c2d0ad15 100644 --- a/feature-repo-parent/pom.xml +++ b/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index 6360e8c12f..e95414d33f 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml index 869b835d67..42ca28efd3 100644 --- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml +++ b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-netty-4 + odl-netty-4 diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml index 6cbbc601b7..4947829ec0 100644 --- a/features/bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index d58386d889..3d1bafe962 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/concepts/pom.xml b/features/concepts/pom.xml index 56a9fc30c6..6b7225d756 100644 --- a/features/concepts/pom.xml +++ b/features/concepts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/config-loader/pom.xml b/features/config-loader/pom.xml index 8b500c2111..eae4140af2 100644 --- a/features/config-loader/pom.xml +++ b/features/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml index 279fb293a0..a03f2dca42 100644 --- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml +++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-apache-commons-lang3 + odl-apache-commons-lang3 diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index b89674de91..fe7c7067c1 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/pom.xml b/features/pom.xml index d3c4815ca2..d84bf89e21 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml index 55f5710d1c..acc79257a1 100644 --- a/features/rsvp/pom.xml +++ b/features/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/topology/pom.xml b/features/topology/pom.xml index d4e6e8d4ed..9b08b87305 100644 --- a/features/topology/pom.xml +++ b/features/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/parent/pom.xml b/parent/pom.xml index 0c22983740..14e855bd8f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.2 + 6.0.0 diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml index 76427a35c0..c9afb7d7ea 100644 --- a/pcep/config-example/pom.xml +++ b/pcep/config-example/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 diff --git a/pcep/pcep-artifacts/pom.xml b/pcep/pcep-artifacts/pom.xml index 9fe8418099..f7ab5cbf92 100644 --- a/pcep/pcep-artifacts/pom.xml +++ b/pcep/pcep-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/pcep/pom.xml b/pcep/pom.xml index 51c4c644df..b9d9229acf 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml index 51e1f0d4a8..dddfbe9c42 100644 --- a/pcep/topology/pom.xml +++ b/pcep/topology/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml index a603d0d21a..ca381bab22 100644 --- a/pcep/tunnel/pom.xml +++ b/pcep/tunnel/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/pom.xml b/pom.xml index 746bf63abd..66a05f2bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java index 15e5ac47cd..b0f62cebec 100644 --- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java +++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java @@ -16,6 +16,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.util.Timeout; import io.netty.util.Timer; import java.math.BigInteger; @@ -386,6 +387,8 @@ public final class ProgrammingServiceImpl implements ClusterSingletonService, In instruction.timeout(); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private synchronized void tryScheduleDependants(final InstructionImpl instruction) { // Walk all dependants and try to schedule them final Iterator it = instruction.getDependants(); diff --git a/programming/pom.xml b/programming/pom.xml index 7a993b866a..d1a3085a2c 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/programming/programming-artifacts/pom.xml b/programming/programming-artifacts/pom.xml index 35e766caa5..a42cf73a7b 100644 --- a/programming/programming-artifacts/pom.xml +++ b/programming/programming-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index f3fb82184e..fc8060803e 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/rsvp/rsvp-artifacts/pom.xml b/rsvp/rsvp-artifacts/pom.xml index 48f8c01e8f..229e540a18 100644 --- a/rsvp/rsvp-artifacts/pom.xml +++ b/rsvp/rsvp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml index a34edbc816..58a2edcf47 100644 --- a/single-feature-parent/pom.xml +++ b/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 9bf737315e..f2441c5dda 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 diff --git a/topology/pom.xml b/topology/pom.xml index 3ffc199832..c343128938 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/topology/topology-artifacts/pom.xml b/topology/topology-artifacts/pom.xml index 0a01029a13..55e9090227 100644 --- a/topology/topology-artifacts/pom.xml +++ b/topology/topology-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 -- 2.36.6