*/
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.Collections;
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;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-
/**
* Utility methods and constants to work with built-in YANG types
*
}
public static final URI BASE_TYPES_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1");
+ 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");
* @return built-in base yang type QName.
*/
public static QName constructQName(final String typeName) {
- return new QName(BASE_TYPES_NAMESPACE, typeName);
+ return QName.create(BASE_TYPES_MODULE, typeName);
}
/**
*/
@Deprecated
public static SchemaPath schemaPath(final QName typeName) {
- return SchemaPath.create(Collections.singletonList(typeName), true);
+ return SchemaPath.create(true, typeName);
}
/**
* 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
}
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);
}
} else if ("empty".equals(typeName)) {
return EmptyType.getInstance();
} else if ("instance-identifier".equals(typeName)) {
- return InstanceIdentifier.getInstance();
+ return InstanceIdentifierType.getInstance();
}
return null;
}