/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.Fpre
+ * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
* 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 com.google.common.base.Preconditions;
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
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;
/**
* The QName from XML consists of local name of element and XML namespace, but
*
*/
public final class QName implements Immutable, Serializable, Comparable<QName> {
- private static final ObjectCache CACHE = ObjectCacheFactory.getObjectCache(QName.class);
+ private static final Interner<QName> INTERNER = Interners.newWeakInterner();
private static final long serialVersionUID = 5398411242927766414L;
static final String QNAME_REVISION_DELIMITER = "?revision=";
/**
* Look up specified QName in the global cache and return a shared reference.
*
- * @param module QName instance
- * @return Cached instance, according to {@link ObjectCache} policy.
+ * @param qname QName instance
+ * @return Cached instance, according to {@link org.opendaylight.yangtools.objcache.ObjectCache} policy.
+ *
+ * @deprecated Use {@link #intern()} instead.
*/
+ @Deprecated
public static QName cachedReference(final QName qname) {
- // We also want to make sure we keep the QNameModule cached
- final QNameModule myMod = qname.getModule();
- final QNameModule cacheMod = QNameModule.cachedReference(myMod);
-
- final QName what;
- if (cacheMod == myMod) {
- what = qname;
- } else {
- what = QName.create(cacheMod, qname.localName);
- }
-
- return CACHE.getReference(what);
+ return qname.intern();
}
/**
throw new IllegalArgumentException("Parameter 'localName' must be a non-empty string.");
}
- for (char c : ILLEGAL_CHARACTERS) {
+ for (final char c : ILLEGAL_CHARACTERS) {
if (localName.indexOf(c) != -1) {
throw new IllegalArgumentException(String.format(
"Parameter 'localName':'%s' contains illegal character '%s'", localName, c));
public static QName create(final String input) {
Matcher matcher = QNAME_PATTERN_FULL.matcher(input);
if (matcher.matches()) {
- String namespace = matcher.group(1);
- String revision = matcher.group(2);
- String localName = matcher.group(3);
+ final String namespace = matcher.group(1);
+ final String revision = matcher.group(2);
+ final String localName = matcher.group(3);
return create(namespace, revision, localName);
}
matcher = QNAME_PATTERN_NO_REVISION.matcher(input);
if (matcher.matches()) {
- URI namespace = URI.create(matcher.group(1));
- String localName = matcher.group(2);
+ final URI namespace = URI.create(matcher.group(1));
+ final String localName = matcher.group(2);
return new QName(namespace, localName);
}
matcher = QNAME_PATTERN_NO_NAMESPACE_NO_REVISION.matcher(input);
if (matcher.matches()) {
- String localName = matcher.group(1);
+ final String localName = matcher.group(1);
return new QName((URI) null, localName);
}
throw new IllegalArgumentException("Invalid input:" + input);
return module.getRevision();
}
+ /**
+ * Return an interned reference to a equivalent QName.
+ *
+ * @return Interned reference, or this object if it was interned.
+ */
+ public QName intern() {
+ // We also want to make sure we keep the QNameModule cached
+ final QNameModule cacheMod = module.intern();
+
+ // Identity comparison is here on purpose, as we are deciding whether to potentially store 'qname' into the
+ // interner. It is important that it does not hold user-supplied reference (such a String instance from
+ // parsing of an XML document).
+ final QName template = cacheMod == module ? this : QName.create(cacheMod, localName);
+
+ return INTERNER.intern(template);
+ }
+
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((localName == null) ? 0 : localName.hashCode());
+ result = prime * result + Objects.hashCode(localName);
result = prime * result + module.hashCode();
return result;
}
* {@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
*
*/
return false;
}
final QName other = (QName) obj;
- if (localName == null) {
- if (other.localName != null) {
- return false;
- }
- } else if (!localName.equals(other.localName)) {
- return false;
- }
- return module.equals(other.module);
+ return Objects.equals(localName, other.localName) && module.equals(other.module);
}
public static QName create(final QName base, final String localName) {
* @return Instance of QName
*/
public static QName create(final QNameModule qnameModule, final String localName) {
- if (qnameModule == null) {
- throw new NullPointerException("module may not be null");
- }
- return new QName(qnameModule, localName);
+ return new QName(Preconditions.checkNotNull(qnameModule,"module may not be null"), 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
* <code>YYYY-mm-dd</code>.
*/
- public static QName create(final String namespace, final String revision, final String localName)
- throws IllegalArgumentException {
- final URI namespaceUri;
+ public static QName create(final String namespace, final String revision, final String localName) {
+ 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);
- } catch (URISyntaxException ue) {
+ return new URI(namespace);
+ } catch (final 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) {
+ return create(parseNamespace(namespace), null, localName);
}
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
if (getNamespace() != null) {
- sb.append(QNAME_LEFT_PARENTHESIS + getNamespace());
+ sb.append(QNAME_LEFT_PARENTHESIS).append(getNamespace());
if (getFormattedRevision() != null) {
- sb.append(QNAME_REVISION_DELIMITER + getFormattedRevision());
+ sb.append(QNAME_REVISION_DELIMITER).append(getFormattedRevision());
}
sb.append(QNAME_RIGHT_PARENTHESIS);
}
Code Review / yangtools.git / blobdiff