Rework NormalizedNode type hierarchy

[yangtools.git] / attic / yang-data-jaxen / src / main / java / org / opendaylight / yangtools / yang / data / jaxen / LeafrefXPathStringParsingPathArgumentBuilder.java

diff --git a/attic/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java b/attic/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
index 185a626dac15517466e6a4a76011253929a037ef..841937e7bb95687c69b2e986da98c6e2852876c7 100644 (file)
--- a/attic/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
+++ b/attic/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
@@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.checkerframework.checker.regex.qual.Regex;
@@ -145,7 +144,7 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder<List
 
         boolean inNodeIdentifierPart = false;
         NormalizedNodeContext nodeCtx = this.currentNodeCtx;
-        NormalizedNode<?, ?> node = null;
+        NormalizedNode node = null;
         for (String pathComponent : pathComponents) {
             final Matcher matcher = NODE_IDENTIFIER_PATTERN.matcher(pathComponent);
             if (UP_ONE_LEVEL.equals(pathComponent)) {
@@ -156,9 +155,7 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder<List
             } else if (matcher.matches()) {
                 inNodeIdentifierPart = true;
                 if (node != null && node instanceof DataContainerNode) {
-                    final DataContainerNode dcn = (DataContainerNode) node;
-                    final Optional<NormalizedNode<?, ?>> possibleChild = dcn.getChild(new NodeIdentifier(nextQName()));
-                    node = possibleChild.isPresent() ? possibleChild.get() : null;
+                    node = ((DataContainerNode<?>) node).childByArg(new NodeIdentifier(nextQName()));
                 }
             } else {
                 throw new IllegalArgumentException(String.format(
@@ -168,7 +165,7 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder<List
         }
 
         if (node != null && node instanceof LeafNode) {
-            return node.getValue();
+            return node.body();
         }
 
         throw new IllegalArgumentException("Could not resolve current function path value.");