Migrate LeafListSchemaNode to JDT annotations

This is a simple use of @Nonnull, migrate it to JDT.

Change-Id: Iad55cc0536a43a407c336cd68886e8d24927544a
JIRA: YANGTOOLS-907
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
index 2fa2e1b082e68a733579381bfade52f0d88148d9..e165045f62618b2dac2d1d65a68f100d0bf18750 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.api;
 
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Interface describing YANG 'leaf-list' statement.
@@ -30,5 +30,5 @@ public interface LeafListSchemaNode extends TypedDataSchemaNode, MustConstraintA
      *
      * @return Ordered list of Strings which specify the default values of this leaf-list
      */
-    @Nonnull Collection<? extends Object> getDefaults();
+    @NonNull Collection<? extends Object> getDefaults();
 }

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java
index b44ede861128da7a6c9706be3d8c6a3db4b8fb1a..6e354037abfea12a6e7f41a10205c6e597b2853d 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java
@@ -12,6 +12,7 @@ import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint;
@@ -44,7 +45,7 @@ public final class LeafListEffectiveStatementImpl extends AbstractEffectiveDataS
     private final TypeDefinition<?> type;
     private final LeafListSchemaNode original;
     private final boolean userOrdered;
-    private final Set<String> defaultValues;
+    private final @NonNull Set<String> defaultValues;
     private final Collection<MustDefinition> mustConstraints;
     private final ElementCountConstraint elementCountConstraint;