Omit empty attributes in toString()

Do not emit attributes when they are empty, which brings
the verbosity down quite a bit -- as this is typically the case.

Change-Id: Icb2fa7abb02e9714fed640ec07af1623056a73db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 032751054483c095a91eb3bf820b133a6b256dc5)

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java
index fc1739aa9cddf6eaba8e5ee0698eaf5cb86973c5..d73016479e87af11f02f4d562e2fe28d8866af9b 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java
@@ -40,7 +40,11 @@ public abstract class AbstractImmutableDataContainerAttrNode<K extends PathArgum
 
     @Override
     protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
-        return super.addToStringAttributes(toStringHelper).add("attributes", attributes);
+        super.addToStringAttributes(toStringHelper);
+        if (!attributes.isEmpty()) {
+            toStringHelper.add("attributes", attributes);
+        }
+        return toStringHelper;
     }
 
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
index d7d322af41db49bb8db3021bad0aa3c5946a77fd..9c71c491d67a934bc4f677f1f070e6f6692b3951 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
@@ -39,7 +39,11 @@ public abstract class AbstractImmutableNormalizedValueAttrNode<K extends PathArg
 
     @Override
     protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
-        return super.addToStringAttributes(toStringHelper).add("attributes", attributes);
+        super.addToStringAttributes(toStringHelper);
+        if (!attributes.isEmpty()) {
+            toStringHelper.add("attributes", attributes);
+        }
+        return toStringHelper;
     }
 
     @Override