Clean up AugmentationHolder's annotations

We know AugmentationHolder must return a non-null, make sure we
have annotations documenting that.

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

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/AugmentationHolder.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/AugmentationHolder.java
index d2036605b1b679c91e31d2c1cb8d6d6df9be7f96..6a69b5289f6316e4882bb2ae3cd600e4849dc499 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/AugmentationHolder.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/AugmentationHolder.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.binding;
 
 import java.util.Map;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Augmentable (extensible) object which could carry additional data defined by third-party extension, without
@@ -24,5 +25,5 @@ public interface AugmentationHolder<T> {
      *
      * @return map of all augmentations.
      */
-    Map<Class<? extends Augmentation<T>>, Augmentation<T>> augmentations();
+    @NonNull Map<Class<? extends Augmentation<T>>, Augmentation<T>> augmentations();
 }

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
index b8ad0134e25ab2ce7e420e965c9b44f17355977a..c51ce89361336afc47a875bea303109126464052 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
@@ -388,7 +388,7 @@ public final class CodeHelpers {
      * @throws NullPointerException if obj is null
      */
     public static int hashAugmentations(final @NonNull AugmentationHolder<?> obj) {
-        return Objects.hashCode(obj.augmentations());
+        return obj.augmentations().hashCode();
     }
 
     /**