Optimize QNameWithPredicateImpl

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / leafref / QNameWithPredicateBuilder.java

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();