BUG-692: Rename mappedChildren to children

This clarifies the relationship of children/mappedChildren.

Change-Id: Iebbe739902d2c5356ecf0abc8cadd2bb462b6473
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
index 8060114a35287d4a36d8896daae4d07aad1e83c6..47af2e750cbdfe72c8500e2fa6517b94d340f849 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
@@ -80,27 +80,27 @@ public class ImmutableLeafSetNodeBuilder<T> implements ListNodeBuilder<T, LeafSe
             AbstractImmutableNormalizedNode<InstanceIdentifier.NodeIdentifier, Iterable<LeafSetEntryNode<T>>> implements
             Immutable, LeafSetNode<T> {
 
-        private final Map<InstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> mappedChildren;
+        private final Map<InstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> children;
 
         ImmutableLeafSetNode(final InstanceIdentifier.NodeIdentifier nodeIdentifier,
                 final Map<InstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> children) {
             super(nodeIdentifier, Iterables.unmodifiableIterable(children.values()));
-            this.mappedChildren = children;
+            this.children = children;
         }
 
         @Override
         public Optional<LeafSetEntryNode<T>> getChild(final InstanceIdentifier.NodeWithValue child) {
-            return Optional.fromNullable(mappedChildren.get(child));
+            return Optional.fromNullable(children.get(child));
         }
 
         @Override
         protected int valueHashCode() {
-            return mappedChildren.hashCode();
+            return children.hashCode();
         }
 
         @Override
         protected boolean valueEquals(final AbstractImmutableNormalizedNode<?, ?> other) {
-            return mappedChildren.equals(((ImmutableLeafSetNode<?>) other).mappedChildren);
+            return children.equals(((ImmutableLeafSetNode<?>) other).children);
         }
     }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java
index 307128675072af78303284594d39c75d05485602..7c26eb14ecddc78bb769a13e9cf90c9c1454aa05 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java
@@ -76,27 +76,27 @@ public class ImmutableMapNodeBuilder
 
     static final class ImmutableMapNode extends AbstractImmutableNormalizedNode<InstanceIdentifier.NodeIdentifier, Iterable<MapEntryNode>> implements Immutable,MapNode {
 
-        private final Map<InstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> mappedChildren;
+        private final Map<InstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> children;
 
         ImmutableMapNode(final InstanceIdentifier.NodeIdentifier nodeIdentifier,
                          final Map<InstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> children) {
             super(nodeIdentifier, Iterables.unmodifiableIterable(children.values()));
-            this.mappedChildren = children;
+            this.children = children;
         }
 
         @Override
         public Optional<MapEntryNode> getChild(final InstanceIdentifier.NodeIdentifierWithPredicates child) {
-            return Optional.fromNullable(mappedChildren.get(child));
+            return Optional.fromNullable(children.get(child));
         }
 
         @Override
         protected int valueHashCode() {
-            return mappedChildren.hashCode();
+            return children.hashCode();
         }
 
         @Override
         protected boolean valueEquals(final AbstractImmutableNormalizedNode<?, ?> other) {
-            return mappedChildren.equals(((ImmutableMapNode) other).mappedChildren);
+            return children.equals(((ImmutableMapNode) other).children);
         }
     }
 }