Yuta HIGUCHI
Committed by Ray Milkey

Simplify ConnectPoint#toString format

for ease of reading logs.

Change-Id: I981cf877eb53f64e77fdef48bca30625942bc8f2
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
15 */ 15 */
16 package org.onosproject.net; 16 package org.onosproject.net;
17 17
18 -import com.google.common.base.MoreObjects;
19 -
20 import java.util.Objects; 18 import java.util.Objects;
21 19
22 import static com.google.common.base.Preconditions.checkArgument; 20 import static com.google.common.base.Preconditions.checkArgument;
...@@ -166,10 +164,7 @@ public class ConnectPoint { ...@@ -166,10 +164,7 @@ public class ConnectPoint {
166 164
167 @Override 165 @Override
168 public String toString() { 166 public String toString() {
169 - return MoreObjects.toStringHelper(this) 167 + return elementId + "/" + portNumber;
170 - .add("elementId", elementId)
171 - .add("portNumber", portNumber)
172 - .toString();
173 } 168 }
174 169
175 } 170 }
......
...@@ -123,7 +123,7 @@ public class LinkKeyTest { ...@@ -123,7 +123,7 @@ public class LinkKeyTest {
123 LinkKey k1 = LinkKey.linkKey(SRC1, DST1); 123 LinkKey k1 = LinkKey.linkKey(SRC1, DST1);
124 String k1String = k1.toString(); 124 String k1String = k1.toString();
125 assertThat(k1String, allOf(containsString("LinkKey{"), 125 assertThat(k1String, allOf(containsString("LinkKey{"),
126 - containsString("src=ConnectPoint{elementId=1, portNumber=1}"), 126 + containsString("src=1/1"),
127 - containsString("dst=ConnectPoint{elementId=2, portNumber=1}"))); 127 + containsString("dst=2/1}")));
128 } 128 }
129 } 129 }
......