Add SchemaNodeIdentifier.{first,last}Identifer()

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java
index 28373caadfbbcd9f4dad2aae3969432968df4271..08547d33316ddf81e70ddd2b92ae2a90403bb341 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java
@@ -7,17 +7,28 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import static com.google.common.base.Verify.verifyNotNull;
 
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import java.util.Optional;
+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.StatementDefinition;
 
-public interface EnumStatement extends DeclaredStatement<QName>, DocumentationGroup.WithStatus {
+public interface EnumStatement extends DocumentedDeclaredStatement.WithStatus<String>,
+        IfFeatureAwareDeclaredStatement<String> {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.ENUM;
+    }
 
-    @Nonnull
-    String getName();
+    default @NonNull String getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
+    }
 
-    @Nullable
-    ValueStatement getValue();
+    default @Nullable ValueStatement getValue() {
+        final Optional<ValueStatement> opt = findFirstDeclaredSubstatement(ValueStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 }