Bug 2366 - Effective statments impl merge, retest & bugfix

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / BaseTypes.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
index c4831ef3f2a56b49280ea1e29af96be1bccb6155..5f50f5e54a49d60a49feefa36c9ac94cdf315999 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
@@ -33,7 +33,7 @@ public final class BaseTypes {
     }
 
     public static final URI BASE_TYPES_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1");
-    public static final QNameModule BASE_TYPES_MODULE = QNameModule.create(BASE_TYPES_NAMESPACE, null);
+    public static final QNameModule BASE_TYPES_MODULE = QNameModule.cachedReference(QNameModule.create(BASE_TYPES_NAMESPACE, null));
 
     public static final QName BINARY_QNAME = constructQName("binary");
     public static final QName BITS_QNAME = constructQName("bits");
@@ -85,7 +85,7 @@ public final class BaseTypes {
      * @return built-in base yang type QName.
      */
     public static QName constructQName(final String typeName) {
-        return QName.create(BASE_TYPES_MODULE, "", typeName);
+        return QName.create(BASE_TYPES_MODULE, typeName);
     }
 
     /**
@@ -113,7 +113,7 @@ public final class BaseTypes {
      *            Revision Date
      * @return Schema Path
      *
-     * @deprecated Use {@link SchemaPath#create(boolean, Iterable)} with QNames
+     * @deprecated Use {@link SchemaPath#create(Iterable, boolean)} with QNames
      *             manually constructed.
      */
     @Deprecated
@@ -123,7 +123,7 @@ public final class BaseTypes {
         }
         final List<QName> pathList = new ArrayList<QName>();
         for (final String path : actualPath) {
-            final QName qname = new QName(namespace, revision, path);
+            final QName qname = QName.create(namespace, revision, path);
             if (qname != null) {
                 pathList.add(qname);
             }
@@ -191,7 +191,7 @@ public final class BaseTypes {
         } else if ("empty".equals(typeName)) {
             return EmptyType.getInstance();
         } else if ("instance-identifier".equals(typeName)) {
-            return InstanceIdentifier.getInstance();
+            return InstanceIdentifierType.getInstance();
         }
         return null;
     }