Update yang-xpath-api design

[yangtools.git] / yang / yang-xpath-api / src / main / java / org / opendaylight / yangtools / yang / xpath / api / YangXPathParserFactory.java

diff --git a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathParserFactory.java b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathParserFactory.java
index 77a02ff01b2818a46d4dfb8d4ae2ce221fed837f..49e29ad438d5cbc905000ad3c3818e3080f385f7 100644 (file)
--- a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathParserFactory.java
+++ b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathParserFactory.java
@@ -8,10 +8,8 @@
 package org.opendaylight.yangtools.yang.xpath.api;
 
 import com.google.common.annotations.Beta;
-import java.util.Set;
-import java.util.function.Function;
 import javax.annotation.concurrent.ThreadSafe;
-import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.YangNamespaceContext;
 
 /**
  * Factory for creating {@link YangXPathParser}s.
@@ -22,57 +20,23 @@ import org.opendaylight.yangtools.yang.common.QNameModule;
 @ThreadSafe
 public interface YangXPathParserFactory {
     /**
-     * {@link YangXPathParser} number compliance knobs. This enumeration defines what assumptions the parser can make --
-     * affecting its optimization properties around
-     * <a href="https://en.wikipedia.org/wiki/Constant_folding">constant folding</a> when number expressions are
-     * involved.
-     */
-    @Beta
-    enum MathMode {
-        /**
-         * All number expressions are treated as {@code double}. This in spirit of XPath 1.0 -- any number expression
-         * starts its life as a double, making all operations subject to IEEE754 rounding and range rules.
-         */
-        IEEE754,
-
-        /**
-         * All number expressions are treated as infinite-precision numbers. This follows the spirit of YANG 1.1 --
-         * where mostly have integral types and decimal64 mapped to BigDecimal. Non-decimal numbers are mapped either to
-         * {@code int}, {@code long} or {@code BigInteger}.
-         */
-        EXACT,
-
-        /*
-         * FIXME: 3.0.0: specify and implement this:
-         *
-         * All number expressions are treated either as {@code org.opendaylight.yangtools.yang.common} types with
-         * precision required to hold them. Decimal types are mapped to {@link Decimal64} with all range restrictions
-         * and rounding error implied by it.
-         */
-        // ODL_COMMON,
-    }
-
-    Set<MathMode> getSupportedMathModes();
-
-    /**
-     * Return a {@link YangXPathParser} compliant with {@link MathMode#IEEE754}.
+     * Return a {@link YangXPathParser} compliant with {@link YangXPathMathMode#IEEE754}.
      *
-     * @param prefixResolver Prefix-to-namespace resolver function
+     * @param namespaceContext Prefix-to-namespace resolver
      * @return An XPathParser
-     * @throws IllegalArgumentException if {@code IEEE754} is not supported.
+     * @throws NullPointerException if {@code namespaceContext} is null
      */
-    default YangXPathParser newParser(final Function<String, QNameModule> prefixResolver) {
-        return newParser(prefixResolver, MathMode.IEEE754);
+    default YangXPathParser newParser(final YangNamespaceContext namespaceContext) {
+        return newParser(namespaceContext, YangXPathMathMode.IEEE754);
     }
 
     /**
-     * Return a {@link YangXPathParser} compliant with {@link MathMode}.
+     * Return a {@link YangXPathParser} compliant with {@link YangXPathMathMode}.
      *
-     * @param prefixResolver Prefix-to-namespace resolver function
+     * @param namespaceContext Prefix-to-namespace resolver
      * @param mathMode Requested XPath number compliance
      * @return An XPathParser
-     * @throws NullPointerException if {@code mathMode} is null
-     * @throws IllegalArgumentException if {@code mathMode} is not supported.
+     * @throws NullPointerException if any argument is null
      */
-    YangXPathParser newParser(Function<String, QNameModule> prefixResolver, MathMode mathMode);
+    YangXPathParser newParser(YangNamespaceContext namespaceContext, YangXPathMathMode mathMode);
 }