X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yang%2Fyang-parser-rfc7950%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Frfc7950%2Fstmt%2Fextension%2FUnrecognizedStatementSupport.java;h=b45d9c1ceb11edb933fc07c5142c4d770d1ead11;hb=e5e06d81bed0a7cb520e94a4b018d0e2bb7f0c62;hp=b899b2c994d52f8e1a551d5f1b15169041c97543;hpb=4335e0275cf96773318caebba42d1b95cec82912;p=yangtools.git

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
index b899b2c994..b45d9c1ceb 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
@@ -7,29 +7,37 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableList;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.UnqualifiedQName;
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.ArgumentDefinition;
+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.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatementDecorators;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
+import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
+import org.opendaylight.yangtools.yang.parser.spi.meta.OverrideChildStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
-import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 
 final class UnrecognizedStatementSupport
-        extends AbstractStatementSupport<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> {
-    UnrecognizedStatementSupport(final StatementDefinition publicDefinition) {
-        super(publicDefinition, CopyPolicy.DECLARED_COPY);
+        extends AbstractStatementSupport<Object, UnrecognizedStatement, UnrecognizedEffectiveStatement>
+        implements OverrideChildStatementSupport {
+    private final YangParserConfiguration config;
+
+    UnrecognizedStatementSupport(final StatementDefinition publicDefinition, final YangParserConfiguration config) {
+        // We have no idea about the statement's semantics, hence there should be noone interested in its semantics.
+        // Nevertheless it may be of interest for various hacks to understand there was an extension involved.
+        super(publicDefinition, StatementPolicy.exactReplica(), config, null);
+        this.config = requireNonNull(config);
     }
 
     @Override
@@ -38,67 +46,48 @@ final class UnrecognizedStatementSupport
     }
 
     @Override
-    public Optional<StatementSupport<?, ?, ?>> getUnknownStatementDefinitionOf(
-            final StatementDefinition yangStmtDef) {
+    public UnrecognizedStatementSupport statementDefinitionOverrideOf(final StatementDefinition childDef) {
+        /*
+         * This code wraps statements encountered inside an extension so they do not get confused with regular
+         * statements.
+         */
         final QName baseQName = getStatementName();
-        final QName statementName = QName.create(baseQName, yangStmtDef.getStatementName().getLocalName());
+        final QName statementName = QName.create(baseQName, childDef.getStatementName().getLocalName());
 
         final ModelDefinedStatementDefinition def;
-        final Optional<ArgumentDefinition> optArgDef = yangStmtDef.getArgumentDefinition();
+        final Optional<ArgumentDefinition> optArgDef = childDef.getArgumentDefinition();
         if (optArgDef.isPresent()) {
             final ArgumentDefinition argDef = optArgDef.get();
             def = new ModelDefinedStatementDefinition(statementName, argDef.getArgumentName(), argDef.isYinElement());
         } else {
             def = new ModelDefinedStatementDefinition(statementName);
         }
-        return Optional.of(new ModelDefinedStatementSupport(def));
+        return new UnrecognizedStatementSupport(def, config);
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return null;
+    protected UnrecognizedStatement createDeclared(final StmtContext<Object, UnrecognizedStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return DeclaredStatements.createUnrecognized(ctx.rawArgument(), ctx.publicDefinition(), substatements);
     }
 
     @Override
-    protected UnrecognizedStatement createDeclared(final StmtContext<String, UnrecognizedStatement, ?> ctx,
-            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new UnrecognizedStatementImpl(ctx.rawArgument(), ctx.publicDefinition(), substatements);
+    protected UnrecognizedStatement attachDeclarationReference(final UnrecognizedStatement stmt,
+            final DeclarationReference reference) {
+        return DeclaredStatementDecorators.decorateUnrecognized(stmt, reference);
     }
 
+    // createEffective() should never be called, ensure that for each declared statement
+
     @Override
-    protected UnrecognizedStatement createEmptyDeclared(final StmtContext<String, UnrecognizedStatement, ?> ctx) {
-        return createDeclared(ctx, ImmutableList.of());
+    public void onStatementAdded(final Mutable<Object, UnrecognizedStatement, UnrecognizedEffectiveStatement> stmt) {
+        stmt.setIsSupportedToBuildEffective(false);
     }
 
     @Override
-    protected UnrecognizedEffectiveStatement createEffective(final Current<String, UnrecognizedStatement> stmt,
+    protected UnrecognizedEffectiveStatement createEffective(final Current<Object, UnrecognizedStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        // FIXME: Remove following section after fixing 4380
-        final UnknownSchemaNode original = (UnknownSchemaNode) stmt.original();
-        return new UnrecognizedEffectiveStatementImpl(stmt, substatements,
-            original == null ? qnameFromArgument(stmt) : original.getQName());
-    }
-
-    private static QName qnameFromArgument(final Current<String, UnrecognizedStatement> stmt) {
-        final String value = stmt.argument();
-        if (value == null || value.isEmpty()) {
-            return stmt.publicDefinition().getStatementName();
-        }
-
-        final int colon = value.indexOf(':');
-        if (colon == -1) {
-            final UnqualifiedQName qname = UnqualifiedQName.tryCreate(value);
-            return qname == null ? null : qname.bindTo(stmt.moduleName().getModule()).intern();
-        }
-
-        final QNameModule qnameModule = StmtContextUtils.getModuleQNameByPrefix(stmt.caerbannog(),
-            value.substring(0, colon));
-        if (qnameModule == null) {
-            return null;
-        }
-
-        final int next = value.indexOf(':', colon + 1);
-        final String localName = next == -1 ? value.substring(colon + 1) : value.substring(colon + 1, next);
-        return QName.create(qnameModule, localName).intern();
+        throw new InferenceException(stmt, "Attempted to instantiate unrecognized effective statement %s",
+            stmt.publicDefinition());
     }
 }
\ No newline at end of file