Suppress RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE

spotbugs does not grok Java 11 try-with-resources desugaring,
forcing us to suppress this warning.

Change-Id: Ia840cdd03932ae543fe66931f55d6b3c1b2d4697
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/DefaultSourceCodeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/DefaultSourceCodeGenerator.java
index 5c8781e5e80e3d579b7165b99d74519bca85f890..d3c3a7f4e577b8d918036e8ce3c1e36c59ede947 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/DefaultSourceCodeGenerator.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/DefaultSourceCodeGenerator.java
@@ -9,6 +9,7 @@
 package org.opendaylight.mdsal.binding.generator.util;
 
 import com.google.common.io.Files;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
@@ -95,6 +96,7 @@ public class DefaultSourceCodeGenerator implements SourceCodeGenerator {
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public void outputGeneratedSource(final CtClass ctClass) {
         String name = ctClass.getName();
 

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
index e3d2d6b89b0294f6edbc6e8b02cb1a1e2b882cec..2d73426a6e628325cf49acf0f78cff042cd263eb 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
@@ -11,6 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.FluentFuture;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.function.Function;
 import javax.annotation.CheckReturnValue;
 import javax.inject.Inject;
@@ -52,6 +53,7 @@ public class ManagedNewTransactionRunnerImpl extends ManagedTransactionFactoryIm
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public <R> R applyWithNewTransactionChainAndClose(final Function<ManagedTransactionChain, R> chainConsumer) {
         try (TransactionChain realTxChain = getTransactionFactory().createTransactionChain(
             new TransactionChainListener() {

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
index d18df38327f58c0e23dbb73ea8359d5aa6d23764..4d9b07749cbd73cba68397a32f67f64530df161b 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
@@ -11,6 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import javax.annotation.CheckReturnValue;
@@ -34,6 +35,7 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public <D extends Datastore, E extends Exception, R> R applyInterruptiblyWithNewReadOnlyTransactionAndClose(
             final Class<D> datastoreType, final InterruptibleCheckedFunction<TypedReadTransaction<D>, R, E> txFunction)
             throws E, InterruptedException {
@@ -45,6 +47,7 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public <D extends Datastore, E extends Exception, R> R applyWithNewReadOnlyTransactionAndClose(
             final Class<D> datastoreType, final CheckedFunction<TypedReadTransaction<D>, R, E> txFunction) throws E {
         try (ReadTransaction realTx = transactionFactory.newReadOnlyTransaction()) {
@@ -64,6 +67,7 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public <D extends Datastore, E extends Exception> void callInterruptiblyWithNewReadOnlyTransactionAndClose(
             final Class<D> datastoreType, final InterruptibleCheckedConsumer<TypedReadTransaction<D>, E> txConsumer)
             throws E, InterruptedException {
@@ -74,6 +78,7 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
     }
 
     @Override
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     public <D extends Datastore, E extends Exception> void callWithNewReadOnlyTransactionAndClose(
             final Class<D> datastoreType, final CheckedConsumer<TypedReadTransaction<D>, E> txConsumer) throws E {
         try (ReadTransaction realTx = transactionFactory.newReadOnlyTransaction()) {