Correct NonNull annotation

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
index b190dbf983fe66ff8d05aeb7a142ece850adc5f3..e9ee57446b082337d07405bd2320325ea8e4ac13 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
@@ -7,11 +7,39 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import static com.google.common.base.Verify.verifyNotNull;
 
-public interface ModuleStatement extends DeclaredStatement<String>, ModuleHeaderGroup, LinkageGroup, MetaGroup,
-        RevisionGroup, BodyGroup {
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.UnqualifiedQName;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-    @Nonnull String getName();
+public interface ModuleStatement extends MetaDeclaredStatement<UnqualifiedQName>, ModuleHeaderGroup,
+        LinkageDeclaredStatement, RevisionAwareDeclaredStatement, BodyDeclaredStatement {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.MODULE;
+    }
+
+    default @NonNull String getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(rawArgument());
+    }
+
+    @Override
+    default YangVersionStatement getYangVersion() {
+        final Optional<YangVersionStatement> opt = findFirstDeclaredSubstatement(YangVersionStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
+
+    @Override
+    default NamespaceStatement getNamespace() {
+        return findFirstDeclaredSubstatement(NamespaceStatement.class).get();
+    }
+
+    @Override
+    default PrefixStatement getPrefix() {
+        return findFirstDeclaredSubstatement(PrefixStatement.class).get();
+    }
 }