Correct NonNull annotation

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / stmt / NotificationStatement.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java
index c27342e4f970fe5824688730e51ebb2c7d4bc11e..4e9d061ef9a565d022a9c94d5c4f3d4712178c87 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java
@@ -7,27 +7,23 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.collect.ImmutableList;
-import java.util.Collection;
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import static com.google.common.base.Verify.verifyNotNull;
 
-public interface NotificationStatement extends DeclaredStatement<QName>,
-       DataDefinitionContainer.WithReusableDefinitions, DocumentationGroup.WithStatus {
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-    @Nonnull QName getName();
+public interface NotificationStatement extends DocumentedDeclaredStatement.WithStatus<QName>,
+        DataDefinitionAwareDeclaredStatement.WithReusableDefinitions<QName>, IfFeatureAwareDeclaredStatement<QName>,
+        MustStatementAwareDeclaredStatement<QName> {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.NOTIFICATION;
+    }
 
-    /**
-     * All implementations should override this method.
-     * The default definition of this method is used only in YANG 1.0 (RFC6020) implementation of
-     * NotificationStatement which does not support must statements.
-     * YANG notification statement has been changed in YANG 1.1 (RFC7950) and now allows must statements.
-     *
-     * @return collection of must statements
-     */
-     // FIXME: version 2.0.0: make this method non-default
-    @Nonnull default Collection<? extends MustStatement> getMusts() {
-        return ImmutableList.of();
+    default @NonNull QName getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
     }
 }