Centralize substatement validators

[yangtools.git] / yang / odlext-parser-support / src / main / java / org / opendaylight / yangtools / odlext / parser / ContextInstanceStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java
index 7c10f5b12775d3c4b07ae7626a98b784d3d2f4e2..b877f508db0d706df8c96aed46a942c782f16623 100644 (file)
--- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java
+++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java
@@ -9,23 +9,26 @@ package org.opendaylight.yangtools.odlext.parser;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableList;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.odlext.model.api.ContextInstanceEffectiveStatement;
 import org.opendaylight.yangtools.odlext.model.api.ContextInstanceStatement;
 import org.opendaylight.yangtools.odlext.model.api.OpenDaylightExtensionsStatements;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclarationReference;
 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.IdentityEffectiveStatement;
+import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
 @Beta
 public final class ContextInstanceStatementSupport
         extends AbstractIdentityAwareStatementSupport<ContextInstanceStatement, ContextInstanceEffectiveStatement> {
-    public static final @NonNull ContextInstanceStatementSupport INSTANCE = new ContextInstanceStatementSupport();
+    private static final SubstatementValidator VALIDATOR =
+        SubstatementValidator.builder(OpenDaylightExtensionsStatements.CONTEXT_INSTANCE).build();
 
-    private ContextInstanceStatementSupport() {
-        super(OpenDaylightExtensionsStatements.CONTEXT_INSTANCE);
+    public ContextInstanceStatementSupport(final YangParserConfiguration config) {
+        super(OpenDaylightExtensionsStatements.CONTEXT_INSTANCE, config, VALIDATOR);
     }
 
     @Override
@@ -34,6 +37,12 @@ public final class ContextInstanceStatementSupport
         return new ContextInstanceStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
+    @Override
+    protected ContextInstanceStatement attachDeclarationReference(final ContextInstanceStatement stmt,
+            final DeclarationReference reference) {
+        return new RefContextInstanceStatement(stmt, reference);
+    }
+
     @Override
     ContextInstanceEffectiveStatement createEffective(final ContextInstanceStatement declared,
             final IdentityEffectiveStatement identity,