Make BitsTypeDefinition.Bit only a DocumentedNode.WithStatus

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java
index 7f852d91b88fb1c8055e8b850f2d9b2dfd35e7d5..77e2542e4e91d30bae390fc2dcd0fcb23b99d827 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java
@@ -8,17 +8,28 @@
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import java.util.Collection;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-public interface ListStatement extends DataDefinitionStatement, MultipleElementsGroup,
-        DataDefinitionContainer.WithReusableDefinitions {
+public interface ListStatement extends MultipleElementsDeclaredStatement,
+        DataDefinitionAwareDeclaredStatement.WithReusableDefinitions<QName>,
+        ConfigStatementAwareDeclaredStatement<QName>, ActionStatementAwareDeclaredStatement<QName>,
+        MustStatementAwareDeclaredStatement<QName>, NotificationStatementAwareDeclaredStatement<QName> {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.LIST;
+    }
 
-    @Nonnull Collection<? extends MustStatement> getMusts();
+    default @Nullable KeyStatement getKey() {
+        final Optional<KeyStatement> opt = findFirstDeclaredSubstatement(KeyStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 
-    @Nullable KeyStatement getKey();
-
-    @Nonnull Collection<? extends UniqueStatement> getUnique();
-
-    @Nullable ConfigStatement getConfig();
+    default @NonNull Collection<? extends UniqueStatement> getUnique() {
+        return declaredSubstatements(UniqueStatement.class);
+    }
 }