Use Link.toString() in serialization

albers · albers · commit 4039ddbaa85e · 2014-10-14T19:55:14.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -90,4 +90,16 @@ public int hashCode()
 		return new HashCodeBuilder().append(name).append(alias).toHashCode();
 	}
 
+	/**
+	 * Returns a string representation of this {@link Link} suitable
+	 * for inclusion in a JSON message.
+	 * The format is <code>name:alias</code>, like the argument in {@link #parse(String)}.
+	 * 
+	 * @return a string representation of this {@link Link}
+	 */
+	@Override
+	public String toString() {
+		return name + ":" + alias;
+	}
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -45,8 +45,7 @@ public void serialize(final Links links, final JsonGenerator jsonGen, final Seri
 		{
 			jsonGen.writeStartArray();
 			for (final Link link : links.getLinks()) {
-				final String s = link.getName() + ":" + link.getAlias();
-				jsonGen.writeString(s);
+				jsonGen.writeString(link.toString());
 			}
 			jsonGen.writeEndArray();
 		}
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -25,4 +25,9 @@ public void parseNull() {
 		Link.parse(null);
 	}
 
+	@Test
+	public void stringify() {
+		assertEquals(Link.parse("name:alias").toString(), "name:alias");
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ public void serialize(final Links links, final JsonGenerator jsonGen, final Seri`
`45`	`45`	`{`
`46`	`46`	`jsonGen.writeStartArray();`
`47`	`47`	`for (final Link link : links.getLinks()) {`
`48`		`- final String s = link.getName() + ":" + link.getAlias();`
`49`		`- jsonGen.writeString(s);`
	`48`	`+ jsonGen.writeString(link.toString());`
`50`	`49`	`}`
`51`	`50`	`jsonGen.writeEndArray();`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,9 @@ public void parseNull() {`
`25`	`25`	`Link.parse(null);`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ @Test`
	`29`	`+ public void stringify() {`
	`30`	`+ assertEquals(Link.parse("name:alias").toString(), "name:alias");`
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`}`