Migrate statements to JDT annotations

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java
index efbfa36ac970124b18d450e57624314a8f2beb14..28ff9c08edb05fabf440cef72c04278517f45948 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java
@@ -7,14 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import static com.google.common.base.Verify.verifyNotNull;
 
-public interface IncludeStatement extends DeclaredStatement<String>, DocumentationGroup {
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
-    @Nonnull String getModule();
+public interface IncludeStatement extends DocumentedDeclaredStatement<String> {
+    default @NonNull String getModule() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
+    }
 
-    @Nullable RevisionDateStatement getRevisionDate();
+    default @Nullable RevisionDateStatement getRevisionDate() {
+        final Optional<RevisionDateStatement> opt = findFirstDeclaredSubstatement(RevisionDateStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 }
-