Remove formattedRevision from serialization format

[yangtools.git] / yang / yang-common / src / main / java / org / opendaylight / yangtools / yang / common / QNameModule.java

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
index a45c91b923b13c8ddb26fb5e81ad16d12d54f9cc..702a527c0c0805d5d491a4c585f20b95cedc9339 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
@@ -7,19 +7,23 @@
  */
 package org.opendaylight.yangtools.yang.common;
 
+import com.google.common.base.MoreObjects;
+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.Date;
-
+import java.util.Objects;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class QNameModule implements Immutable, Serializable {
+    private static final Interner<QNameModule> INTERNER = Interners.newWeakInterner();
     private static final Logger LOG = LoggerFactory.getLogger(QNameModule.class);
     private static final QNameModule NULL_INSTANCE = new QNameModule(null, null);
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     //Nullable
     private final URI namespace;
@@ -28,13 +32,31 @@ public final class QNameModule implements Immutable, Serializable {
     private final Date revision;
 
     //Nullable
-    private String formattedRevision;
+    private transient volatile String formattedRevision;
+
+    private transient int hash;
 
     private QNameModule(final URI namespace, final Date revision) {
         this.namespace = namespace;
         this.revision = revision;
     }
 
+    /**
+     * Return an interned reference to a equivalent QNameModule.
+     *
+     * @return Interned reference, or this object if it was interned.
+     */
+    public QNameModule intern() {
+        return INTERNER.intern(this);
+    }
+
+    /**
+     * Create a new QName module instance with specified namespace/revision.
+     *
+     * @param namespace Module namespace
+     * @param revision Module revision
+     * @return A new, potentially shared, QNameModule instance
+     */
     public static QNameModule create(final URI namespace, final Date revision) {
         if (namespace == null && revision == null) {
             return NULL_INSTANCE;
@@ -48,21 +70,18 @@ public final class QNameModule implements Immutable, Serializable {
             return null;
         }
 
-        if (formattedRevision == null) {
-            synchronized (this) {
-                if (formattedRevision == null) {
-                    formattedRevision = SimpleDateFormatUtil.getRevisionFormat().format(revision);
-                }
-            }
+        String ret = formattedRevision;
+        if (ret == null) {
+            ret = SimpleDateFormatUtil.getRevisionFormat().format(revision);
+            formattedRevision = ret;
         }
 
-        return formattedRevision;
+        return ret;
     }
 
     /**
      * Returns the namespace of the module which is specified as argument of
-     * YANG {@link Module <b><font color="#00FF00">namespace</font></b>}
-     * keyword.
+     * YANG Module <b><font color="#00FF00">namespace</font></b> keyword.
      *
      * @return URI format of the namespace of the module
      */
@@ -74,8 +93,7 @@ public final class QNameModule implements Immutable, Serializable {
      * Returns the revision date for the module.
      *
      * @return date of the module revision which is specified as argument of
-     *         YANG {@link Module <b><font color="#339900">revison</font></b>}
-     *         keyword
+     *         YANG Module <b><font color="#339900">revison</font></b> keyword
      */
     public Date getRevision() {
         return revision;
@@ -83,10 +101,10 @@ public final class QNameModule implements Immutable, Serializable {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = (namespace == null) ? 0 : namespace.hashCode();
-        result = prime * result + ((revision == null) ? 0 : revision.hashCode());
-        return result;
+        if (hash == 0) {
+            hash = Objects.hash(namespace, revision);
+        }
+        return hash;
     }
 
     @Override
@@ -98,21 +116,7 @@ public final class QNameModule implements Immutable, Serializable {
             return false;
         }
         final QNameModule other = (QNameModule) obj;
-        if (revision == null) {
-            if (other.revision != null) {
-                return false;
-            }
-        } else if (!revision.equals(other.revision)) {
-            return false;
-        }
-        if (namespace == null) {
-            if (other.namespace != null) {
-                return false;
-            }
-        } else if (!namespace.equals(other.namespace)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(revision, other.revision) && Objects.equals(namespace, other.namespace);
     }
 
     /**
@@ -127,23 +131,22 @@ public final class QNameModule implements Immutable, Serializable {
      *
      */
     URI getRevisionNamespace() {
-
         if (namespace == null) {
             return null;
         }
 
-        String query = "";
-        if (revision != null) {
-            query = "revision=" + getFormattedRevision();
-        }
-
-        URI compositeURI = null;
+        final String query = revision == null ? "" : "revision=" + getFormattedRevision();
         try {
-            compositeURI = new URI(namespace.getScheme(), namespace.getUserInfo(), namespace.getHost(),
+            return new URI(namespace.getScheme(), namespace.getUserInfo(), namespace.getHost(),
                     namespace.getPort(), namespace.getPath(), query, namespace.getFragment());
-        } catch (URISyntaxException e) {
-            LOG.error("", e);
+        } catch (final URISyntaxException e) {
+            LOG.error("Failed to construct URI for {}", this, e);
+            return null;
         }
-        return compositeURI;
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(QNameModule.class).omitNullValues().add("ns", getNamespace()).add("rev", getFormattedRevision()).toString();
     }
 }