X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Fapi%2Fstmt%2FIdentityStatement.java;h=0ebbe18e4fe09ff33d0045fdd36f0d85b256b91a;hb=19efe56f8f20f5692a100e765a581fbc8f0b4aca;hp=7abf04c262ad9dadfe2462251dbc17e62fb258a6;hpb=9738a742a50df99c9f3fc3ac16a5d65a63d77a10;p=yangtools.git

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java
index 7abf04c262..0ebbe18e4f 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java
@@ -7,14 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
+import static com.google.common.base.Verify.verifyNotNull;
+
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 
 public interface IdentityStatement extends DocumentedDeclaredStatement.WithStatus<QName>,
         IfFeatureAwareDeclaredStatement<QName> {
-    default @Nonnull QName getName() {
-        return argument();
+    default @NonNull QName getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
     }
 
     /**
@@ -22,7 +25,7 @@ public interface IdentityStatement extends DocumentedDeclaredStatement.WithStatu
      *
      * @return base identities, empty if there are none.
      */
-    default @Nonnull Collection<? extends BaseStatement> getBases() {
+    default @NonNull Collection<? extends BaseStatement> getBases() {
         return declaredSubstatements(BaseStatement.class);
     }
 }