X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Fapi%2Fstmt%2FListStatement.java;h=9b8938354d9bf5d8aca859b590ab87350cf5a58a;hb=9738a742a50df99c9f3fc3ac16a5d65a63d77a10;hp=f2598bc4b0152ed7edf93dbe468c02a4059caf2e;hpb=eaeedd7c54381a24c89fb0d231b2178801bbed6a;p=yangtools.git

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 f2598bc4b0..9b8938354d 100644
--- 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,15 +8,20 @@
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import java.util.Collection;
+import java.util.Optional;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 
-public interface ListStatement extends DataDefinitionStatement, MultipleElementsGroup,
-        DataDefinitionContainer.WithReusableDefinitions, ConfigStatementContainerDeclaredStatement<QName>,
-        ActionStatementContainer, MustStatementContainer, NotificationStatementContainer {
+public interface ListStatement extends MultipleElementsDeclaredStatement,
+        DataDefinitionAwareDeclaredStatement.WithReusableDefinitions<QName>,
+        ConfigStatementAwareDeclaredStatement<QName>, ActionStatementAwareDeclaredStatement<QName>,
+        MustStatementAwareDeclaredStatement<QName>, NotificationStatementAwareDeclaredStatement<QName> {
+    default KeyStatement getKey() {
+        final Optional<KeyStatement> opt = findFirstDeclaredSubstatement(KeyStatement.class);
+        return opt.isPresent() ? opt.get() : null;
+    }
 
-    @Nullable KeyStatement getKey();
-
-    @Nonnull Collection<? extends UniqueStatement> getUnique();
+    default @Nonnull Collection<? extends UniqueStatement> getUnique() {
+        return declaredSubstatements(UniqueStatement.class);
+    }
 }