Rename NamespaceRevisionAware to QNameModuleAware

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
index d419d880dc8f9a4ecfd8a7eb7599fa159bc71a19..6eb2cd69785dcbcd99f8e876c08a573b9c9bf4fe 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
@@ -7,29 +7,39 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
+import static com.google.common.base.Verify.verifyNotNull;
+
 import java.util.Collection;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
 @Rfc6020AbnfRule("type-stmt")
 public interface TypeStatement extends DeclaredStatement<String> {
-    default @Nonnull String getName() {
-        return argument();
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.TYPE;
+    }
+
+    default @NonNull String getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
     }
 
     @Rfc6020AbnfRule("numerical-restrictions")
+    // FIXME: 7.0.0: this interface does not have an implementation
     interface NumericalRestrictions extends TypeStatement {
-
-        default @Nonnull RangeStatement getRange() {
-            return findFirstDeclaredSubstatement(RangeStatement.class).get();
+        default @Nullable RangeStatement getRange() {
+            return findFirstDeclaredSubstatement(RangeStatement.class).orElse(null);
         }
     }
 
     @Rfc6020AbnfRule("decimal64-specification")
     interface Decimal64Specification extends TypeStatement {
-        default @Nonnull FractionDigitsStatement getFractionDigits() {
+        default @NonNull FractionDigitsStatement getFractionDigits() {
             return findFirstDeclaredSubstatement(FractionDigitsStatement.class).get();
         }
 
@@ -40,13 +50,14 @@ public interface TypeStatement extends DeclaredStatement<String> {
     }
 
     @Rfc6020AbnfRule("string-restrictions")
+    // FIXME: 7.0.0: this interface does not have an implementation
     interface StringRestrictions extends TypeStatement {
         default @Nullable LengthStatement getLength() {
             final Optional<LengthStatement> opt = findFirstDeclaredSubstatement(LengthStatement.class);
             return opt.isPresent() ? opt.get() : null;
         }
 
-        default @Nonnull Collection<? extends PatternStatement> getPatterns() {
+        default @NonNull Collection<? extends PatternStatement> getPatterns() {
             return declaredSubstatements(PatternStatement.class);
         }
     }
@@ -54,14 +65,14 @@ public interface TypeStatement extends DeclaredStatement<String> {
     @Rfc6020AbnfRule("enum-specification")
     interface EnumSpecification extends TypeStatement {
 
-        default @Nonnull Collection<? extends EnumStatement> getEnums() {
+        default @NonNull Collection<? extends EnumStatement> getEnums() {
             return declaredSubstatements(EnumStatement.class);
         }
     }
 
     @Rfc6020AbnfRule("leafref-specification")
     interface LeafrefSpecification extends TypeStatement {
-        default @Nonnull PathStatement getPath() {
+        default @NonNull PathStatement getPath() {
             return findFirstDeclaredSubstatement(PathStatement.class).get();
         }
 
@@ -101,28 +112,28 @@ public interface TypeStatement extends DeclaredStatement<String> {
          * @return collection of base statements (in YANG 1.1 models) or a collection containing just one base
          *         statement (in YANG 1.0 models)
          */
-        default @Nonnull Collection<? extends BaseStatement> getBases() {
+        default @NonNull Collection<? extends BaseStatement> getBases() {
             return declaredSubstatements(BaseStatement.class);
         }
     }
 
     @Rfc6020AbnfRule("bits-specification")
     interface BitsSpecification extends TypeStatement {
-        default @Nonnull Collection<? extends BitStatement> getBits() {
+        default @NonNull Collection<? extends BitStatement> getBits() {
             return declaredSubstatements(BitStatement.class);
         }
     }
 
     @Rfc6020AbnfRule("union-specification")
     interface UnionSpecification extends TypeStatement {
-        default @Nonnull Collection<? extends TypeStatement> getTypes() {
+        default @NonNull Collection<? extends TypeStatement> getTypes() {
             return declaredSubstatements(TypeStatement.class);
         }
     }
 
     @Rfc6020AbnfRule("binary-specification")
     interface BinarySpecification extends TypeStatement {
-        default @Nonnull Collection<? extends LengthStatement> getLength() {
+        default @NonNull Collection<? extends LengthStatement> getLength() {
             return declaredSubstatements(LengthStatement.class);
         }
     }