Migrate choice statement implementations

[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 a2e373d402c7abd071f4a74725b8182c1ef67881..1d21bdb57a4c8cb800324cff5774921d91fda6ec 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,15 +7,21 @@
  */
 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 EnumStatement extends DeclaredStatement<String>, DocumentationGroup.WithStatus {
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
-    @Nonnull String getName();
-
-    @Nullable ValueStatement getValue();
+public interface EnumStatement extends DocumentedDeclaredStatement.WithStatus<String>,
+        IfFeatureAwareDeclaredStatement<String> {
+    default @NonNull String getName() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
+    }
 
+    default @Nullable ValueStatement getValue() {
+        final Optional<ValueStatement> opt = findFirstDeclaredSubstatement(ValueStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 }
-