Update yang-xpath-api design

[yangtools.git] / yang / yang-xpath-impl / src / main / java / org / opendaylight / yangtools / yang / xpath / impl / AntlrYangXPathExpression.java

diff --git a/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrYangXPathExpression.java b/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrYangXPathExpression.java
index fa663d2ded39d3548a9e96e2c591e80d3536760f..5d14aeaf7d83eab8c466b2f9b79687ee3c37a91b 100644 (file)
--- a/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrYangXPathExpression.java
+++ b/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrYangXPathExpression.java
@@ -10,49 +10,46 @@ package org.opendaylight.yangtools.yang.xpath.impl;
 import static java.util.Objects.requireNonNull;
 
 import javax.xml.xpath.XPathExpressionException;
-import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.YangNamespaceContext;
 import org.opendaylight.yangtools.yang.xpath.api.YangExpr;
 import org.opendaylight.yangtools.yang.xpath.api.YangLiteralExpr;
 import org.opendaylight.yangtools.yang.xpath.api.YangLocationPath;
+import org.opendaylight.yangtools.yang.xpath.api.YangQNameExpr;
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression;
+import org.opendaylight.yangtools.yang.xpath.api.YangXPathMathMode;
 
 final class AntlrYangXPathExpression implements YangXPathExpression {
-    private final QNameSupport qnameSupport;
+    private final YangNamespaceContext namespaceContext;
+    private final YangXPathMathMode mathMode;
     private final YangExpr rootExpr;
     private final String origStr;
 
-    AntlrYangXPathExpression(final QNameSupport qnameSupport, final YangExpr rootExpr, final String origStr) {
-        this.qnameSupport = requireNonNull(qnameSupport);
+    AntlrYangXPathExpression(final YangNamespaceContext namespaceContext, final YangXPathMathMode mathMode,
+            final YangExpr rootExpr, final String origStr) {
+        this.namespaceContext = requireNonNull(namespaceContext);
+        this.mathMode = requireNonNull(mathMode);
         this.rootExpr = requireNonNull(rootExpr);
         this.origStr = requireNonNull(origStr);
     }
 
+    @Override
+    public YangXPathMathMode getMathMode() {
+        return mathMode;
+    }
+
     @Override
     public YangExpr getRootExpr() {
         return rootExpr;
     }
 
     @Override
-    public QName interpretAsQName(final YangLiteralExpr expr) throws XPathExpressionException {
-        // We are eagerly interpreting PrefixedName-compliant strings, hence they have a specific subclass
-        if (expr instanceof QNameLiteralExpr) {
-            return ((QNameLiteralExpr) expr).getQName();
-        }
-
-        try {
-            // Deal with UnprefixedNames by interpreting them in implicit namespace
-            return qnameSupport.createQName(expr.getLiteral());
-        } catch (IllegalArgumentException e) {
-            throw new XPathExpressionException(e);
-        }
+    public YangQNameExpr interpretAsQName(final YangLiteralExpr expr) throws XPathExpressionException {
+        return LiteralExprUtils.interpretAsQName(namespaceContext, expr);
     }
 
     @Override
     public YangLocationPath interpretAsInstanceIdentifier(final YangLiteralExpr expr) throws XPathExpressionException {
-        if (expr instanceof InstanceIdentifierLiteralExpr) {
-            return YangLocationPath.of(true, ((InstanceIdentifierLiteralExpr)expr).getSteps());
-        }
-        throw new XPathExpressionException("Invalid instance-identifier " + expr);
+        return new InstanceIdentifierParser(namespaceContext, mathMode).interpretAsInstanceIdentifier(expr);
     }
 
     @Override