commit bef16cde61b422073304bc6e32c841989115dd0f
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Aug 10 14:55:48 2016 -0700
committer Ray Milkey <ray@onlab.us> Thu Aug 11 03:20:31 2016 +0000
tree 141859d5cd74273fd8a2d114cb10a80e27d48a9c
parent bddbb25618c9811d050abcf9ed4eef0c1230816a

Simplify ConnectPoint#toString format

for ease of reading logs.

Change-Id: I981cf877eb53f64e77fdef48bca30625942bc8f2

core/api/src/main/java/org/onosproject/net/ConnectPoint.java

diff --git a/core/api/src/main/java/org/onosproject/net/ConnectPoint.java b/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
index 72fe6b6..13471ec 100644
--- a/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
+++ b/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
@@ -15,8 +15,6 @@
  */
 package org.onosproject.net;
 
-import com.google.common.base.MoreObjects;
-
 import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -166,10 +164,7 @@
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("elementId", elementId)
-                .add("portNumber", portNumber)
-                .toString();
+        return elementId + "/" + portNumber;
     }
 
 }

core/api/src/test/java/org/onosproject/net/LinkKeyTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java b/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
index 34a486e..0b036be 100644
--- a/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
+++ b/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
@@ -123,7 +123,7 @@
         LinkKey k1 = LinkKey.linkKey(SRC1, DST1);
         String k1String = k1.toString();
         assertThat(k1String, allOf(containsString("LinkKey{"),
-                                   containsString("src=ConnectPoint{elementId=1, portNumber=1}"),
-                                   containsString("dst=ConnectPoint{elementId=2, portNumber=1}")));
+                                   containsString("src=1/1"),
+                                   containsString("dst=2/1}")));
     }
 }