Reduce use of javax.annotation annotations

[mdsal.git] / binding / mdsal-binding-generator-impl / src / main / java / org / opendaylight / mdsal / binding / generator / impl / AbstractTypeGenerator.java

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 47b4adaa08d38d05f3f41748e7dcfaef23b99ef0..f2a0cbe71dceff917bde5ef5da67d831f28bea2c 100644 (file)
--- 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
@@ -503,6 +503,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
                 method.addAnnotation("javax.annotation", "CheckReturnValue");
                 addComment(method, rpc);
                 method.addParameter(
@@ -1681,10 +1682,6 @@ abstract class AbstractTypeGenerator {
         getMethod.setReturnType(returnType);
 
         annotateDeprecatedIfNecessary(node.getStatus(), getMethod);
-        if (!returnType.getPackageName().isEmpty()) {
-            // The return type has a package, so it's not a primitive type
-            getMethod.addAnnotation("javax.annotation", "Nullable");
-        }
         addComment(getMethod, node);
 
         return getMethod;