Propagate @NonNull around JavaFileTemplate

We really do not tolerate nulls here, add appropriate annotations
to silence Eclipse warnings.

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

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java
index 12b5924346c90615a9f8006ff62746d86b831ec2..b6a0d56464b57866e5b3126d2be7c83dca06a393 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java
@@ -17,6 +17,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.model.api.Enumeration;
@@ -95,7 +96,7 @@ abstract class AbstractJavaGeneratedType {
                 : annotate(ref, annotation).toString();
     }
 
-    private String getReferenceString(final StringBuilder sb, final Type type, final Type[] arguments) {
+    private String getReferenceString(final StringBuilder sb, final Type type, final @NonNull Type[] arguments) {
         if (arguments.length == 0) {
             return sb.append("<?>").toString();
         }

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
index acd315c3227c370bb6bcdc61e2e79a67a703741c..5283f874be29ac893d30429259b3b281e9a45088 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
@@ -36,60 +36,60 @@ class JavaFileTemplate {
     /**
      * {@code java.lang.Class} as a JavaTypeName.
      */
-    static final JavaTypeName CLASS = JavaTypeName.create(Class.class);
+    static final @NonNull JavaTypeName CLASS = JavaTypeName.create(Class.class);
     /**
      * {@code java.lang.Deprecated} as a JavaTypeName.
      */
-    static final JavaTypeName DEPRECATED = JavaTypeName.create(Deprecated.class);
+    static final @NonNull JavaTypeName DEPRECATED = JavaTypeName.create(Deprecated.class);
     /**
      * {@code java.lang.Override} as a JavaTypeName.
      */
-    static final JavaTypeName OVERRIDE = JavaTypeName.create(Override.class);
+    static final @NonNull JavaTypeName OVERRIDE = JavaTypeName.create(Override.class);
 
     /**
      * {@code java.lang.SuppressWarnings} as a JavaTypeName.
      */
-    static final JavaTypeName SUPPRESS_WARNINGS = JavaTypeName.create(SuppressWarnings.class);
+    static final @NonNull JavaTypeName SUPPRESS_WARNINGS = JavaTypeName.create(SuppressWarnings.class);
 
     /**
      * {@code java.util.Arrays} as a JavaTypeName.
      */
-    static final JavaTypeName JU_ARRAYS = JavaTypeName.create(Arrays.class);
+    static final @NonNull JavaTypeName JU_ARRAYS = JavaTypeName.create(Arrays.class);
     /**
      * {@code java.util.List} as a JavaTypeName.
      */
-    static final JavaTypeName JU_LIST = JavaTypeName.create(List.class);
+    static final @NonNull JavaTypeName JU_LIST = JavaTypeName.create(List.class);
     /**
      * {@code java.util.Map} as a JavaTypeName.
      */
-    static final JavaTypeName JU_MAP = JavaTypeName.create(Map.class);
+    static final @NonNull JavaTypeName JU_MAP = JavaTypeName.create(Map.class);
     /**
      * {@code java.util.Objects} as a JavaTypeName.
      */
-    static final JavaTypeName JU_OBJECTS = JavaTypeName.create(Objects.class);
+    static final @NonNull JavaTypeName JU_OBJECTS = JavaTypeName.create(Objects.class);
     /**
      * {@code java.util.regex.Pattern} as a JavaTypeName.
      */
-    static final JavaTypeName JUR_PATTERN = JavaTypeName.create(Pattern.class);
+    static final @NonNull JavaTypeName JUR_PATTERN = JavaTypeName.create(Pattern.class);
 
     /**
      * {@code org.eclipse.jdt.annotation.NonNull} as a JavaTypeName.
      */
-    static final JavaTypeName NONNULL = JavaTypeName.create("org.eclipse.jdt.annotation", "NonNull");
+    static final @NonNull JavaTypeName NONNULL = JavaTypeName.create("org.eclipse.jdt.annotation", "NonNull");
     /**
      * {@code org.eclipse.jdt.annotation.Nullable} as a JavaTypeName.
      */
-    static final JavaTypeName NULLABLE = JavaTypeName.create("org.eclipse.jdt.annotation", "Nullable");
+    static final @NonNull JavaTypeName NULLABLE = JavaTypeName.create("org.eclipse.jdt.annotation", "Nullable");
 
     /**
      * {@code org.opendaylight.yangtools.yang.binding.CodeHelpers} as a JavaTypeName.
      */
-    static final JavaTypeName CODEHELPERS = JavaTypeName.create(CodeHelpers.class);
+    static final @NonNull JavaTypeName CODEHELPERS = JavaTypeName.create(CodeHelpers.class);
 
     private final AbstractJavaGeneratedType javaType;
     private final GeneratedType type;
 
-    JavaFileTemplate(final GeneratedType type) {
+    JavaFileTemplate(final @NonNull GeneratedType type) {
         this(new TopLevelJavaGeneratedType(type), type);
     }
 
@@ -123,31 +123,31 @@ class JavaFileTemplate {
                 .collect(Collectors.joining());
     }
 
-    final String importedJavadocName(final Type intype) {
+    final @NonNull String importedJavadocName(final @NonNull Type intype) {
         return importedName(intype instanceof ParameterizedType ? ((ParameterizedType) intype).getRawType() : intype);
     }
 
-    final String importedName(final Type intype) {
+    final @NonNull String importedName(final @NonNull Type intype) {
         return javaType.getReferenceString(intype);
     }
 
-    final String importedName(final Type intype, final @NonNull String annotation) {
+    final @NonNull String importedName(final @NonNull Type intype, final @NonNull String annotation) {
         return javaType.getReferenceString(intype, annotation);
     }
 
-    final String importedName(final Class<?> cls) {
+    final @NonNull String importedName(final Class<?> cls) {
         return importedName(Types.typeForClass(cls));
     }
 
-    final String importedName(final JavaTypeName intype) {
+    final @NonNull String importedName(final @NonNull JavaTypeName intype) {
         return javaType.getReferenceString(intype);
     }
 
-    final String importedNonNull(final Type intype) {
+    final @NonNull String importedNonNull(final @NonNull Type intype) {
         return importedName(intype, importedName(NONNULL));
     }
 
-    final String importedNullable(final Type intype) {
+    final @NonNull String importedNullable(final @NonNull Type intype) {
         return importedName(intype, importedName(NULLABLE));
     }
 

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
index 16aa0ecff7aa2590c820fd0535d61aebbe001535..b96c4d5ad933be90d4bd55339b8b5ddd53a44815 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
@@ -113,7 +113,7 @@ final class LengthGenerator {
         return sb.append("}\n").toString();
     }
 
-    static String generateLengthChecker(final String member, final Type type,
+    static String generateLengthChecker(final String member, final @NonNull Type type,
             final LengthConstraint constraint, final JavaFileTemplate template) {
         return TypeUtils.getBaseYangType(type).getName().indexOf('[') != -1
                 ? generateArrayLengthChecker(member, constraint, template)