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/PcInitiatedLspRequestVer1.java

diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
index 06e01ae..d61f731 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
 
 /**
  * Provides PcInitiatedLspRequest for PCEP Initiate message.
@@ -280,18 +279,13 @@
 
     @Override
     public String toString() {
-        ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass());
-        toStrHelper.add("SrpObject", srpObject).add("LspObject", lspObject);
-
-        if (endPointsObject != null) {
-            toStrHelper.add("EndPointObject", endPointsObject);
-        }
-        if (eroObject != null) {
-            toStrHelper.add("EroObject", eroObject);
-        }
-        if (pcepAttribute != null) {
-            toStrHelper.add("PcepAttribute", pcepAttribute);
-        }
-        return toStrHelper.toString();
+        return MoreObjects.toStringHelper(getClass())
+                .omitNullValues()
+                .add("SrpObject", srpObject)
+                .add("LspObject", lspObject)
+                .add("EndPointObject", endPointsObject)
+                .add("EroObject", eroObject)
+                .add("PcepAttribute", pcepAttribute)
+                .toString();
     }
 }