Update StoreTreeNode methods

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / AbstractModifiedNodeBasedCandidateNode.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
index 25e44a74fe66935791c2d792f24811abc2633511..64dab708849a42462c534f1bf04bd8dda41252a3 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
@@ -49,7 +49,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
     }
 
     private static TreeNode childMeta(final TreeNode parent, final PathArgument id) {
-        return parent == null ? null : parent.getChild(id).orElse(null);
+        return parent == null ? null : parent.childByArg(id);
     }
 
     private static boolean canHaveChildren(final @Nullable TreeNode oldMeta, final @Nullable TreeNode newMeta) {
@@ -127,7 +127,8 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
             case APPEARED:
             case DISAPPEARED:
             case SUBTREE_MODIFIED:
-                return mod.getChild(identifier).map(this::childNode);
+                final ModifiedNode child = mod.childByArg(identifier);
+                return child == null ? Optional.empty() : Optional.of(childNode(child));
             case UNMODIFIED:
                 if (!canHaveChildren(oldMeta, newMeta)) {
                     return Optional.empty();