Introduce {Qualified,Unqualified}.of()

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

diff --git a/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/Utils.java b/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/Utils.java
index a0f04393859e4784c3a9c4ed57dd9f3541e834a5..b965d9b005dcf157395ea767bb9ce075761820d9 100644 (file)
--- a/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/Utils.java
+++ b/xpath/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/Utils.java
@@ -12,6 +12,8 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Qualified;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.YangNamespaceContext;
 import org.opendaylight.yangtools.yang.xpath.api.YangLiteralExpr;
 import org.opendaylight.yangtools.yang.xpath.api.YangQNameExpr;
@@ -23,7 +25,7 @@ import org.opendaylight.yangtools.yang.xpath.api.YangQNameExpr.Unresolved;
  */
 final class Utils {
     private Utils() {
-
+        // Hidden on purpose
     }
 
     static Unresolved interpretAsQName(final YangLiteralExpr expr) throws XPathExpressionException {
@@ -32,8 +34,8 @@ final class Utils {
 
         final UnresolvedQName qname;
         try {
-            qname = colon != -1 ? UnresolvedQName.qualified(text.substring(0, colon), text.substring(colon + 1))
-                    : UnresolvedQName.unqualified(text);
+            qname = colon != -1 ? Qualified.of(text.substring(0, colon), text.substring(colon + 1))
+                    : Unqualified.of(text);
         } catch (IllegalArgumentException e) {
             throw wrapException(e, "Cannot interpret %s as a QName", expr);
         }
@@ -47,7 +49,7 @@ final class Utils {
         final int colon = text.indexOf(':');
         try {
             if (colon == -1) {
-                return YangQNameExpr.of(UnresolvedQName.unqualified(text).intern());
+                return YangQNameExpr.of(Unqualified.of(text).intern());
             }
 
             return YangQNameExpr.of(namespaceContext.createQName(text.substring(0, colon), text.substring(colon + 1)));