Skip to content

Improve parsing and serialization of Link #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 2 commits into from
Oct 14, 2014
Merged

Improve parsing and serialization of Link #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6d1c2f
Throw IllegalArgumentException on Link.parse() parsing errors, javadoc
albers Oct 14, 2014
4039ddb
Use Link.toString() in serialization
albers Oct 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use Link.toString() in serialization
  • Loading branch information
@albers
albers committed Oct 14, 2014
commit 4039ddbaa85e23fab71a461e876463e771b9aa27
12 changes: 12 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/Link.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}
3 changes: 1 addition & 2 deletions src/main/java/com/github/dockerjava/api/model/Links.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/com/github/dockerjava/api/model/LinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@ public void parseNull() {
Link.parse(null);
}

@Test
public void stringify() {
assertEquals(Link.parse("name:alias").toString(), "name:alias");
}

}