DeclaredStatements can contain default implementations

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java
index 058f8e85cc430b6c839c579de1581a99c72d9d13..6c3fae0594e93317e080178c4ac487f336327ae7 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java
@@ -7,17 +7,18 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
+import java.util.Optional;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-
-public interface BitStatement extends DeclaredStatement<QName>, DocumentationGroup.WithStatus {
 
-    @Nonnull
-    String getName();
+public interface BitStatement extends DocumentedDeclaredStatement.WithStatus<QName>,
+        IfFeatureAwareDeclaredStatement<QName> {
+    default @Nonnull String getName() {
+        return argument().getLocalName();
+    }
 
-    @Nullable
-    PositionStatement getPosition();
+    default PositionStatement getPosition() {
+        final Optional<PositionStatement> opt = findFirstDeclaredSubstatement(PositionStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 }