Change serialization of RestartPolicy.noRestart()

albers · albers · commit 2f125888b9eb · 2014-12-17T19:18:27.000+01:00
The Docker CLI uses "" as the name for the --restart no policy.
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -23,7 +23,7 @@ public class RestartPolicy {
 	private int maximumRetryCount = 0;
 
 	@JsonProperty("Name")
-	private String name = "no";
+	private String name = "";
 
 	public RestartPolicy() {
 	}
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.api.model;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Compares serialization results of various {@link RestartPolicy}s with
+ * what Docker (as of 1.3.3) actually sends when executing 
+ * <code>docker run --restart xxx</code>.
+ */
+public class RestartPolicy_SerializingTest {
+	private final ObjectMapper objectMapper = new ObjectMapper();
+
+	@Test  // --restart no
+	public void noRestart() throws Exception {
+		String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
+		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
+	}
+	
+	@Test  // --restart always
+	public void alwaysRestart() throws Exception {
+		String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
+		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
+	}
+
+	@Test  // --restart on-failure
+	public void onFailureRestart() throws Exception {
+		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
+		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
+	}
+	
+	@Test  // --restart on-failure:2
+	public void onFailureRestartWithCount() throws Exception {
+		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
+		assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
+	}
+	
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class RestartPolicy {`
`23`	`23`	`private int maximumRetryCount = 0;`
`24`	`24`
`25`	`25`	`@JsonProperty("Name")`
`26`		`- private String name = "no";`
	`26`	`+ private String name = "";`
`27`	`27`
`28`	`28`	`public RestartPolicy() {`
`29`	`29`	`}`