Teach YANG parser to retain DeclarationReference

[yangtools.git] / yang / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / thirdparty / plugin / ThirdPartyExtensionSupport.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
index 54a8e3d409065900e21cfb5b848ac4df861948e1..d11a51b4e2b0301200ac968abd3a659fb36610ba 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
@@ -8,31 +8,27 @@
 package org.opendaylight.yangtools.yang.thirdparty.plugin;
 
 import com.google.common.collect.ImmutableList;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStringStatementSupport;
+import org.opendaylight.yangtools.yang.model.parser.api.YangParserConfiguration;
+import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
 public final class ThirdPartyExtensionSupport
-        extends BaseStringStatementSupport<ThirdPartyExtensionStatement, ThirdPartyExtensionEffectiveStatement> {
-
-    private static final ThirdPartyExtensionSupport INSTANCE = new ThirdPartyExtensionSupport();
-
-    private ThirdPartyExtensionSupport() {
-        super(ThirdPartyExtensionsMapping.THIRD_PARTY_EXTENSION);
-    }
-
-    public static ThirdPartyExtensionSupport getInstance() {
-        return INSTANCE;
+        extends AbstractStringStatementSupport<ThirdPartyExtensionStatement, ThirdPartyExtensionEffectiveStatement> {
+    public ThirdPartyExtensionSupport(final YangParserConfiguration config) {
+        super(ThirdPartyExtensionsMapping.THIRD_PARTY_EXTENSION, StatementPolicy.contextIndependent(), config);
     }
 
     @Override
     public void onFullDefinitionDeclared(
             final Mutable<String, ThirdPartyExtensionStatement, ThirdPartyExtensionEffectiveStatement> stmt) {
         super.onFullDefinitionDeclared(stmt);
-        stmt.addToNs(ThirdPartyNamespace.class, stmt, "Third-party namespace test.");
+        stmt.addToNs(ThirdPartyNamespace.class, Empty.getInstance(), "Third-party namespace test.");
     }
 
     @Override
@@ -44,27 +40,13 @@ public final class ThirdPartyExtensionSupport
     protected ThirdPartyExtensionStatement createDeclared(
             final StmtContext<String, ThirdPartyExtensionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new ThirdPartyExtensionStatementImpl(ctx, substatements);
-    }
-
-    @Override
-    protected ThirdPartyExtensionStatement createEmptyDeclared(
-            final StmtContext<String, ThirdPartyExtensionStatement, ?> ctx) {
-        return createDeclared(ctx, ImmutableList.of());
+        return new ThirdPartyExtensionStatementImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected ThirdPartyExtensionEffectiveStatement createEffective(
-            final StmtContext<String, ThirdPartyExtensionStatement, ThirdPartyExtensionEffectiveStatement> ctx,
-            final ThirdPartyExtensionStatement declared,
+            final Current<String, ThirdPartyExtensionStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new ThirdPartyExtensionEffectiveStatementImpl(ctx, substatements);
-    }
-
-    @Override
-    protected ThirdPartyExtensionEffectiveStatement createEmptyEffective(
-            final StmtContext<String, ThirdPartyExtensionStatement, ThirdPartyExtensionEffectiveStatement> ctx,
-            final ThirdPartyExtensionStatement declared) {
-        return createEffective(ctx, declared, ImmutableList.of());
+        return new ThirdPartyExtensionEffectiveStatementImpl(stmt, substatements);
     }
 }