Revert ChoiceSchemaNode.getCases() to return a Collection

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / mandatory / RegularMandatoryStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/RegularMandatoryStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/RegularMandatoryStatement.java
index a63e455f450bdfe753fd927c66654c6b54db11f9..00d951c55efb72c633d23374cdbf52f11badc37c 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/RegularMandatoryStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/RegularMandatoryStatement.java
@@ -8,21 +8,13 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.mandatory;
 
 import com.google.common.collect.ImmutableList;
-import java.util.Collection;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.ArgumentToString.WithSubstatements;
 
-final class RegularMandatoryStatement extends AbstractMandatoryStatement {
-    private final @NonNull Object substatements;
-
+final class RegularMandatoryStatement extends WithSubstatements<Boolean> implements MandatoryStatement {
     RegularMandatoryStatement(final Boolean argument,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        super(argument);
-        this.substatements = maskList(substatements);
-    }
-
-    @Override
-    public Collection<? extends DeclaredStatement<?>> declaredSubstatements() {
-        return unmaskList(substatements);
+        super(argument, substatements);
     }
 }