Use Empty instead of Void for argument

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
index b186450f6f23356751491c373e9cf33f755a1be8..7244fd8b475ad0c487f3e7b1f048300ae5130154 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
@@ -9,57 +9,42 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension;
 
 import com.google.common.collect.ImmutableList;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.SchemaNodeDefaults;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 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.parser.rfc7950.stmt.UnknownEffectiveStatementBase;
-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.EffectiveStmtCtx.Current;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SchemaPathSupport;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class UnrecognizedEffectiveStatementImpl extends UnknownEffectiveStatementBase<String, UnrecognizedStatement>
+final class UnrecognizedEffectiveStatementImpl extends UnknownEffectiveStatementBase<Object, UnrecognizedStatement>
         implements UnrecognizedEffectiveStatement {
     private static final Logger LOG = LoggerFactory.getLogger(UnrecognizedEffectiveStatementImpl.class);
 
     private final QName maybeQNameArgument;
-    private final @NonNull SchemaPath path;
+    private final @Nullable SchemaPath path;
 
-    UnrecognizedEffectiveStatementImpl(final @NonNull UnrecognizedStatement declared,
-            final @NonNull ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
-            final StmtContext<String, UnrecognizedStatement, ?> ctx) {
-        super(ctx.getStatementArgument(), declared, substatements, ctx);
-
-        // FIXME: Remove following section after fixing 4380
-        final UnknownSchemaNode original = (UnknownSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective)
-                .orElse(null);
-        if (original != null) {
-            this.maybeQNameArgument = original.getQName();
-        } else {
-            QName maybeQNameArgumentInit = null;
-            try {
-                maybeQNameArgumentInit = StmtContextUtils.qnameFromArgument(ctx, argument());
-            } catch (SourceException e) {
-                LOG.debug("Not constructing QName from {}", argument(), e);
-                maybeQNameArgumentInit = getNodeType();
-            }
-            this.maybeQNameArgument = maybeQNameArgumentInit;
-        }
+    UnrecognizedEffectiveStatementImpl(final Current<Object, UnrecognizedStatement> stmt,
+            final @NonNull ImmutableList<? extends EffectiveStatement<?, ?>> substatements, final QName qnameArgument) {
+        super(stmt, substatements);
+        this.maybeQNameArgument = qnameArgument != null ? qnameArgument : getNodeType();
 
         SchemaPath maybePath;
         try {
-            maybePath = ctx.coerceParentContext().getSchemaPath()
-                    .map(parentPath -> parentPath.createChild(maybeQNameArgument)).orElse(null);
+            final SchemaPath parentPath = stmt.getEffectiveParent().schemaPath();
+            maybePath = parentPath == null ? null : parentPath.createChild(maybeQNameArgument);
         } catch (IllegalArgumentException | SourceException e) {
-            LOG.debug("Cannot construct path for {}, attempting to recover", ctx, e);
+            LOG.debug("Cannot construct path for {}, attempting to recover", stmt, e);
             maybePath = null;
         }
-        path = maybePath;
+        path = SchemaPathSupport.toOptionalPath(maybePath);
     }
 
     @Override
@@ -70,7 +55,7 @@ final class UnrecognizedEffectiveStatementImpl extends UnknownEffectiveStatement
     @Override
     @Deprecated
     public SchemaPath getPath() {
-        return path;
+        return SchemaNodeDefaults.throwUnsupportedIfNull(this, path);
     }
 
     @Override