Make UpdateStatus.completedAt nullable

Add unit test. Fixes #832
spotify · Jul 20, 2017 · 47e8201 · 47e8201
1 parent 8d74b92
commit 47e8201
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 1 deletion.
diff --git a/src/main/java/com/spotify/docker/client/messages/swarm/Service.java b/src/main/java/com/spotify/docker/client/messages/swarm/Service.java
@@ -56,8 +56,8 @@ public abstract class Service {
   @JsonProperty("Endpoint")
   public abstract Endpoint endpoint();
 
-  @JsonProperty("UpdateStatus")
   @Nullable
+  @JsonProperty("UpdateStatus")
   public abstract UpdateStatus updateStatus();
 
   @AutoValue

diff --git a/src/main/java/com/spotify/docker/client/messages/swarm/UpdateStatus.java b/src/main/java/com/spotify/docker/client/messages/swarm/UpdateStatus.java
@@ -42,6 +42,7 @@ public abstract class UpdateStatus {
   @JsonProperty("StartedAt")
   public abstract Date startedAt();
 
+  @Nullable
   @JsonProperty("CompletedAt")
   public abstract Date completedAt();
 

diff --git a/src/test/java/com/spotify/docker/client/messages/swarm/ServiceTest.java b/src/test/java/com/spotify/docker/client/messages/swarm/ServiceTest.java
@@ -0,0 +1,19 @@
+package com.spotify.docker.client.messages.swarm;
+
+import static com.spotify.docker.FixtureUtil.fixture;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.spotify.docker.client.ObjectMapperProvider;
+
+import org.junit.Test;
+
+public class ServiceTest {
+
+  private final ObjectMapper objectMapper = ObjectMapperProvider.objectMapper();
+
+  @Test
+  public void test1_30() throws Exception {
+    objectMapper.readValue(fixture("fixtures/1.30/service.json"), Service.class);
+  }
+
+}
diff --git a/src/test/resources/fixtures/1.30/service.json b/src/test/resources/fixtures/1.30/service.json
@@ -0,0 +1,84 @@
+{
+  "ID": "9mnpnzenvg8p8tdbtq4wvbkcz",
+  "Version": {
+    "Index": 19
+  },
+  "CreatedAt": "2016-06-07T21:05:51.880065305Z",
+  "UpdatedAt": "2016-06-07T21:07:29.962229872Z",
+  "Spec": {
+    "Name": "hopeful_cori",
+    "TaskTemplate": {
+      "ContainerSpec": {
+        "Image": "redis"
+      },
+      "Resources": {
+        "Limits": {},
+        "Reservations": {}
+      },
+      "RestartPolicy": {
+        "Condition": "any",
+        "MaxAttempts": 0
+      },
+      "Placement": {},
+      "ForceUpdate": 0
+    },
+    "Mode": {
+      "Replicated": {
+        "Replicas": 1
+      }
+    },
+    "UpdateConfig": {
+      "Parallelism": 1,
+      "Delay": 1000000000,
+      "FailureAction": "pause",
+      "Monitor": 15000000000,
+      "MaxFailureRatio": 0.15
+    },
+    "RollbackConfig": {
+      "Parallelism": 1,
+      "Delay": 1000000000,
+      "FailureAction": "pause",
+      "Monitor": 15000000000,
+      "MaxFailureRatio": 0.15
+    },
+    "EndpointSpec": {
+      "Mode": "vip",
+      "Ports": [
+        {
+          "Protocol": "tcp",
+          "TargetPort": 6379,
+          "PublishedPort": 30001
+        }
+      ]
+    }
+  },
+  "Endpoint": {
+    "Spec": {
+      "Mode": "vip",
+      "Ports": [
+        {
+          "Protocol": "tcp",
+          "TargetPort": 6379,
+          "PublishedPort": 30001
+        }
+      ]
+    },
+    "Ports": [
+      {
+        "Protocol": "tcp",
+        "TargetPort": 6379,
+        "PublishedPort": 30001
+      }
+    ],
+    "VirtualIPs": [
+      {
+        "NetworkID": "4qvuz4ko70xaltuqbt8956gd1",
+        "Addr": "10.255.0.2/16"
+      },
+      {
+        "NetworkID": "4qvuz4ko70xaltuqbt8956gd1",
+        "Addr": "10.255.0.3/16"
+      }
+    ]
+  }
+}