Rename getChildFromData()

Drop the 'get' prefix because we can return a null, which does not sit
well with our 'foo/getFoo/findFoo' patterns.

JIRA: YANGTOOLS-2399
Change-Id: Iabc2a51ff5baf19a901e8b20504c8c7cbfea5d26
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/AbstractContainerNode.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/AbstractContainerNode.java
index 83f1cc3665189a478ea8d61771261a2a7f559a19..6b88fe075770ff4442c992e2f7da5eb8abb9fbda 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/AbstractContainerNode.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/AbstractContainerNode.java
@@ -28,12 +28,12 @@ abstract class AbstractContainerNode extends TreeNode {
         return (DistinctNodeContainer<PathArgument, NormalizedNode>) data();
     }
 
-    final @Nullable TreeNode getChildFromData(final PathArgument childId) {
+    final @Nullable TreeNode childFromData(final PathArgument childId) {
         // We do not cache the instantiated node as it is dirt cheap
-        return getChildFromData(castData(), childId, incarnation());
+        return childFromData(castData(), childId, incarnation());
     }
 
-    static final @Nullable TreeNode getChildFromData(final DistinctNodeContainer<PathArgument, NormalizedNode> data,
+    static final @Nullable TreeNode childFromData(final DistinctNodeContainer<PathArgument, NormalizedNode> data,
             final PathArgument childId, final Version incarnation) {
         final var child = data.childByArg(childId);
         return child != null ? TreeNode.of(child, incarnation) : null;

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyContainerNode.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyContainerNode.java
index f920deec241c4944d173ec4c947a2c4595ae45dd..fcddda3eb6cd2da630bb3fb8d914c26c335c9449 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyContainerNode.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyContainerNode.java
@@ -39,7 +39,7 @@ final class LazyContainerNode extends AbstractModifiedContainerNode {
     @Override
     public TreeNode childByArg(final PathArgument arg) {
         final TreeNode modified;
-        return (modified = getModifiedChild(arg)) == null ? getChildFromData(arg) : modified;
+        return (modified = getModifiedChild(arg)) == null ? childFromData(arg) : modified;
     }
 
     @Override

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyMutableContainerNode.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyMutableContainerNode.java
index 935a270e27645c99e225a4c89b29ae571c0ed028..fe20a0553a16cf36040831f87081b8ef07b54940 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyMutableContainerNode.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/LazyMutableContainerNode.java
@@ -28,6 +28,6 @@ final class LazyMutableContainerNode extends AbstractMutableContainerNode {
     @Override
     public TreeNode childByArg(final PathArgument arg) {
         final TreeNode modified = getModifiedChild(arg);
-        return modified != null ? modified : AbstractContainerNode.getChildFromData(getData(), arg, incarnation());
+        return modified != null ? modified : AbstractContainerNode.childFromData(getData(), arg, incarnation());
     }
 }

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/SimpleContainerNode.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/SimpleContainerNode.java
index ca34af5c9e8511d04d0d54de9746dbf426e7b1f8..f141d1f82c7c0e478e82cf75205436b79d348132 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/SimpleContainerNode.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/node/SimpleContainerNode.java
@@ -29,7 +29,7 @@ final class SimpleContainerNode extends AbstractContainerNode {
 
     @Override
     public @Nullable TreeNode childByArg(final PathArgument arg) {
-        return getChildFromData(arg);
+        return childFromData(arg);
     }
 
     @Override