Optimize QNameWithPredicateImpl

Create a dedicated QName-only implementation, saving some space.

Change-Id: I0218763aaf4e809f50b580677fc0b634b7c918fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/AbstractQNameWithPredicate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/AbstractQNameWithPredicate.java
new file mode 100644 (file)
index 0000000..3c76548
--- /dev/null
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/AbstractQNameWithPredicate.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018 Pantheon Technologies, s.r.o. 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.data.impl.leafref;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.Revision;
+
+abstract class AbstractQNameWithPredicate implements Immutable, Serializable, QNameWithPredicate {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public final boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof QNameWithPredicate)) {
+            return false;
+        }
+        final QNameWithPredicate other = (QNameWithPredicate) obj;
+        // FIXME: check also predicates ...
+        return Objects.equals(getLocalName(), other.getLocalName())
+                && Objects.equals(getModuleQname(), other.getModuleQname());
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(getModuleQname(), getLocalName());
+    }
+
+    @Override
+    public final String toString() {
+        final StringBuilder sb = new StringBuilder();
+
+        final QNameModule moduleQname = getModuleQname();
+        if (moduleQname != null) {
+            sb.append('(').append(moduleQname.getNamespace());
+            final Optional<Revision> rev = moduleQname.getRevision();
+            if (rev.isPresent()) {
+                sb.append("?revision=").append(rev.get());
+            }
+            sb.append(')');
+        }
+
+        sb.append(getLocalName());
+        getQNamePredicates().forEach(sb::append);
+        return sb.toString();
+    }
+}

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java
index 1248d253ecd01d12a97f5f50472088132135fde7..6d0d22e3de37e6bb4ff84a5c946cec2f44e7d27c 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java
@@ -67,7 +67,7 @@ public final class LeafRefUtils {
 
             if (child instanceof DataNodeContainer) {
                 if (!(child instanceof CaseSchemaNode)) {
-                    xpath.add(new QNameWithPredicateBuilder(qname).build());
+                    xpath.add(new SimpleQNameWithPredicate(qname));
                 }
                 currenDataNodeContainer = (DataNodeContainer) child;
             } else if (child instanceof ChoiceSchemaNode) {
@@ -77,7 +77,7 @@ public final class LeafRefUtils {
                     break;
                 }
             } else if (child instanceof LeafSchemaNode || child instanceof LeafListSchemaNode) {
-                xpath.add(new QNameWithPredicateBuilder(qname).build());
+                xpath.add(new SimpleQNameWithPredicate(qname));
                 break;
             } else if (child == null) {
                 throw new IllegalArgumentException("No child " + qname + " found in node container "

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java
index 638dcff52f308e8781fde875f9548bec40dd20f4..4b448847674d52314a3a0496fe691ea7b67aaff4 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java
@@ -27,10 +27,6 @@ class QNameWithPredicateBuilder implements Builder<QNameWithPredicate> {
         }
     };
 
-    QNameWithPredicateBuilder(final QName qname) {
-        this(qname.getModule(), qname.getLocalName());
-    }
-
     QNameWithPredicateBuilder(final QNameModule moduleQname, final String localName) {
         this.moduleQname = moduleQname;
         this.localName = localName;
@@ -38,8 +34,12 @@ class QNameWithPredicateBuilder implements Builder<QNameWithPredicate> {
 
     @Override
     public QNameWithPredicate build() {
-        final QNameWithPredicateImpl qNameWithPredicateImpl = new QNameWithPredicateImpl(
-                moduleQname, localName, qnamePredicates);
+        if (qnamePredicates.isEmpty() && moduleQname != null && localName != null) {
+            return new SimpleQNameWithPredicate(QName.create(moduleQname, localName));
+        }
+
+        final QNameWithPredicateImpl qNameWithPredicateImpl = new QNameWithPredicateImpl(moduleQname, localName,
+            qnamePredicates);
 
         // QNameWithPredicateImpl has taken a copy
         qnamePredicates.clear();

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java
index d0fb0193d1400a6ec92e29e8e3fb202ca4c93a8c..4d364f326576177866871d35fa2e061833e38a7e 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java
@@ -8,16 +8,11 @@
 package org.opendaylight.yangtools.yang.data.impl.leafref;
 
 import com.google.common.collect.ImmutableList;
-import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
 
-final class QNameWithPredicateImpl implements Immutable, Serializable, QNameWithPredicate {
+final class QNameWithPredicateImpl extends AbstractQNameWithPredicate {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,46 +46,4 @@ final class QNameWithPredicateImpl implements Immutable, Serializable, QNameWith
     public QName getQName() {
         return QName.create(moduleQname, localName);
     }
-
-    // FIXME: check also predicates ...
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof QNameWithPredicateImpl)) {
-            return false;
-        }
-        final QNameWithPredicateImpl other = (QNameWithPredicateImpl) obj;
-        return Objects.equals(localName, other.localName) && moduleQname.equals(other.moduleQname);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = moduleQname != null ? moduleQname.hashCode() : 0;
-        result = 31 * result + (localName != null ? localName.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-
-        if (moduleQname != null) {
-            sb.append('(').append(moduleQname.getNamespace());
-            final Optional<Revision> rev = moduleQname.getRevision();
-            if (rev.isPresent()) {
-                sb.append("?revision=").append(rev.get());
-            }
-            sb.append(')');
-        }
-
-        sb.append(localName);
-
-        for (final QNamePredicate predicate : qnamePredicates) {
-            sb.append(predicate);
-        }
-
-        return sb.toString();
-    }
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/SimpleQNameWithPredicate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/SimpleQNameWithPredicate.java
new file mode 100644 (file)
index 0000000..1e414df
--- /dev/null
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/SimpleQNameWithPredicate.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 Pantheon Technologies, s.r.o. 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.data.impl.leafref;
+
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+
+public class SimpleQNameWithPredicate extends AbstractQNameWithPredicate {
+    private static final long serialVersionUID = 1L;
+
+    private final QName qname;
+
+    SimpleQNameWithPredicate(final QName qname) {
+        this.qname = requireNonNull(qname);
+    }
+
+    @Override
+    public List<QNamePredicate> getQNamePredicates() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public QNameModule getModuleQname() {
+        return qname.getModule();
+    }
+
+    @Override
+    public String getLocalName() {
+        return qname.getLocalName();
+    }
+
+    @Override
+    public QName getQName() {
+        return qname;
+    }
+}