YANGTOOLS-706: Reduce inter-statement implementation coupling

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ContainerStatementRfc7950Support.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ContainerStatementRfc7950Support.java
index 168ef933682815fcb132897f2d520f6603f79764..fd6e2997b2fe2d7be4845f1518bab36ad47c898c 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ContainerStatementRfc7950Support.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ContainerStatementRfc7950Support.java
@@ -9,13 +9,19 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc7950;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
-import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ContainerStatementImpl;
 
+/**
+ * Class providing necessary support for processing YANG 1.1 Container
+ * statement.
+ */
 @Beta
-public class ContainerStatementRfc7950Support extends ContainerStatementImpl.Definition {
+public final class ContainerStatementRfc7950Support extends ContainerStatementImpl.Definition {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .CONTAINER)
+            .addAny(YangStmtMapping.ACTION)
+            .addAny(YangStmtMapping.ANYDATA)
             .addAny(YangStmtMapping.ANYXML)
             .addAny(YangStmtMapping.CHOICE)
             .addOptional(YangStmtMapping.CONFIG)
@@ -27,13 +33,13 @@ public class ContainerStatementRfc7950Support extends ContainerStatementImpl.Def
             .addAny(YangStmtMapping.LEAF_LIST)
             .addAny(YangStmtMapping.LIST)
             .addAny(YangStmtMapping.MUST)
+            .addAny(YangStmtMapping.NOTIFICATION)
             .addOptional(YangStmtMapping.PRESENCE)
             .addOptional(YangStmtMapping.REFERENCE)
             .addOptional(YangStmtMapping.STATUS)
             .addAny(YangStmtMapping.TYPEDEF)
             .addAny(YangStmtMapping.USES)
             .addOptional(YangStmtMapping.WHEN)
-            .addAny(YangStmtMapping.NOTIFICATION)
             .build();
 
     @Override