Apply changes from review

Yogu · Yogu · commit bd308df9dae7 · 2016-11-16T00:20:54.000+08:00
diff --git a/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
@@ -2,6 +2,7 @@
 
 
 import javax.annotation.CheckForNull;
+import java.util.List;
 
 public interface JoinSwarmCmd extends SyncDockerCmd<Void> {
 
@@ -16,9 +17,9 @@ public interface JoinSwarmCmd extends SyncDockerCmd<Void> {
     JoinSwarmCmd withAdvertiseAddr(String advertiseAddr);
 
     @CheckForNull
-    String[] getRemoteAddrs();
+    List<String> getRemoteAddrs();
 
-    JoinSwarmCmd withRemoteAddrs(String[] remoteAddrs);
+    JoinSwarmCmd withRemoteAddrs(List<String> remoteAddrs);
 
     @CheckForNull
     String getJoinToken();
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -11,6 +11,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
@@ -27,8 +28,11 @@ public class SwarmCAConfig implements Serializable {
     @JsonProperty("NodeCertExpiry")
     private Long nodeCertExpiry;
 
+    /**
+     * @since 1.24
+     */
     @JsonProperty("ExternalCAs")
-    private ExternalCA[] externalCA;
+    private List<ExternalCA> externalCA;
 
     /**
      * @see #nodeCertExpiry
@@ -46,6 +50,22 @@ public SwarmCAConfig withNodeCertExpiry(Long nodeCertExpiry) {
         return this;
     }
 
+    /**
+     * @see #externalCA
+     */
+    @CheckForNull
+    public List<ExternalCA> getExternalCA() {
+        return externalCA;
+    }
+
+    /**
+     * @see #externalCA
+     */
+    public SwarmCAConfig withExternalCA(List<ExternalCA> externalCA) {
+        this.externalCA = externalCA;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
@@ -9,6 +9,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.util.List;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class JoinSwarmCmdImpl extends AbstrDockerCmd<JoinSwarmCmd, Void> implements
@@ -21,7 +22,7 @@ public class JoinSwarmCmdImpl extends AbstrDockerCmd<JoinSwarmCmd, Void> impleme
     private String advertiseAddr;
 
     @JsonProperty("RemoteAddrs")
-    private String[] remoteAddrs;
+    private List<String> remoteAddrs;
 
     @JsonProperty("JoinToken")
     private String joinToken;
@@ -56,12 +57,12 @@ public JoinSwarmCmd withAdvertiseAddr(String advertiseAddr) {
 
     @Override
     @CheckForNull
-    public String[] getRemoteAddrs() {
+    public List<String> getRemoteAddrs() {
         return remoteAddrs;
     }
 
     @Override
-    public JoinSwarmCmd withRemoteAddrs(String[] remoteAddrs) {
+    public JoinSwarmCmd withRemoteAddrs(List<String> remoteAddrs) {
         this.remoteAddrs = remoteAddrs;
         return this;
     }
