/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.Fpre
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
package org.opendaylight.yangtools.yang.common;
import static org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil.getRevisionFormat;
-
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.objcache.ObjectCache;
import org.opendaylight.yangtools.objcache.ObjectCacheFactory;
private final QNameModule module;
// Mandatory
private final String localName;
- // Nullable
- private final String prefix;
- private QName(final QNameModule module, final String prefix, final String localName) {
+ private QName(final QNameModule module, final String localName) {
this.localName = checkLocalName(localName);
- this.prefix = prefix;
this.module = module;
}
/**
* Look up specified QName in the global cache and return a shared reference.
*
- * @param module QName instance
+ * @param qname QName instance
* @return Cached instance, according to {@link ObjectCache} policy.
*/
public static QName cachedReference(final QName qname) {
return CACHE.getReference(what);
}
- /**
- * QName Constructor.
- *
- * @param namespace
- * the namespace assigned to the YANG module
- * @param revision
- * the revision of the YANG module
- * @param prefix
- * locally defined prefix assigned to local name
- * @param localName
- * YANG schema identifier
- *
- * @deprecated Prefix storage in QNames is deprecated.
- */
- @Deprecated
- public QName(final URI namespace, final Date revision, final String prefix, final String localName) {
- this(QNameModule.create(namespace, revision), prefix, localName);
- }
-
/**
* QName Constructor.
*
* YANG schema identifier
*/
public QName(final URI namespace, final String localName) {
- this(namespace, null, "", localName);
+ this(QNameModule.create(namespace, null), localName);
}
private static String checkLocalName(final String localName) {
return module.getRevision();
}
- /**
- * Returns locally defined prefix assigned to local name
- *
- * @return locally defined prefix assigned to local name
- *
- * @deprecated Prefix storage in QNames is deprecated.
- */
- @Deprecated
- public String getPrefix() {
- return prefix;
- }
-
@Override
public int hashCode() {
final int prime = 31;
* {@link QName} and its {@link #getLocalName()}, {@link #getNamespace()} and
* {@link #getRevision()} are equals to same properties of this instance.
*
- * @param o the object to be compared for equality with this QName
+ * @param obj the object to be compared for equality with this QName
* @return <tt>true</tt> if the specified object is equal to this QName
*
*/
}
public static QName create(final QName base, final String localName) {
- return create(base.getModule(), base.getPrefix(), localName);
+ return create(base.getModule(), localName);
}
/**
*
* @param qnameModule
* Namespace and revision enclosed as a QNameModule
- * @param prefix
- * Namespace prefix
* @param localName
* Local name part of QName. MUST NOT BE null.
* @return Instance of QName
- *
- * @deprecated Prefix storage in QNames is deprecated.
*/
- @Deprecated
- public static QName create(final QNameModule module, final String prefix, final String localName) {
- if (module == null) {
+ public static QName create(final QNameModule qnameModule, final String localName) {
+ if (qnameModule == null) {
throw new NullPointerException("module may not be null");
}
- return new QName(module, prefix, localName);
- }
-
- /**
- * Creates new QName.
- *
- * @param qnameModule
- * Namespace and revision enclosed as a QNameModule
- * @param localName
- * Local name part of QName. MUST NOT BE null.
- * @return Instance of QName
- */
- public static QName create(final QNameModule qnameModule, final String localName) {
- return create(qnameModule, null, localName);
+ return new QName(qnameModule, localName);
}
/**
* @return Instance of QName
*/
public static QName create(final URI namespace, final Date revision, final String localName) {
- return create(QNameModule.create(namespace, revision), null, localName);
+ return create(QNameModule.create(namespace, revision), localName);
}
/**
* Local name part of QName. MUST NOT BE null.
* @return
* @throws NullPointerException
- * If any of paramaters is null.
+ * If any of parameters is null.
* @throws IllegalArgumentException
* If <code>namespace</code> is not valid URI or
* <code>revision</code> is not according to format
*/
public static QName create(final String namespace, final String revision, final String localName)
throws IllegalArgumentException {
- final URI namespaceUri;
+ final URI namespaceUri = parseNamespace(namespace);
+ final Date revisionDate = parseRevision(revision);
+ return create(namespaceUri, revisionDate, localName);
+ }
+
+ private static URI parseNamespace(final String namespace) {
try {
- namespaceUri = new URI(namespace);
+ return new URI(namespace);
} catch (URISyntaxException ue) {
throw new IllegalArgumentException(String.format("Namespace '%s' is not a valid URI", namespace), ue);
}
+ }
- Date revisionDate = parseRevision(revision);
- return create(namespaceUri, revisionDate, localName);
+ /**
+ * Creates new QName.
+ *
+ * @param namespace
+ * Namespace of QName, MUST NOT BE Null.
+ * @param localName
+ * Local name part of QName. MUST NOT BE null.
+ * @return
+ * @throws NullPointerException
+ * If any of parameters is null.
+ * @throws IllegalArgumentException
+ * If <code>namespace</code> is not valid URI.
+ */
+ public static QName create(final String namespace, final String localName) throws IllegalArgumentException {
+ return create(parseNamespace(namespace), null, localName);
}
@Override
Code Review / yangtools.git / blobdiff