Merge pull request docker-java#63 from albers/bind-parse

marcuslinke · marcuslinke · commit 328d34503854 · 2014-09-28T20:19:27.000+02:00
Bind.parse() fails when access mode is specified
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -33,6 +33,13 @@ public boolean isReadOnly() {
 		return readOnly;
 	}
 
+	/**
+	 * Parses a bind mount specification to a {@link Bind}.
+	 * 
+	 * @param serialized the specification, e.g. <code>/host:/container:ro</code>
+	 * @return a {@link Bind} matching the specification
+	 * @throws IllegalArgumentException if the specification cannot be parsed
+	 */
 	public static Bind parse(String serialized) {
 		try {
 			String[] parts = serialized.split(":");
@@ -41,19 +48,19 @@ public static Bind parse(String serialized) {
 				return new Bind(parts[0], Volume.parse(parts[1]));
 			}
 			case 3: {
-				if ("rw".equals(parts[3].toLowerCase()))
+				if ("rw".equals(parts[2].toLowerCase()))
+					return new Bind(parts[0], Volume.parse(parts[1]), false);
+				else if ("ro".equals(parts[2].toLowerCase()))
 					return new Bind(parts[0], Volume.parse(parts[1]), true);
 				else
-					throw new RuntimeException("Error parsing Bind '"
-							+ serialized + "'");
+					throw new IllegalArgumentException();
 			}
 			default: {
-				throw new RuntimeException("Error parsing Bind '" + serialized
-						+ "'");
+				throw new IllegalArgumentException();
 			}
 			}
 		} catch (Exception e) {
-			throw new RuntimeException("Error parsing Bind '" + serialized
+			throw new IllegalArgumentException("Error parsing Bind '" + serialized
 					+ "'");
 		}
 	}
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.api.model;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+public class BindTest {
+	
+	@Test
+	public void parseUsingDefaultAccessMode() {
+		Bind bind = Bind.parse("/host:/container");
+		assertEquals(bind.getPath(), "/host");
+		assertEquals(bind.getVolume().getPath(), "/container");
+		assertEquals(bind.isReadOnly(), false);
+	}
+
+	@Test
+	public void parseReadWrite() {
+		Bind bind = Bind.parse("/host:/container:rw");
+		assertEquals(bind.getPath(), "/host");
+		assertEquals(bind.getVolume().getPath(), "/container");
+		assertEquals(bind.isReadOnly(), false);
+	}
+	
+	@Test
+	public void parseReadOnly() {
+		Bind bind = Bind.parse("/host:/container:ro");
+		assertEquals(bind.getPath(), "/host");
+		assertEquals(bind.getVolume().getPath(), "/container");
+		assertEquals(bind.isReadOnly(), true);
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class,
+			expectedExceptionsMessageRegExp = "Error parsing Bind.*")
+	public void parseInvalidAccessMode() {
+		Bind.parse("/host:/container:xx");
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class, 
+			expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
+	public void parseInvalidInput() {
+		Bind.parse("nonsense");
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class, 
+			expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
+	public void parseNull() {
+		Bind.parse(null);
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,13 @@ public boolean isReadOnly() {`
`33`	`33`	`return readOnly;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ /**`
	`37`	`+ * Parses a bind mount specification to a {@link Bind}.`
	`38`	`+ *`
	`39`	`+ * @param serialized the specification, e.g. <code>/host:/container:ro</code>`
	`40`	`+ * @return a {@link Bind} matching the specification`
	`41`	`+ * @throws IllegalArgumentException if the specification cannot be parsed`
	`42`	`+ */`
`36`	`43`	`public static Bind parse(String serialized) {`
`37`	`44`	`try {`
`38`	`45`	`String[] parts = serialized.split(":");`
`@@ -41,19 +48,19 @@ public static Bind parse(String serialized) {`
`41`	`48`	`return new Bind(parts[0], Volume.parse(parts[1]));`
`42`	`49`	`}`
`43`	`50`	`case 3: {`
`44`		`- if ("rw".equals(parts[3].toLowerCase()))`
	`51`	`+ if ("rw".equals(parts[2].toLowerCase()))`
	`52`	`+ return new Bind(parts[0], Volume.parse(parts[1]), false);`
	`53`	`+ else if ("ro".equals(parts[2].toLowerCase()))`
`45`	`54`	`return new Bind(parts[0], Volume.parse(parts[1]), true);`
`46`	`55`	`else`
`47`		`- throw new RuntimeException("Error parsing Bind '"`
`48`		`- + serialized + "'");`
	`56`	`+ throw new IllegalArgumentException();`
`49`	`57`	`}`
`50`	`58`	`default: {`
`51`		`- throw new RuntimeException("Error parsing Bind '" + serialized`
`52`		`- + "'");`
	`59`	`+ throw new IllegalArgumentException();`
`53`	`60`	`}`
`54`	`61`	`}`
`55`	`62`	`} catch (Exception e) {`
`56`		`- throw new RuntimeException("Error parsing Bind '" + serialized`
	`63`	`+ throw new IllegalArgumentException("Error parsing Bind '" + serialized`
`57`	`64`	`+ "'");`
`58`	`65`	`}`
`59`	`66`	`}`