Graduate ChildSchemaNodeNamespace as SchemaTreeNamespace

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
index ff3a9bdb234a7a0a3f955643381a1578416b5cb1..b22de19014304aac22471aebb2f5ae68de65472a 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
@@ -7,17 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.modifier;
 
+import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ModifierEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement;
 import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
-public final class ModifierStatementSupport extends AbstractStatementSupport<ModifierKind, ModifierStatement,
-        EffectiveStatement<ModifierKind, ModifierStatement>> {
+public final class ModifierStatementSupport
+        extends BaseStatementSupport<ModifierKind, ModifierStatement, ModifierEffectiveStatement> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.MODIFIER).build();
     private static final ModifierStatementSupport INSTANCE = new ModifierStatementSupport();
@@ -37,24 +40,37 @@ public final class ModifierStatementSupport extends AbstractStatementSupport<Mod
     }
 
     @Override
-    public ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
-        return new ModifierStatementImpl(ctx);
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    public EffectiveStatement<ModifierKind, ModifierStatement> createEffective(
-            final StmtContext<ModifierKind, ModifierStatement,
-            EffectiveStatement<ModifierKind, ModifierStatement>> ctx) {
-        return new ModifierEffectiveStatementImpl(ctx);
+    public String internArgument(final String rawArgument) {
+        return "invert-match".equals(rawArgument) ? "invert-match" : rawArgument;
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularModifierStatement(ctx, substatements);
     }
 
     @Override
-    public String internArgument(final String rawArgument) {
-        return "invert-match".equals(rawArgument) ? "invert-match" : rawArgument;
+    protected ModifierStatement createEmptyDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
+        return new EmptyModifierStatement(ctx);
+    }
+
+    @Override
+    protected ModifierEffectiveStatement createEffective(
+            final StmtContext<ModifierKind, ModifierStatement, ModifierEffectiveStatement> ctx,
+            final ModifierStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new RegularModifierEffectiveStatement(declared, substatements);
+    }
+
+    @Override
+    protected ModifierEffectiveStatement createEmptyEffective(
+            final StmtContext<ModifierKind, ModifierStatement, ModifierEffectiveStatement> ctx,
+            final ModifierStatement declared) {
+        return new EmptyModifierEffectiveStatement(declared);
     }
 }