X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FBaseTypes.java;h=297ba539ec6ab51996eb6cf9a088ef70da473f35;hb=refs%2Fchanges%2F65%2F26965%2F3;hp=002746fa571d8b9616e4ca78ddfd406bcfd005ef;hpb=616f6ffb09eab12c34f7c36491a87f6f549c1599;p=yangtools.git

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 002746fa57..297ba539ec 100644
--- 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
@@ -10,16 +10,10 @@ package org.opendaylight.yangtools.yang.model.util;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
-
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import java.util.Set;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
@@ -33,7 +27,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");
@@ -55,25 +49,26 @@ public final class BaseTypes {
     public static final QName UINT64_QNAME = constructQName("uint64");
     public static final QName UNION_QNAME = constructQName("union");
 
-    private static final Set<String> BUILD_IN_TYPES = ImmutableSet.<String> builder().add(BINARY_QNAME.getLocalName()) //
-            .add(BITS_QNAME.getLocalName()) //
-            .add(BOOLEAN_QNAME.getLocalName()) //
-            .add(DECIMAL64_QNAME.getLocalName()) //
-            .add(EMPTY_QNAME.getLocalName()) //
-            .add(ENUMERATION_QNAME.getLocalName()) //
-            .add(IDENTITYREF_QNAME.getLocalName()) //
-            .add(INSTANCE_IDENTIFIER_QNAME.getLocalName()) //
-            .add(INT8_QNAME.getLocalName()) //
-            .add(INT16_QNAME.getLocalName()) //
-            .add(INT32_QNAME.getLocalName()) //
-            .add(INT64_QNAME.getLocalName()) //
-            .add(LEAFREF_QNAME.getLocalName()) //
-            .add(STRING_QNAME.getLocalName()) //
-            .add(UINT8_QNAME.getLocalName()) //
-            .add(UINT16_QNAME.getLocalName()) //
-            .add(UINT32_QNAME.getLocalName()) //
-            .add(UINT64_QNAME.getLocalName()) //
-            .add(UNION_QNAME.getLocalName()) //
+    private static final Set<String> BUILD_IN_TYPES = ImmutableSet.<String> builder()
+            .add(BINARY_QNAME.getLocalName())
+            .add(BITS_QNAME.getLocalName())
+            .add(BOOLEAN_QNAME.getLocalName())
+            .add(DECIMAL64_QNAME.getLocalName())
+            .add(EMPTY_QNAME.getLocalName())
+            .add(ENUMERATION_QNAME.getLocalName())
+            .add(IDENTITYREF_QNAME.getLocalName())
+            .add(INSTANCE_IDENTIFIER_QNAME.getLocalName())
+            .add(INT8_QNAME.getLocalName())
+            .add(INT16_QNAME.getLocalName())
+            .add(INT32_QNAME.getLocalName())
+            .add(INT64_QNAME.getLocalName())
+            .add(LEAFREF_QNAME.getLocalName())
+            .add(STRING_QNAME.getLocalName())
+            .add(UINT8_QNAME.getLocalName())
+            .add(UINT16_QNAME.getLocalName())
+            .add(UINT32_QNAME.getLocalName())
+            .add(UINT64_QNAME.getLocalName())
+            .add(UNION_QNAME.getLocalName())
             .build();
 
     /**
@@ -85,50 +80,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);
-    }
-
-    /**
-     * Creates Schema Path from {@link QName}.
-     *
-     * @param typeName
-     *            yang type QName
-     * @return Schema Path from Qname.
-     * @deprecated Use {@link SchemaPath#create(boolean, QName...)} instead.
-     */
-    @Deprecated
-    public static SchemaPath schemaPath(final QName typeName) {
-        return SchemaPath.create(true, typeName);
-    }
-
-    /**
-     * Creates Schema Path from List of partial paths defined as Strings, module
-     * Namespace and module latest Revision Date.
-     *
-     * @param actualPath
-     *            List of partial paths
-     * @param namespace
-     *            Module Namespace
-     * @param revision
-     *            Revision Date
-     * @return Schema Path
-     *
-     * @deprecated Use {@link SchemaPath#create(boolean, Iterable)} with QNames
-     *             manually constructed.
-     */
-    @Deprecated
-    public static SchemaPath schemaPath(final List<String> actualPath, final URI namespace, final Date revision) {
-        if (actualPath == null) {
-            throw new IllegalArgumentException("The actual path List MUST be specified.");
-        }
-        final List<QName> pathList = new ArrayList<QName>();
-        for (final String path : actualPath) {
-            final QName qname = QName.create(namespace, revision, path);
-            if (qname != null) {
-                pathList.add(qname);
-            }
-        }
-        return SchemaPath.create(pathList, true);
+        return QName.cachedReference(QName.create(BASE_TYPES_MODULE, typeName));
     }
 
     /**
@@ -191,7 +143,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;
     }