Split out yang-model-ri

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
index 144b7f1cdd87973dc236de76e0351517a9ba1311..b448a735db180935372f6909ff3d4ab71b9f1534 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
@@ -7,15 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension;
 
+import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements;
 import org.opendaylight.yangtools.yang.common.QName;
 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.ArgumentStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
 import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementDefinitionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
@@ -34,7 +39,7 @@ public final class ExtensionStatementSupport
     private static final ExtensionStatementSupport INSTANCE = new ExtensionStatementSupport();
 
     private ExtensionStatementSupport() {
-        super(YangStmtMapping.EXTENSION);
+        super(YangStmtMapping.EXTENSION, StatementPolicy.reject());
     }
 
     public static ExtensionStatementSupport getInstance() {
@@ -46,23 +51,12 @@ public final class ExtensionStatementSupport
         return StmtContextUtils.parseIdentifier(ctx, value);
     }
 
-    @Override
-    public ExtensionStatement createDeclared(final StmtContext<QName, ExtensionStatement,?> ctx) {
-        return new ExtensionStatementImpl(ctx);
-    }
-
-    @Override
-    public ExtensionEffectiveStatement createEffective(
-            final StmtContext<QName, ExtensionStatement, ExtensionEffectiveStatement> ctx) {
-        return ExtensionEffectiveStatementImpl.create(ctx);
-    }
-
     @Override
     public void onStatementDefinitionDeclared(
             final Mutable<QName, ExtensionStatement, ExtensionEffectiveStatement> stmt) {
         super.onStatementDefinitionDeclared(stmt);
 
-        QName stmtName = stmt.coerceStatementArgument();
+        QName stmtName = stmt.getArgument();
         if (OpenConfigStatements.OPENCONFIG_VERSION.getStatementName().isEqualWithoutRevision(stmtName)) {
             stmtName = stmtName.withoutRevision();
         }
@@ -74,14 +68,30 @@ public final class ExtensionStatementSupport
         final StmtContext<Boolean, ?, ?> yinElement = StmtContextUtils.findFirstDeclaredSubstatement(stmt,
             YinElementStatement.class);
 
-        stmt.addToNs(StatementDefinitionNamespace.class, stmt.getStatementArgument(),
-            new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.getStatementArgument(),
-                argument != null ? argument.getStatementArgument() : null,
-                        yinElement != null && yinElement.getStatementArgument())));
+        stmt.addToNs(StatementDefinitionNamespace.class, stmt.argument(),
+            new UnrecognizedStatementSupport(new ModelDefinedStatementDefinition(stmt.getArgument(),
+                argument != null ? argument.argument() : null, yinElement != null && yinElement.getArgument())));
     }
 
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
     }
+
+    @Override
+    protected ExtensionStatement createDeclared(final StmtContext<QName, ExtensionStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return DeclaredStatements.createExtension(ctx.getArgument(), substatements);
+    }
+
+    @Override
+    protected ExtensionStatement createEmptyDeclared(final StmtContext<QName, ExtensionStatement, ?> ctx) {
+        return DeclaredStatements.createExtension(ctx.getArgument());
+    }
+
+    @Override
+    protected ExtensionEffectiveStatement createEffective(final Current<QName, ExtensionStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new ExtensionEffectiveStatementImpl(stmt.declared(), substatements, stmt.optionalPath());
+    }
 }
\ No newline at end of file