From 6975248489c083942ec93131dac8e6eb95d66806 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 2 Sep 2019 19:29:11 +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 +- .../features-netconf-connector/pom.xml | 2 +- .../netconf-connector/odl-message-bus/pom.xml | 2 +- .../odl-netconf-callhome-ssh/pom.xml | 2 +- .../odl-netconf-clustered-topology/pom.xml | 2 +- .../odl-netconf-connector-all/pom.xml | 2 +- .../odl-netconf-connector/pom.xml | 2 +- .../odl-netconf-console/pom.xml | 2 +- .../odl-netconf-topology/pom.xml | 2 +- features/netconf-connector/pom.xml | 2 +- features/netconf/features-netconf/pom.xml | 2 +- .../odl-aaa-netconf-plugin-no-cluster/pom.xml | 2 +- .../netconf/odl-aaa-netconf-plugin/pom.xml | 2 +- features/netconf/odl-netconf-all/pom.xml | 2 +- features/netconf/odl-netconf-api/pom.xml | 2 +- features/netconf/odl-netconf-client/pom.xml | 2 +- features/netconf/odl-netconf-impl/pom.xml | 2 +- .../netconf/odl-netconf-mapping-api/pom.xml | 2 +- features/netconf/odl-netconf-mdsal/pom.xml | 2 +- .../netconf/odl-netconf-netty-util/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../odl-netconf-notifications-api/pom.xml | 2 +- .../odl-netconf-notifications-impl/pom.xml | 2 +- features/netconf/odl-netconf-ssh/pom.xml | 2 +- features/netconf/odl-netconf-tcp/pom.xml | 2 +- features/netconf/odl-netconf-util/pom.xml | 2 +- features/netconf/pom.xml | 2 +- features/pom.xml | 2 +- features/restconf/features-restconf/pom.xml | 2 +- features/restconf/odl-mdsal-apidocs/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 2 +- features/restconf/odl-restconf-all/pom.xml | 2 +- features/restconf/odl-restconf-common/pom.xml | 2 +- .../odl-restconf-nb-bierman02/pom.xml | 2 +- .../restconf/odl-restconf-nb-rfc8040/pom.xml | 2 +- features/restconf/odl-restconf/pom.xml | 2 +- features/restconf/pom.xml | 2 +- features/yanglib/features-yanglib/pom.xml | 2 +- features/yanglib/odl-yanglib/pom.xml | 2 +- .../odl-yanglib/src/main/feature/feature.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf/pom.xml | 2 +- .../protocol/NetconfCallHomeServer.java | 3 +++ .../mount/CallHomeMountSessionContext.java | 18 +++++++++-------- .../impl/NetconfNotificationManager.java | 3 +++ netconf/models/pom.xml | 2 +- netconf/netconf-api/pom.xml | 5 +++++ netconf/netconf-config/pom.xml | 2 +- .../AbstractNetconfSessionNegotiator.java | 3 +++ .../netconf/nettyutil/ReconnectPromise.java | 3 +++ .../handler/ThreadLocalTransformers.java | 3 +++ netconf/netconf-topology-config/pom.xml | 2 +- .../singleton/impl/MasterSalFacade.java | 3 +++ .../impl/actors/NetconfNodeActor.java | 5 +++++ .../impl/tx/ActorProxyTransactionFacade.java | 20 +++++++++---------- .../impl/tx/ProxyReadWriteTransaction.java | 3 +++ netconf/pom.xml | 2 +- .../sal/connect/netconf/NetconfDevice.java | 6 ++++++ .../netconf/sal/NetconfDeviceSalProvider.java | 14 ++++++------- .../netconf/sal/tx/AbstractWriteTx.java | 3 +++ netconf/shaded-exificient-jar/pom.xml | 2 +- netconf/shaded-exificient/pom.xml | 8 +++++++- netconf/tools/pom.xml | 2 +- pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/restconf-models/pom.xml | 2 +- .../restconf/impl/BatchedExistenceCheck.java | 4 ++++ .../netconf/sal/restconf/impl/RestCodec.java | 2 ++ restconf/restconf-nb-rfc8040/pom.xml | 2 +- restconf/sal-rest-connector-config/pom.xml | 2 +- restconf/websocket-client/pom.xml | 2 +- .../websocket/client/ApplicationSettings.java | 5 ++++- 72 files changed, 139 insertions(+), 82 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index c156457d84..78104d698b 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/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index 3512f3c7db..670b9f75d7 100644 --- a/features/netconf-connector/features-netconf-connector/pom.xml +++ b/features/netconf-connector/features-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml index 460dd962fd..2bd52e2ccb 100644 --- a/features/netconf-connector/odl-message-bus/pom.xml +++ b/features/netconf-connector/odl-message-bus/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml index 41122a6cee..4381c78dd3 100644 --- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml index 45678a825b..cc39703b91 100644 --- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml index 062b861e67..ffd5369005 100644 --- a/features/netconf-connector/odl-netconf-connector-all/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index 3753654443..b7d2f71c19 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml index 2ed59f09f9..484ea044ba 100644 --- a/features/netconf-connector/odl-netconf-console/pom.xml +++ b/features/netconf-connector/odl-netconf-console/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml index ec28a21a1c..f993ee741e 100644 --- a/features/netconf-connector/odl-netconf-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index e0daffbc23..6651b92633 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index ec74d15d2c..9ce8ec816b 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml index 625ad27998..998b2b202c 100644 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index 73aa010f7c..5da6af94a8 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index 49b32f750a..09688ace2e 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index d180fddd99..e771a2fc60 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml index 02d3a10baf..ac003125c5 100644 --- a/features/netconf/odl-netconf-client/pom.xml +++ b/features/netconf/odl-netconf-client/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index bd01f614cd..cf21b5e490 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml index cde5378709..0bc40e9e21 100644 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ b/features/netconf/odl-netconf-mapping-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index 37234a3a84..9ca529761b 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index 58cc8b8de7..07d8fcde7b 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml index dd2d76d366..22626056b3 100644 --- a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml +++ b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-apache-sshd + odl-apache-sshd diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml index b9eb86fd62..15f4c6948b 100644 --- a/features/netconf/odl-netconf-notifications-api/pom.xml +++ b/features/netconf/odl-netconf-notifications-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 23a226ba49..15534e46b9 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index 54fb17f4d8..e9075f0cc9 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml index 36ca71289d..4a7b020006 100644 --- a/features/netconf/odl-netconf-tcp/pom.xml +++ b/features/netconf/odl-netconf-tcp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index cb6c5604bf..f82510eaa6 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index f37c255b8b..90eeffa846 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/pom.xml b/features/pom.xml index 819b9f5f80..ff9c69178e 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/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 3a5d270951..e5807a7d3a 100644 --- a/features/restconf/features-restconf/pom.xml +++ b/features/restconf/features-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml index aa0b5be94d..fa8caff6c3 100644 --- a/features/restconf/odl-mdsal-apidocs/pom.xml +++ b/features/restconf/odl-mdsal-apidocs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 @@ -27,7 +27,7 @@ org.opendaylight.odlparent odl-jackson-2.9 - 5.0.2 + 6.0.0 xml features diff --git a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml index e0b1a66cdb..ac7251741a 100644 --- a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml +++ b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-jackson-2.9 + odl-jackson-2.9 diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml index 95d6557e8e..0f78c31657 100644 --- a/features/restconf/odl-restconf-all/pom.xml +++ b/features/restconf/odl-restconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index eda8d3b147..154001593c 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml index 379ae89032..f436663069 100644 --- a/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml index 86974ca255..c4618e2765 100644 --- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml index 7b6a30fdee..31f38d3f21 100644 --- a/features/restconf/odl-restconf/pom.xml +++ b/features/restconf/odl-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index 60ebc0ccab..23a6f7bda4 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index 7da7b31e35..8eb955bdbc 100644 --- a/features/yanglib/features-yanglib/pom.xml +++ b/features/yanglib/features-yanglib/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index c142c4d6ee..34af3d2d70 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/yanglib/odl-yanglib/src/main/feature/feature.xml index 469816d7b9..4d7f1cdf7c 100644 --- a/features/yanglib/odl-yanglib/src/main/feature/feature.xml +++ b/features/yanglib/odl-yanglib/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-karaf-feat-jetty + odl-karaf-feat-jetty diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index 76dbd4be63..09b64c0705 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index bdc9b74b43..3d42a4a7f7 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 5.0.2 + 6.0.0 org.opendaylight.netconf diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java index 2e4f360743..75b390f3be 100644 --- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java +++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java @@ -10,6 +10,7 @@ package org.opendaylight.netconf.callhome.protocol; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -112,6 +113,8 @@ public class NetconfCallHomeServer implements AutoCloseable, ServerKeyVerifier { }; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private SshFutureListener newAuthSshFutureListener(final ClientSession session) { final PublicKey serverKey = session.getKex().getServerKey(); diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java index 85a79934ab..e371eb1113 100644 --- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java +++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java @@ -9,6 +9,7 @@ package org.opendaylight.netconf.callhome.mount; import static java.util.Objects.requireNonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.util.concurrent.Promise; import java.net.InetSocketAddress; import java.security.PublicKey; @@ -27,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; class CallHomeMountSessionContext { - public interface CloseCallback { void onClosed(CallHomeMountSessionContext deviceContext); } @@ -39,8 +39,8 @@ class CallHomeMountSessionContext { // FIXME: Remove this private final ContextKey key; - CallHomeMountSessionContext(String nodeId, CallHomeProtocolSessionContext protocol, - CallHomeChannelActivator activator, CloseCallback callback) { + CallHomeMountSessionContext(final String nodeId, final CallHomeProtocolSessionContext protocol, + final CallHomeChannelActivator activator, final CloseCallback callback) { this.nodeId = new NodeId(requireNonNull(nodeId, "nodeId")); this.key = ContextKey.from(protocol.getRemoteAddress()); @@ -73,7 +73,7 @@ class CallHomeMountSessionContext { } @SuppressWarnings("unchecked") - Promise activateNetconfChannel(NetconfClientSessionListener sessionListener) { + Promise activateNetconfChannel(final NetconfClientSessionListener sessionListener) { return (Promise) activator.activate(wrap(sessionListener)); } @@ -81,12 +81,12 @@ class CallHomeMountSessionContext { private NetconfClientSessionListener wrap(final NetconfClientSessionListener delegate) { return new NetconfClientSessionListener() { @Override - public void onSessionUp(NetconfClientSession session) { + public void onSessionUp(final NetconfClientSession session) { delegate.onSessionUp(session); } @Override - public void onSessionTerminated(NetconfClientSession session, NetconfTerminationReason reason) { + public void onSessionTerminated(final NetconfClientSession session, final NetconfTerminationReason reason) { try { delegate.onSessionTerminated(session, reason); } finally { @@ -95,7 +95,7 @@ class CallHomeMountSessionContext { } @Override - public void onSessionDown(NetconfClientSession session, Exception exc) { + public void onSessionDown(final NetconfClientSession session, final Exception exc) { try { removeSelf(); } finally { @@ -104,12 +104,14 @@ class CallHomeMountSessionContext { } @Override - public void onMessage(NetconfClientSession session, NetconfMessage message) { + public void onMessage(final NetconfClientSession session, final NetconfMessage message) { delegate.onMessage(session, message); } }; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void removeSelf() { onClose.onClosed(this); } diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java index bd54b4c5c6..10b3f3ed76 100644 --- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java +++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java @@ -16,6 +16,7 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multiset; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -200,6 +201,8 @@ public class NetconfNotificationManager implements NetconfNotificationCollector, return genericNotificationPublisherReg; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void unregisterNotificationPublisher( final StreamNameType streamName, final GenericNotificationPublisherReg genericNotificationPublisherReg) { diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index a223a9d66f..82795b8a40 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index 2690f0d9fd..566909d599 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -22,6 +22,11 @@ ${project.artifactId} bundle + + + 10 + + io.netty diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index dabd6e57fd..d9b133f861 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.2 + 6.0.0 diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index 12062b2d40..978bd381c2 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -10,6 +10,7 @@ package org.opendaylight.netconf.nettyutil; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; @@ -154,6 +155,8 @@ public abstract class AbstractNetconfSessionNegotiator

org.opendaylight.odlparent bundle-parent - 5.0.2 + 6.0.0 diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java index 2460134aa7..bfda118dc2 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java @@ -15,6 +15,7 @@ import akka.cluster.Cluster; import akka.dispatch.OnComplete; import akka.pattern.Patterns; import akka.util.Timeout; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.List; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -163,6 +164,8 @@ class MasterSalFacade implements AutoCloseable, RemoteDeviceHandler org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java index 8a16ed177e..8171764e03 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java @@ -233,6 +233,8 @@ public class NetconfDevice return remoteSessionCapabilities.isNotificationsSupported() && reconnectOnSchemasChange; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private synchronized void handleSalInitializationSuccess(final MountPointContext result, final NetconfSessionPreferences remoteSessionCapabilities, final DOMRpcService deviceRpc, @@ -257,6 +259,8 @@ public class NetconfDevice } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void handleSalInitializationFailure(final Throwable throwable, final RemoteDeviceCommunicator listener) { LOG.error("{}: Initialization in sal failed, disconnecting from device", id, throwable); @@ -280,6 +284,8 @@ public class NetconfDevice this.connected = connected; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void addProvidedSourcesToSchemaRegistry(final DeviceSources deviceSources) { final SchemaSourceProvider yangProvider = deviceSources.getSourceProvider(); for (final SourceIdentifier sourceId : deviceSources.getProvidedSources()) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProvider.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProvider.java index d6b6354a3e..ead5348311 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProvider.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProvider.java @@ -11,6 +11,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.Transaction; import org.opendaylight.mdsal.binding.api.TransactionChain; @@ -29,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class NetconfDeviceSalProvider implements AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceSalProvider.class); private final RemoteDeviceId id; @@ -78,18 +78,18 @@ public class NetconfDeviceSalProvider implements AutoCloseable { } public NetconfDeviceTopologyAdapter getTopologyDatastoreAdapter() { - checkState(topologyDatastoreAdapter != null, - "%s: Sal provider %s was not initialized by sal. Cannot get topology datastore adapter", id); - return topologyDatastoreAdapter; + final NetconfDeviceTopologyAdapter local = topologyDatastoreAdapter; + checkState(local != null, + "%s: Sal provider %s was not initialized by sal. Cannot get topology datastore adapter", id, this); + return local; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void resetTransactionChainForAdapaters() { txChain = requireNonNull(dataBroker).createTransactionChain(transactionChainListener); - topologyDatastoreAdapter.setTxChain(txChain); - LOG.trace("{}: Resetting TransactionChain {}", id, txChain); - } @Override diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java index 06ffd70e92..874ad32ff2 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java @@ -16,6 +16,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -239,6 +240,8 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { return transformed; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void extractResult(final List domRpcResults, final SettableFuture> transformed) { DocumentedException.ErrorType errType = DocumentedException.ErrorType.APPLICATION; diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml index c9ea53a430..33c54ebccd 100644 --- a/netconf/shaded-exificient-jar/pom.xml +++ b/netconf/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml index 495aae12c0..f61eb293a8 100644 --- a/netconf/shaded-exificient/pom.xml +++ b/netconf/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.2 + 6.0.0 @@ -22,6 +22,12 @@ 1.8.0-SNAPSHOT ${project.artifactId} + + + true + true + + org.opendaylight.netconf diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 1657a67be4..2a16bbf09b 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/pom.xml b/pom.xml index 6c5aa5cbc4..6872f8dc65 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/restconf/pom.xml b/restconf/pom.xml index 9426642aee..85b048fdb4 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml index 5fba50ab01..844176570f 100644 --- a/restconf/restconf-models/pom.xml +++ b/restconf/restconf-models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java index c536dc5fdb..843e9edb8c 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java @@ -74,6 +74,8 @@ final class BatchedExistenceCheck { } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void complete(final YangInstanceIdentifier childPath, final boolean present) { final int count = UPDATER.decrementAndGet(this); if (present) { @@ -83,6 +85,8 @@ final class BatchedExistenceCheck { } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private void complete(final YangInstanceIdentifier childPath, final ReadFailedException cause) { UPDATER.decrementAndGet(this); future.set(new SimpleImmutableEntry<>(childPath, cause)); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java index e53bc1c1fb..f89a5489b6 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java @@ -332,6 +332,8 @@ public final class RestCodec { } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static Module getModuleByNamespace(final String namespace, final DOMMountPoint mountPoint, final ControllerContext controllerContext) { final URI validNamespace = resolveValidNamespace(namespace, mountPoint, controllerContext); diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml index 0915e2d58a..f0900afa7f 100644 --- a/restconf/restconf-nb-rfc8040/pom.xml +++ b/restconf/restconf-nb-rfc8040/pom.xml @@ -144,7 +144,7 @@ org.eclipse.jetty.websocket websocket-server - + 9.4.12.v20180830 diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index ee82cd815e..0524d5863e 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/restconf/websocket-client/pom.xml b/restconf/websocket-client/pom.xml index 2f6b071708..12ce0fbbf7 100644 --- a/restconf/websocket-client/pom.xml +++ b/restconf/websocket-client/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty.websocket websocket-client - + 9.4.12.v20180830 diff --git a/restconf/websocket-client/src/main/java/org/opendaylight/restconf/websocket/client/ApplicationSettings.java b/restconf/websocket-client/src/main/java/org/opendaylight/restconf/websocket/client/ApplicationSettings.java index 74a6956e38..4912ad629b 100644 --- a/restconf/websocket-client/src/main/java/org/opendaylight/restconf/websocket/client/ApplicationSettings.java +++ b/restconf/websocket-client/src/main/java/org/opendaylight/restconf/websocket/client/ApplicationSettings.java @@ -9,6 +9,7 @@ package org.opendaylight.restconf.websocket.client; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.PrintWriter; import java.io.StringWriter; @@ -40,6 +41,8 @@ final class ApplicationSettings { this.password = password; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static Credentials extractCredentials(final String basicAuthentication) { final String[] credentials = basicAuthentication.split(":"); Preconditions.checkArgument(credentials.length == 2, "Both username and password must be specified in the " @@ -300,4 +303,4 @@ final class ApplicationSettings { Credentials getCredentials() { return credentials; } -} \ No newline at end of file +} -- 2.36.6