Merge pull request #796 from fdonze/swarm-join

Update SwarmJoin non/nullable fields
spotify · Jun 27, 2017 · 3182712 · 3182712
2 parents 85d9cf0 + f1a9234
commit 3182712
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/com/spotify/docker/client/messages/swarm/SwarmJoin.java b/src/main/java/com/spotify/docker/client/messages/swarm/SwarmJoin.java
@@ -38,14 +38,13 @@ public abstract class SwarmJoin {
   @JsonProperty("ListenAddr")
   public abstract String listenAddr();
 
+  @Nullable
   @JsonProperty("AdvertiseAddr")
   public abstract String advertiseAddr();
 
-  @Nullable
   @JsonProperty("RemoteAddrs")
   public abstract List<String> remoteAddrs();
 
-  @Nullable
   @JsonProperty("JoinToken")
   public abstract String joinToken();
 

diff --git a/src/test/java/com/spotify/docker/client/DefaultDockerClientUnitTest.java b/src/test/java/com/spotify/docker/client/DefaultDockerClientUnitTest.java
@@ -59,10 +59,12 @@
 import com.spotify.docker.client.messages.swarm.NodeInfo;
 import com.spotify.docker.client.messages.swarm.NodeSpec;
 import com.spotify.docker.client.messages.swarm.ServiceSpec;
+import com.spotify.docker.client.messages.swarm.SwarmJoin;
 import com.spotify.docker.client.messages.swarm.TaskSpec;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -484,6 +486,22 @@ public void testUpdateNonSwarmNode() throws Exception {
     dockerClient.updateNode("24ifsmvkjbyhk", 8L, nodeSpec);
   }
 
+  @Test
+  public void testJoinSwarm() throws Exception {
+    final DefaultDockerClient dockerClient = new DefaultDockerClient(builder);
+
+    enqueueServerApiVersion("1.24");
+    enqueueServerApiEmptyResponse(200);
+
+    SwarmJoin swarmJoin = SwarmJoin.builder()
+            .joinToken("token_foo")
+            .listenAddr("0.0.0.0:2377")
+            .remoteAddrs(Arrays.asList("10.0.0.10:2377"))
+            .build();
+
+    dockerClient.joinSwarm(swarmJoin);
+  }
+
   private void enqueueServerApiError(final int statusCode, String message) throws IOException {
     final ObjectNode errorMessage = createObjectNode()
         .put("message", message);