From 2bef52d5eb4c32ddd3d51be53760926ca2138f04 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 6 Sep 2019 09:04:14 +0200 Subject: [PATCH 1/1] 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 --- applications/forwardingrules-manager/pom.xml | 1 + .../frm/impl/FlowNodeReconciliationImpl.java | 7 ++++++ applications/forwardingrules-sync/pom.xml | 1 + applications/lldp-speaker/pom.xml | 1 + applications/reconciliation-framework/pom.xml | 1 + applications/southbound-cli/pom.xml | 1 + applications/topology-lldp-discovery/pom.xml | 1 + artifacts/pom.xml | 2 +- distribution/karaf/pom.xml | 2 +- .../features-openflowplugin-extension/pom.xml | 2 +- .../odl-openflowplugin-nxm-extensions/pom.xml | 2 +- .../odl-openflowplugin-onf-extensions/pom.xml | 2 +- .../features-extension-aggregator/pom.xml | 2 +- .../openflowplugin-extension-nicira/pom.xml | 1 + .../features-openflowplugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-app-topology/pom.xml | 2 +- .../odl-openflowplugin-drop-test/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-flow-services/pom.xml | 2 +- .../odl-openflowplugin-libraries/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../odl-openflowplugin-nsf-model/pom.xml | 2 +- .../odl-openflowplugin-southbound/pom.xml | 2 +- features-aggregator/pom.xml | 2 +- libraries/liblldp/pom.xml | 1 + .../features-openflowjava/pom.xml | 2 +- .../odl-openflowjava-protocol/pom.xml | 2 +- .../features-openflowjava-aggregator/pom.xml | 2 +- openflowjava/openflow-protocol-api/pom.xml | 1 + openflowjava/openflow-protocol-impl/pom.xml | 1 + .../SwitchConnectionProviderFactoryImpl.java | 22 +++++++++---------- openflowplugin-api/pom.xml | 1 + openflowplugin-common/pom.xml | 1 + openflowplugin-impl/pom.xml | 1 + .../initialization/OF10DeviceInitializer.java | 3 +++ openflowplugin/pom.xml | 1 + samples/learning-switch/pom.xml | 1 + 49 files changed, 67 insertions(+), 42 deletions(-) diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml index ab7cf535b4..7dec34b697 100644 --- a/applications/forwardingrules-manager/pom.xml +++ b/applications/forwardingrules-manager/pom.xml @@ -24,6 +24,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java index 0c7b31f711..80899062a2 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java @@ -15,6 +15,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; @@ -548,6 +549,8 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation { } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private BigInteger getDpnIdFromNodeName(String nodeName) { String dpId = nodeName.substring(nodeName.lastIndexOf(SEPARATOR) + 1); @@ -698,6 +701,8 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation { return nodeIdent.child(StaleMeter.class, new StaleMeterKey(new MeterId(staleMeter.getMeterId()))); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private List>> addBundleMessages(final FlowCapableNode flowNode, final BundleId bundleIdValue, final InstanceIdentifier nodeIdentity) { @@ -745,6 +750,8 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation { return groupBuilder.build(); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private Messages createMessages(final NodeRef nodeRef) { final List messages = new ArrayList<>(); messages.add(new MessageBuilder().setNode(nodeRef) diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml index 91624de57f..cb768d82f3 100644 --- a/applications/forwardingrules-sync/pom.xml +++ b/applications/forwardingrules-sync/pom.xml @@ -19,6 +19,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml index 1a6fb8b9c0..972e3428dd 100644 --- a/applications/lldp-speaker/pom.xml +++ b/applications/lldp-speaker/pom.xml @@ -18,6 +18,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml index 2e09d3814f..497405fe43 100644 --- a/applications/reconciliation-framework/pom.xml +++ b/applications/reconciliation-framework/pom.xml @@ -73,6 +73,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml index 369eaac6aa..9b94f7d914 100644 --- a/applications/southbound-cli/pom.xml +++ b/applications/southbound-cli/pom.xml @@ -72,6 +72,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml index 3bf37b8ad8..da9afd5054 100644 --- a/applications/topology-lldp-discovery/pom.xml +++ b/applications/topology-lldp-discovery/pom.xml @@ -76,6 +76,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 6f8b7ec256..09b591fdbc 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,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 c5bbc14782..c86334705a 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 5.0.2 + 6.0.0 org.opendaylight.openflowplugin openflowplugin-karaf diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml index 16a09b6e59..a6ee5e5cb2 100644 --- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml +++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml index e086f645e7..bdf500c092 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml index 944c5a494b..3f8534f436 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml index a4b67fa76d..779be77e19 100644 --- a/extension/features-extension-aggregator/pom.xml +++ b/extension/features-extension-aggregator/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 4.0.0 diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml index fc665c7ff0..7367635497 100644 --- a/extension/openflowplugin-extension-nicira/pom.xml +++ b/extension/openflowplugin-extension-nicira/pom.xml @@ -30,6 +30,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml index b7a34a43be..f847e098cc 100644 --- a/features-aggregator/features-openflowplugin/pom.xml +++ b/features-aggregator/features-openflowplugin/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml index 87cdcd32c6..02be2cd907 100644 --- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml index 61a4e13619..169dbdeb68 100644 --- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml index 389f9faea2..eb6c20dafe 100644 --- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml index b0f5416d56..c28bdccd17 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml index 38c616eaf6..75586c3b0a 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml index bdfe35aa33..afe1acf250 100644 --- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml index 69f96bd133..ab7c028f8e 100644 --- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml index 31807c6dd4..5527d3d1e4 100644 --- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml index f6600eca01..023898558a 100644 --- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml index 91dd7ad46a..1b1a7b2a1c 100644 --- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml index 83a4619526..09bc5b5ed1 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml index 347dbc7626..6acfaaf650 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml index 187ccc77d6..16674b5b20 100644 --- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml index 4b2bb0bf1a..6e84bc8d72 100644 --- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml +++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml index bbb2a22902..5197116059 100644 --- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml index 8fc3d9914f..26f25038cb 100644 --- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml index 131e366edf..2b2c92c861 100644 --- a/features-aggregator/odl-openflowplugin-libraries/pom.xml +++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml index b07a76fda0..be208d6d90 100644 --- a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml +++ b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-guava + odl-guava diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml index 4a2424fa97..40b1861ac0 100644 --- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml +++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml index b3b3ea73b4..5e1cb5f717 100644 --- a/features-aggregator/odl-openflowplugin-southbound/pom.xml +++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml index a9d4848a23..55b1812181 100644 --- a/features-aggregator/pom.xml +++ b/features-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/libraries/liblldp/pom.xml b/libraries/liblldp/pom.xml index 6ac436c23b..e1cd411f83 100644 --- a/libraries/liblldp/pom.xml +++ b/libraries/liblldp/pom.xml @@ -42,6 +42,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml index 3081d30df7..30074d8065 100644 --- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml index 80e0ebf115..a549d9435f 100644 --- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml index 557ec0822e..9e753e7cbf 100644 --- a/openflowjava/features-openflowjava-aggregator/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/openflowjava/openflow-protocol-api/pom.xml b/openflowjava/openflow-protocol-api/pom.xml index 1995d96e01..fc6f26653d 100644 --- a/openflowjava/openflow-protocol-api/pom.xml +++ b/openflowjava/openflow-protocol-api/pom.xml @@ -54,6 +54,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml index 3b4a77ba08..8cf2d0a088 100644 --- a/openflowjava/openflow-protocol-impl/pom.xml +++ b/openflowjava/openflow-protocol-impl/pom.xml @@ -122,6 +122,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java index 63357e1d67..c84cafebfb 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java @@ -40,17 +40,6 @@ public class SwitchConnectionProviderFactoryImpl implements SwitchConnectionProv openflowPluginDiagStatusProvider); } - private static InetAddress getInetAddress(final IpAddress address) throws UnknownHostException { - if (address != null) { - if (address.getIpv4Address() != null) { - return InetAddress.getByName(address.getIpv4Address().getValue()); - } else if (address.getIpv6Address() != null) { - return InetAddress.getByName(address.getIpv6Address().getValue()); - } - } - return null; - } - private static class ConnectionConfigurationImpl implements ConnectionConfiguration { private final SwitchConnectionConfig config; private InetAddress address; @@ -186,5 +175,16 @@ public class SwitchConnectionProviderFactoryImpl implements SwitchConnectionProv public boolean isGroupAddModEnabled() { return config.isGroupAddModEnabled(); } + + private static InetAddress getInetAddress(final IpAddress address) throws UnknownHostException { + if (address != null) { + if (address.getIpv4Address() != null) { + return InetAddress.getByName(address.getIpv4Address().getValue()); + } else if (address.getIpv6Address() != null) { + return InetAddress.getByName(address.getIpv6Address().getValue()); + } + } + return null; + } } } diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml index 0b70c2fcdd..06a8494c91 100644 --- a/openflowplugin-api/pom.xml +++ b/openflowplugin-api/pom.xml @@ -58,6 +58,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowplugin-common/pom.xml b/openflowplugin-common/pom.xml index f17517fb4f..7e1e56b112 100644 --- a/openflowplugin-common/pom.xml +++ b/openflowplugin-common/pom.xml @@ -29,6 +29,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml index ba7853819d..11b5e175f7 100644 --- a/openflowplugin-impl/pom.xml +++ b/openflowplugin-impl/pom.xml @@ -96,6 +96,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java index 2486923e8d..502b84e8ea 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java @@ -12,6 +12,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -131,6 +132,8 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer { } @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static void makeEmptyFlowCapableNode(final TxFacade txFacade, final DeviceInfo deviceInfo) { try { txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL, diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml index 4cf8d21960..b271b019bc 100644 --- a/openflowplugin/pom.xml +++ b/openflowplugin/pom.xml @@ -70,6 +70,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml index 63ed6c5fb0..747ae7e07b 100644 --- a/samples/learning-switch/pom.xml +++ b/samples/learning-switch/pom.xml @@ -29,6 +29,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true -- 2.36.6