From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 28 Feb 2020 06:20:08 +0000 (+0100)
Subject: QName namespace is always non-null
X-Git-Tag: v4.0.8~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=87d8a35442eed4284e3da9f7a18b0a0877cdcc74;p=yangtools.git

QName namespace is always non-null

Simplify QName.toString() by realizing the namespace is guaranteed
to be non-null.

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

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
index feea52586a..e46a1cdf43 100644
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
@@ -285,17 +285,12 @@ public final class QName extends AbstractQName implements Comparable<QName> {
 
     @Override
     public @NonNull String toString() {
-        final StringBuilder sb = new StringBuilder();
-        if (getNamespace() != null) {
-            sb.append(QNAME_LEFT_PARENTHESIS).append(getNamespace());
-
-            final Optional<Revision> rev = getRevision();
-            if (rev.isPresent()) {
-                sb.append(QNAME_REVISION_DELIMITER).append(rev.get());
-            }
-            sb.append(QNAME_RIGHT_PARENTHESIS);
+        final StringBuilder sb = new StringBuilder().append(QNAME_LEFT_PARENTHESIS).append(getNamespace());
+        final Optional<Revision> rev = getRevision();
+        if (rev.isPresent()) {
+            sb.append(QNAME_REVISION_DELIMITER).append(rev.get());
         }
-        return sb.append(getLocalName()).toString();
+        return sb.append(QNAME_RIGHT_PARENTHESIS).append(getLocalName()).toString();
     }
 
     /**