Fix NormalizedNodeContainerBuilder generics

We have quite a few inconsistencies with NormalizedNodeBuilder which we
are specializing. Align generic argument names to fix Sonar warnings.

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

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeContainerBuilder.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeContainerBuilder.java
index be975ee663cd85aeb8c241aafcb4157a2fca92a4..07a8e77c33571c0a65786a25742bffd2918bf2b8 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeContainerBuilder.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeContainerBuilder.java
@@ -14,16 +14,16 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 @Beta
-public interface NormalizedNodeContainerBuilder<K extends PathArgument, CK extends PathArgument,
-        CV extends NormalizedNode, P extends NormalizedNode> extends NormalizedNodeBuilder<K, Collection<CV>, P> {
+public interface NormalizedNodeContainerBuilder<I extends PathArgument, K extends PathArgument,
+        V extends NormalizedNode, R extends NormalizedNode> extends NormalizedNodeBuilder<I, Collection<V>, R> {
 
     @Override
-    NormalizedNodeContainerBuilder<K, CK, CV, P> withNodeIdentifier(K nodeIdentifier);
+    NormalizedNodeContainerBuilder<I, K, V, R> withNodeIdentifier(I nodeIdentifier);
 
     @Override
-    NormalizedNodeContainerBuilder<K, CK, CV, P> withValue(Collection<CV> value);
+    NormalizedNodeContainerBuilder<I, K, V, R> withValue(Collection<V> value);
 
-    @NonNull NormalizedNodeContainerBuilder<K, CK, CV, P> addChild(CV child);
+    @NonNull NormalizedNodeContainerBuilder<I, K, V, R> addChild(V child);
 
-    @NonNull NormalizedNodeContainerBuilder<K, CK, CV, P> removeChild(CK key);
+    @NonNull NormalizedNodeContainerBuilder<I, K, V, R> removeChild(K key);
 }