Allow port-only as a legal syntax for ExposedPort.parse(String)

albers · albers · commit 3b14b1fa5cf3 · 2014-10-31T15:01:43.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -48,6 +48,16 @@ public ExposedPort(int port, InternetProtocol protocol) {
 		this.protocol = protocol;
 	}
 
+	/**
+	 * Creates an {@link ExposedPort} for the given 
+	 * {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
+	 * 
+	 * @param port the {@link #getPort() port number}
+	 */
+	public ExposedPort(int port) {
+		this(port, InternetProtocol.DEFAULT);
+	}
+
 	/**
 	 * Creates an {@link ExposedPort} for the given parameters.
 	 * 
@@ -61,7 +71,8 @@ public ExposedPort(String scheme, int port) {
 		this(port, InternetProtocol.valueOf(scheme));
 	}
 
-	/** @return the {@link InternetProtocol} */
+	/** @return the {@link InternetProtocol} of the {@link #getPort() port}
+	 *          that the container exposes */
 	public InternetProtocol getProtocol() {
 		return protocol;
 	}
@@ -75,7 +86,7 @@ public String getScheme() {
 		return protocol.toString();
 	}
 
-	/** @return the port number */
+	/** @return the port number that the container exposes */
 	public int getPort() {
 		return port;
 	}
@@ -107,7 +118,14 @@ public static ExposedPort udp(int port) {
 	public static ExposedPort parse(String serialized) throws IllegalArgumentException {
 		try {
 			String[] parts = serialized.split("/");
-			return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+			switch (parts.length) {
+			case 1:
+				return new ExposedPort(Integer.valueOf(parts[0]));
+			case 2:
+				return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+			default:
+				throw new IllegalArgumentException();
+			}
 		} catch (Exception e) {
 			throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
 		}
diff --git a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
@@ -1,15 +1,23 @@
 package com.github.dockerjava.api.model;
 
+import static com.github.dockerjava.api.model.InternetProtocol.DEFAULT;
+import static com.github.dockerjava.api.model.InternetProtocol.TCP;
 import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.Test;
 
 public class ExposedPortTest {
 
 	@Test
-	public void parse() {
+	public void parsePortAndProtocol() {
 		ExposedPort exposedPort = ExposedPort.parse("80/tcp");
-		assertEquals(exposedPort.getPort(), 80);
+		assertEquals(exposedPort, new ExposedPort(80, TCP));
+	}
+
+	@Test
+	public void parsePortOnly() {
+		ExposedPort exposedPort = ExposedPort.parse("80");
+		assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
 	}
 
 	@Test(expectedExceptions = IllegalArgumentException.class,
