Remove ReactorStmtCtx.checkLocalNamespaceAllowed()

This method is a rather expensive route towards a noop method in
StatementDefinitionContext. Since there is no routing, just hide the
method and note how it used to be routed and mark it for potential
removal in the next iteration.

Change-Id: I54492cd780c608e3a2c9f2ab0ff3f2d25219fa2b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
index 3ab90d5680c3e22bb9c39a014b0d9340e17075f9..2a521e1907b6cfeddfc5bc0e5de017467567f690 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
@@ -50,8 +50,10 @@ abstract class NamespaceStorageSupport implements NamespaceStorageNode {
      */
     public abstract @NonNull Registry getBehaviourRegistry();
 
-    protected void checkLocalNamespaceAllowed(final Class<? extends ParserNamespace<?, ?>> type) {
-        // NOOP
+    // FIXME: 8.0.0: do we really need this method?
+    final void checkLocalNamespaceAllowed(final Class<? extends ParserNamespace<?, ?>> type) {
+        // Always no-op. We used to route this towards StatementDefinitionContext, but this method remained
+        // unimplemented even there.
     }
 
     /**

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index da11198357174a1a0bda4652904feeafdd4babb5..f292bab919fbef8adf8685190b89a4aca9161226 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@ -335,11 +335,6 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
         return getLocalNamespace(type);
     }
 
-    @Override
-    protected final void checkLocalNamespaceAllowed(final Class<? extends ParserNamespace<?, ?>> type) {
-        definition().checkNamespaceAllowed(type);
-    }
-
     @Override
     protected <K, V, N extends ParserNamespace<K, V>> void onNamespaceElementAdded(final Class<N> type, final K key,
             final V value) {

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
index 32103a339c3e310709681f3d3a3a20f145730bac..8e50390ce880467300f13c9dee064f22a1b6f092 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
@@ -23,7 +23,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ImplicitParentAwareStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.OverrideChildStatementSupport;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ParserNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementFactory;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -52,11 +51,6 @@ final class StatementDefinitionContext<A, D extends DeclaredStatement<A>, E exte
         return support.adaptArgumentValue(context, targetModule);
     }
 
-    // FIXME: 7.0.0: remove this method
-    void checkNamespaceAllowed(final Class<? extends ParserNamespace<?,?>> namespace) {
-        // Noop
-    }
-
     @NonNull StatementDefinition getPublicView() {
         return support.getPublicView();
     }