commit 7cdbcf7dc6ec733a529339ebb1442e006645cd01
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Sep 03 14:43:05 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 01:07:11 2015 +0000
tree 56f915bba50e4db2404b3e1515242e86373bd5c2
parent a5356ec3e488715ad173766c563dc749c9f903a7

Use the same coding style in toString() implementations

Change-Id: I116eb140d92b385d36efe120c42cd2fb3efac760

pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java

diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
index cc5ec0e..5c499fc 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
 
 /**
  * Provides PcepError list which contains RP or TE objects.
@@ -390,19 +389,11 @@
 
     @Override
     public String toString() {
-        ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass());
-
-        //RP Object list is optional
-        if (llRPObjList != null) {
-            toStrHelper.add("RpObjectList", llRPObjList);
-        }
-
-        //TE Object list is optional
-        if (llTEObjList != null) {
-            toStrHelper.add("TeObjectList", llTEObjList);
-        }
-
-        //Error Object List is mandatory
-        return toStrHelper.add("ErrorObjectList", llErrObjList).toString();
+        return MoreObjects.toStringHelper(getClass())
+                .omitNullValues()
+                .add("RpObjectList", llRPObjList)
+                .add("TeObjectList", llTEObjList)
+                .add("ErrorObjectList", llErrObjList)
+                .toString();
     }
 }