Clean up NamespaceStmtCtx

NamespaceStmtCtx.namespaceItem() has a useless generic capture for key
argument. Remove it and update javadocs and argument names.

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

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java
index 54b6cfbda72b838c62fe113c04e79b36322e9c62..14dc81c25583b4537aafcee3bd5f46c235883d15 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java
@@ -80,18 +80,18 @@ final class ForwardingUndeclaredCurrent<A, D extends DeclaredStatement<A>> exten
     }
 
     @Override
-    public <K, V> Map<K, V> namespace(final ParserNamespace<K, V> nsType) {
-        return delegate.namespace(nsType);
+    public <K, V> Map<K, V> namespace(final ParserNamespace<K, V> namespace) {
+        return delegate.namespace(namespace);
     }
 
     @Override
-    public <K, V, T extends K> V namespaceItem(final ParserNamespace<K, V> nsType, final T key) {
-        return delegate.namespaceItem(nsType, key);
+    public <K, V> V namespaceItem(final ParserNamespace<K, V> namespace, final K key) {
+        return delegate.namespaceItem(namespace, key);
     }
 
     @Override
-    public <K, V> Map<K, V> localNamespacePortion(final ParserNamespace<K, V> nsType) {
-        return delegate.localNamespacePortion(nsType);
+    public <K, V> Map<K, V> localNamespacePortion(final ParserNamespace<K, V> namespace) {
+        return delegate.localNamespacePortion(namespace);
     }
 
     @Override

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index 175ac471e098eadcb10bcfa3e0df97a4c3347904..3140658a40fc4dab2cd5f2736327adcd195dbcb6 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@ -314,18 +314,18 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
     //
 
     @Override
-    public final <K, V, T extends K> V namespaceItem(final ParserNamespace<K, V> type, final T key) {
-        return getBehaviourRegistry().getNamespaceBehaviour(type).getFrom(this, key);
+    public final <K, V> V namespaceItem(final ParserNamespace<K, V> namespace, final K key) {
+        return getBehaviourRegistry().getNamespaceBehaviour(namespace).getFrom(this, key);
     }
 
     @Override
-    public final <K, V> Map<K, V> namespace(final ParserNamespace<K, V> type) {
-        return getNamespace(type);
+    public final <K, V> Map<K, V> namespace(final ParserNamespace<K, V> namespace) {
+        return getNamespace(namespace);
     }
 
     @Override
-    public final <K, V> Map<K, V> localNamespacePortion(final ParserNamespace<K, V> type) {
-        return getLocalNamespace(type);
+    public final <K, V> Map<K, V> localNamespacePortion(final ParserNamespace<K, V> namespace) {
+        return getLocalNamespace(namespace);
     }
 
     @Override

diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java
index a4aed68c91281f91247fb1643dae4526ca8c1149..3ba625b0c1b86d79977f3f6a8167bbf26d7cd20e 100644 (file)
--- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java
+++ b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java
@@ -22,23 +22,22 @@ public interface NamespaceStmtCtx extends CommonStmtCtx {
      *
      * @param <K> namespace key type
      * @param <V> namespace value type
-     * @param nsType namespace type class
+     * @param namespace namespace
      * @return Namespace contents, if available
      */
-    <K, V> @Nullable Map<K, V> namespace(@NonNull ParserNamespace<K, V> nsType);
+    <K, V> @Nullable Map<K, V> namespace(@NonNull ParserNamespace<K, V> namespace);
 
     /**
      * Return a value associated with specified key within a namespace.
      *
-     * @param nsType Namespace type
-     * @param key Key
      * @param <K> namespace key type
      * @param <V> namespace value type
-     * @param <T> key type
-     * @return Value, or null if there is no element
+     * @param namespace Namespace
+     * @param key Key
+     * @return Value, or {@code null} if there is no element
      * @throws NamespaceNotAvailableException when the namespace is not available.
      */
-    <K, V, T extends K> @Nullable V namespaceItem(@NonNull ParserNamespace<K, V> nsType, T key);
+    <K, V> @Nullable V namespaceItem(@NonNull ParserNamespace<K, V> namespace, K key);
 
     /**
      * Return the portion of specified namespace stored in this node. Depending on namespace behaviour this may or may
@@ -50,8 +49,8 @@ public interface NamespaceStmtCtx extends CommonStmtCtx {
      *
      * @param <K> namespace key type
      * @param <V> namespace value type
-     * @param nsType namespace type class
+     * @param namespace namespace type class
      * @return Namespace portion stored in this node, if available
      */
-    <K, V> @Nullable Map<K, V> localNamespacePortion(@NonNull ParserNamespace<K, V> nsType);
+    <K, V> @Nullable Map<K, V> localNamespacePortion(@NonNull ParserNamespace<K, V> namespace);
 }