Migrate ActionStatementContainer to JDT annotations

This is a trivial use of @Nonnull, migrate it over to @NonNull.

Change-Id: Ie2167fa3574441fbb859b4ea5c56fdefe3b1b264
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/stmt/ActionStatementAwareDeclaredStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java
index 7ffe7f996508d8a3e09ff59b1267ddf70532f197..3db10a2ac606daf5fb5bcb8d115222a5c37810dc 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import com.google.common.annotations.Beta;
 import java.util.Collection;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 
 /**
@@ -18,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 @Beta
 public interface ActionStatementAwareDeclaredStatement<A> extends DeclaredStatement<A>, ActionStatementContainer {
     @Override
-    default @Nonnull Collection<? extends ActionStatement> getActions() {
+    default Collection<? extends ActionStatement> getActions() {
         return declaredSubstatements(ActionStatement.class);
     }
 }

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementContainer.java
index 9d2d2f02efee59be31059dc271aeb845bd567e5c..0ebe521c352d143b7119f1af7463c964b8c2e35b 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementContainer.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementContainer.java
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import com.google.common.annotations.Beta;
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Statement which can contain action statements.
@@ -23,5 +23,5 @@ public interface ActionStatementContainer {
      *
      * @return collection of action statements
      */
-    @Nonnull Collection<? extends ActionStatement> getActions();
+    @NonNull Collection<? extends ActionStatement> getActions();
 }