Remove EffectiveStatement namespaces

[yangtools.git] / parser / rfc8040-parser-support / src / main / java / org / opendaylight / yangtools / rfc8040 / parser / YangDataEffectiveStatementImpl.java

diff --git a/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java
index 13440a836790e82955fadd63b711aea78c3976ef..444cf3f3e17f58094577c297ceb80fd9749d969e 100644 (file)
--- a/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java
+++ b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.rfc8040.parser;
 
-import static com.google.common.base.Verify.verify;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
+import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
-import java.util.Map;
+import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.rfc8040.model.api.YangDataEffectiveStatement;
@@ -21,9 +22,9 @@ import org.opendaylight.yangtools.rfc8040.model.api.YangDataStatement;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeAwareEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.spi.meta.AbstractEffectiveUnknownSchmemaNode;
 import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.DataNodeContainerMixin;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
@@ -55,25 +56,36 @@ final class YangDataEffectiveStatementImpl extends AbstractEffectiveUnknownSchme
     }
 
     @Override
-    protected <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
-            final Class<N> namespace) {
-        if (SchemaTreeNamespace.class.equals(namespace)) {
-            return castChild();
+    public Optional<DataTreeEffectiveStatement<?>> findDataTreeNode(final QName qname) {
+        if (child instanceof DataTreeEffectiveStatement<?> dataChild && dataChild.argument().equals(qname)) {
+            return Optional.of(dataChild);
+        } else if (child instanceof DataTreeAwareEffectiveStatement<?, ?> aware) {
+            // A schema tree statement which *has to* know about data tree -- just forward it
+            return aware.findDataTreeNode(qname);
+        } else {
+            throw new VerifyException("Unexpected child " + child);
         }
-        if (DataTreeNamespace.class.equals(namespace)) {
-            if (child instanceof DataTreeEffectiveStatement) {
-                return castChild();
-            }
+    }
 
+    @Override
+    public Collection<DataTreeEffectiveStatement<?>> dataTreeNodes() {
+        if (child instanceof DataTreeEffectiveStatement<?> dataChild) {
+            return List.of(dataChild);
+        } else if (child instanceof DataTreeAwareEffectiveStatement<?, ?> aware) {
             // A schema tree statement which *has to* know about data tree -- just forward it
-            verify(child instanceof DataTreeAwareEffectiveStatement, "Unexpected child %s", child);
-            return Optional.of(((DataTreeAwareEffectiveStatement<?, ?>) child).getAll(namespace));
+            return aware.dataTreeNodes();
+        } else {
+            throw new VerifyException("Unexpected child " + child);
         }
-        return super.getNamespaceContents(namespace);
     }
 
-    @SuppressWarnings("unchecked")
-    private <K, V> Optional<Map<K, V>> castChild() {
-        return Optional.of((Map<K, V>) Map.of(child.getQName(), child));
+    @Override
+    public Collection<SchemaTreeEffectiveStatement<?>> schemaTreeNodes() {
+        return (Collection) List.of(child);
+    }
+
+    @Override
+    public Optional<SchemaTreeEffectiveStatement<?>> findSchemaTreeNode(@NonNull QName qname) {
+        return qname.equals(child.getQName()) ? (Optional) Optional.of(child) : Optional.empty();
     }
 }