From fdc456a14fbd7a9c2ba3927c0ab1c5b5230cfcf1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 23 Oct 2018 18:23:50 +0200 Subject: [PATCH] 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 --- .../model/api/stmt/ActionStatementAwareDeclaredStatement.java | 3 +-- .../yang/model/api/stmt/ActionStatementContainer.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) 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 7ffe7f9965..3db10a2ac6 100644 --- 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 extends DeclaredStatement, ActionStatementContainer { @Override - default @Nonnull Collection getActions() { + default Collection 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 9d2d2f02ef..0ebe521c35 100644 --- 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 getActions(); + @NonNull Collection getActions(); } -- 2.36.6