From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 9 Apr 2019 07:12:53 +0000 (+0200)
Subject: Re-enable generation of CheckReturnValue
X-Git-Tag: v4.0.0~15
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F81468%2F3;p=mdsal.git

Re-enable generation of CheckReturnValue

Instead of JSR305 we use spotbugs-annotations here.

Change-Id: I86b1c020632af2c597a48a237ff338955e2a13ea
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/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
index a066e12027..0a71a09518 100644
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
@@ -511,9 +511,7 @@ abstract class AbstractTypeGenerator {
                 final MethodSignatureBuilder method = interfaceBuilder.addMethod(rpcMethodName);
 
                 // Do not refer to annotation class, as it may not be available at runtime
-                // FIXME: migrate this to some other annotation type and re-enable
-                //
-                // method.addAnnotation("javax.annotation", "CheckReturnValue");
+                method.addAnnotation("edu.umd.cs.findbugs.annotations", "CheckReturnValue");
                 addComment(method, rpc);
                 method.addParameter(
                     createRpcContainer(context, rpcName, rpc, verifyNotNull(rpc.getInput()), RPC_INPUT), "input");