Introduce NamespaceStmtCtx

[yangtools.git] / yang / yang-parser-reactor / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / reactor / BaseCurrentEffectiveStmtCtx.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BaseCurrentEffectiveStmtCtx.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BaseCurrentEffectiveStmtCtx.java
index d42fb4012f2e19263821a2cb6010e98c92537b68..cd8950a29405fce416e676ff04ba37c7ec941baa 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BaseCurrentEffectiveStmtCtx.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BaseCurrentEffectiveStmtCtx.java
@@ -30,16 +30,16 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReferenc
 final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> implements EffectiveStmtCtx.Current<A, D> {
     static final Object NULL_OBJ = new Object();
 
-    private final @NonNull StmtContext<A, D, ?> delegate;
+    private final @NonNull StatementContextBase<A, D, ?> delegate;
 
     private @Nullable Object parent;
 
-    BaseCurrentEffectiveStmtCtx(final StmtContext<A, D, ?> delegate) {
+    BaseCurrentEffectiveStmtCtx(final StatementContextBase<A, D, ?> delegate) {
         this.delegate = requireNonNull(delegate);
         this.parent = null;
     }
 
-    BaseCurrentEffectiveStmtCtx(final StmtContext<A, D, ?> delegate, final Parent parent) {
+    BaseCurrentEffectiveStmtCtx(final StatementContextBase<A, D, ?> delegate, final Parent parent) {
         this.delegate = requireNonNull(delegate);
         this.parent = requireNonNull(parent);
     }
@@ -61,7 +61,7 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
 
     @Override
     public CopyHistory history() {
-        return delegate.getCopyHistory();
+        return delegate.history();
     }
 
     @Override
@@ -70,9 +70,19 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
     }
 
     @Override
-    public <K, V, T extends K, N extends IdentifierNamespace<K, V>> V getFromNamespace(
-            final Class<@NonNull N> type, final T key) {
-        return delegate.getFromNamespace(type, key);
+    public <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> localNamespace(final Class<@NonNull N> nsType) {
+        return delegate.localNamespace(nsType);
+    }
+
+    @Override
+    public <K, V, N extends IdentifierNamespace<K, V>> @Nullable Map<K, V> namespace(final Class<@NonNull N> nsType) {
+        return delegate.namespace(nsType);
+    }
+
+    @Override
+    public <K, V, T extends K, N extends IdentifierNamespace<K, V>> V namespaceItem(final Class<@NonNull N> type,
+            final T key) {
+        return delegate.namespaceItem(type, key);
     }
 
     @Override
@@ -83,7 +93,7 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
     @Override
     @Deprecated
     public Optional<SchemaPath> schemaPath() {
-        return delegate.getSchemaPath();
+        return delegate.schemaPath();
     }
 
     @Override
@@ -105,7 +115,7 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
 
     // FIXME: YANGTOOLS-1185: this should be rendered unnecessary
     private Parent loadParent() {
-        final StmtContext<?, ?, ?> parentDelegate = delegate.getParentContext();
+        final StatementContextBase<?, ?, ?> parentDelegate = delegate.getParentContext();
         if (parentDelegate == null) {
             parent = NULL_OBJ;
             return null;
@@ -116,15 +126,9 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
         return ret;
     }
 
-    @Override
-    public <K, V, N extends IdentifierNamespace<K, V>> Map<K, V>
-            getAllFromCurrentStmtCtxNamespace(final Class<N> type) {
-        return delegate.getAllFromCurrentStmtCtxNamespace(type);
-    }
-
     @Override
     public A argument() {
-        return delegate.getStatementArgument();
+        return delegate.argument();
     }
 
     @Override
@@ -139,7 +143,7 @@ final class BaseCurrentEffectiveStmtCtx<A, D extends DeclaredStatement<A>> imple
 
     @Override
     public YangVersion yangVersion() {
-        return delegate.getRootVersion();
+        return delegate.yangVersion();
     }
 
     @Override