Fix parsing of Links and Link

vjuranek · vjuranek · commit 356d10d58819 · 2014-12-01T15:24:28.000+01: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
@@ -53,7 +53,7 @@ public String getAlias()
 	/**
 	 * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
 	 * 
-	 * @param serialized the specification, e.g. <code>name:alias</code>
+	 * @param serialized the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
 	 * @return a {@link Link} matching the specification
 	 * @throws IllegalArgumentException if the specification cannot be parsed
 	 */
@@ -63,7 +63,9 @@ public static Link parse(final String serialized) throws IllegalArgumentExceptio
 			final String[] parts = serialized.split(":");
 			switch (parts.length) {
 			case 2: {
-				return new Link(parts[0], parts[1]);
+				String[] nameSplit = parts[0].split("/");
+				String[] aliasSplit = parts[1].split("/");
+				return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
 			}
 			default: {
 				throw new IllegalArgumentException();
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -61,11 +61,11 @@ public Links deserialize(final JsonParser jsonParser, final DeserializationConte
 			final List<Link> binds = new ArrayList<Link>();
 			final ObjectCodec oc = jsonParser.getCodec();
 			final JsonNode node = oc.readTree(jsonParser);
-			for (final Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
+			for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
 
-				final Map.Entry<String, JsonNode> field = it.next();
-				if (!field.getValue().equals(NullNode.getInstance())) {
-					binds.add(Link.parse(field.getKey()));
+				final JsonNode element = it.next();
+				if (!element.equals(NullNode.getInstance())) {
+					binds.add(Link.parse(element.asText()));
 				}
 			}
 			return new Links(binds.toArray(new Link[0]));
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -12,6 +12,13 @@ public void parse() {
 		assertEquals(link.getName(), "name");
 		assertEquals(link.getAlias(), "alias");
 	}
+	
+	@Test
+	public void parseWithContainerNames() {
+		Link link = Link.parse("/name:/conatiner/alias");
+		assertEquals(link.getName(), "name");
+		assertEquals(link.getAlias(), "alias");
+	}
 
 	@Test(expectedExceptions = IllegalArgumentException.class,
 			expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -228,7 +228,7 @@ public void startContainerWithLinking() throws DockerException {
 		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
 		assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
 		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new String[] {"/container1:/container2/container1Link"}));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks().getLinks(), equalTo(new Link[] {new Link("container1","container1Link")}));
 		assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
 		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
 		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
