Merge branch 'master' of ../controller

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java
index 9dbfbd28c40d4435a3d1705391dc3d083c51d830..2e003dbdea300d4eccd2d908f05a4383231933c2 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java
@@ -7,14 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
+import static com.google.common.base.Verify.verifyNotNull;
+
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 public interface SubmoduleStatement extends MetaDeclaredStatement<String>, LinkageDeclaredStatement,
         RevisionAwareDeclaredStatement, BodyDeclaredStatement {
-    default @Nonnull String getName() {
-        return rawArgument();
+    default @NonNull String getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(rawArgument());
     }
 
     default @Nullable YangVersionStatement getYangVersion() {
@@ -22,7 +25,7 @@ public interface SubmoduleStatement extends MetaDeclaredStatement<String>, Linka
         return opt.isPresent() ? opt.get() : null;
     }
 
-    default @Nonnull BelongsToStatement getBelongsTo() {
+    default @NonNull BelongsToStatement getBelongsTo() {
         return findFirstDeclaredSubstatement(BelongsToStatement.class).get();
     }
 }