Use findTargetNode() in findDataSchemaNode()

This removes a bit of duplication by sharing the code path with
relative resolver.

Change-Id: Icb619aca8d87ade490066fd8c6abe0d2a96dec96
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 57a7f87c3115454aba47299d797da48a1227c9b2)

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
index b8ffe379da7b5b37211de4c13a8f7a741a43796f..306015fc25fbcac9bb53c3ee1af253d19bdb5ecd 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
@@ -156,12 +156,7 @@ public final class SchemaContextUtil {
         final String strXPath = nonCondXPath.getOriginalString();
         checkArgument(strXPath.indexOf('[') == -1, "Revision Aware XPath may not contain a condition");
         if (nonCondXPath.isAbsolute()) {
-            final List<QName> path = xpathToQNamePath(context, module, strXPath);
-
-            // We do not have enough information about resolution context, hence cannot account for actions, RPCs
-            // and notifications. We therefore attempt to make a best estimate, but this can still fail.
-            final Optional<DataSchemaNode> pureData = context.findDataTreeChild(path);
-            return pureData.isPresent() ? pureData.get() : findNodeInSchemaContext(context, path);
+            return findTargetNode(context, xpathToQNamePath(context, module, strXPath));
         }
         return null;
     }