Improve {Action,Notification}NodeContainerCompat safety

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java
index 428bfde119b931909f93e9c6dc204ca5d36a94cc..a7d9c25958cf94a2740678e1a3a0a2b27593d44c 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java
@@ -7,27 +7,26 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+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 LeafListStatement extends DataDefinitionStatement, MultipleElementsGroup, TypeGroup {
-
-    @Nullable Collection<? extends MustStatement> getMusts();
-
-    @Nullable ConfigStatement getConfig();
+public interface LeafListStatement extends MultipleElementsDeclaredStatement, TypeAwareDeclaredStatement,
+        ConfigStatementAwareDeclaredStatement<QName>, MustStatementAwareDeclaredStatement<QName> {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.LEAF_LIST;
+    }
 
     /**
-     * All implementations should override this method.
-     * The default definition of this method is used only in YANG 1.0 (RFC6020) implementation of
-     * LeafListStatement which does not support default statements.
-     * YANG leaf-list statement has been changed in YANG 1.1 (RFC7950) and now allows default statements.
+     * Return default statements defined in this leaf-list. For RFC6020 semantics, this method returns an empty
+     * collection.
      *
      * @return collection of default statements
      */
-     // FIXME: version 2.0.0: make this method non-default
-    @Nonnull default Collection<? extends DefaultStatement> getDefaults() {
-        return ImmutableList.of();
+    default @NonNull Collection<? extends DefaultStatement> getDefaults() {
+        return declaredSubstatements(DefaultStatement.class);
     }
 }