Fix FindBugs issues with odlparent 3.1.0

Change-Id: Iefca498bae9cec74569d958cc569277a938d6925
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
index a268d15d343a6d8e5d955d8d91dc988e84d4ad99..9017c6b5d3142a9e62406c53b40b734cff58d7c0 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
@@ -15,6 +15,7 @@ import com.google.common.base.Strings;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.JdkFutureAdapters;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Collections;
@@ -71,6 +72,7 @@ public class AlivenessProtocolHandlerARP extends AbstractAlivenessProtocolHandle
     }
 
     @Override
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl")
     public String handlePacketIn(ARP packet, PacketReceived packetReceived) {
         short tableId = packetReceived.getTableId().getValue();
         int arpType = packet.getOpCode();

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java
index b5ffb43acc4d01b47a315454631e19701285c068..05e129e880777949cbcd9f4391a6d8a2c7d04993 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java
@@ -73,7 +73,8 @@ public class AlivenessProtocolHandlerLLDP extends AbstractAlivenessProtocolHandl
     }
 
     @Override
-    @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") // TODO remove when 1st  below lldpTlvTypeCur below is removed
+    // TODO remove DLS_DEAD_LOCAL_STORE when 1st  below lldpTlvTypeCur below is removed
+    @SuppressFBWarnings({"DLS_DEAD_LOCAL_STORE", "NP_NULL_PARAM_DEREF"})
     public String handlePacketIn(LLDP lldpPacket, PacketReceived packetReceived) {
         String tempString = null;
         byte lldpTlvTypeCur;

diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml
index a34c92fe4230a2cb6aef43bae3a0b8669c0421dc..adfac63a16eaa619c671dcd77d03e5b7cff5ae18 100644 (file)
--- a/lockmanager/lockmanager-impl/pom.xml
+++ b/lockmanager/lockmanager-impl/pom.xml
@@ -69,6 +69,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+             <artifactId>findbugs</artifactId>
+             <version>3.1.1</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <failOnError>true</failOnError>
         </configuration>

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 12b3592297181be7946caf519c173bd26dab9d07..749e8c827a1e11cc2034a5b0f8f9ce238ae5d094 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -195,6 +195,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>findbugs</artifactId>
+            <version>3.1.1</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <failOnError>true</failOnError>
         </configuration>