adding support for unless-stopped restart policy

thenim · thenim · commit 7016a6364e66 · 2017-03-29T09:40:50.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -70,6 +70,13 @@ public static RestartPolicy onFailureRestart(int maximumRetryCount) {
         return new RestartPolicy(maximumRetryCount, "on-failure");
     }
 
+    /**
+     * Restart the container unless it has been stopped
+     */
+    public static RestartPolicy unlessStoppedRestart() {
+        return new RestartPolicy(0, "unless-stopped");
+    }
+
     public Integer getMaximumRetryCount() {
         return maximumRetryCount;
     }
@@ -99,6 +106,10 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
                 return alwaysRestart();
             }
 
+            if ("unless-stopped".equals(name)) {
+                return unlessStoppedRestart();
+            }
+
             if ("on-failure".equals(name)) {
                 int count = 0;
                 if (parts.length == 2) {
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
@@ -16,6 +16,11 @@ public void alwaysRestart() throws Exception {
         assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
     }
 
+    @Test
+    public void unlessStoppedRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("unless-stopped"), RestartPolicy.unlessStoppedRestart());
+    }
+
     @Test
     public void onFailureRestart() throws Exception {
         assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
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
@@ -27,6 +27,13 @@ public void alwaysRestart() throws Exception {
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
     }
 
+    @Test
+    // --restart unless-stopped
+    public void unlessStoppedRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.unlessStoppedRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}");
+    }
+
     @Test
     // --restart on-failure
     public void onFailureRestart() throws Exception {
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
@@ -9,7 +9,7 @@ public class RestartPolicy_toStringTest {
 
     @DataProvider(name = "input")
     public Object[][] restartPolicies() {
-        return new Object[][] { {"no"}, {"always"}, {"on-failure"}, {"on-failure:2"}};
+        return new Object[][] { {"no"}, {"always"}, {"unless-stopped"}, {"on-failure"}, {"on-failure:2"}};
     }
 
     @Test(dataProvider = "input")

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class RestartPolicy_toStringTest {`
`9`	`9`
`10`	`10`	`@DataProvider(name = "input")`
`11`	`11`	`public Object[][] restartPolicies() {`
`12`		`- return new Object[][] { {"no"}, {"always"}, {"on-failure"}, {"on-failure:2"}};`
	`12`	`+ return new Object[][] { {"no"}, {"always"}, {"unless-stopped"}, {"on-failure"}, {"on-failure:2"}};`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Test(dataProvider = "input")`