docker-java · martin894 · Aug 17, 2016 · Aug 19, 2016 · Aug 19, 2016 · Aug 19, 2016
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -117,6 +117,37 @@ public interface DockerCmdExecFactory extends Closeable {
 
     DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
+    /**
+     * List all nodes. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    ListSwarmNodesCmd.Exec listSwarmNodeCmdExec();
+
+    /**
+     * Return low-level information on the node. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec();
+
+    /**
+     * Remove a node from the swarm. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec();
+
+    /**
+     * Update a node. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec();
+
+
+
+
     @Override
     void close() throws IOException;
 

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Inspect a swarmNode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface InspectSwarmNodeCmd extends SyncDockerCmd<SwarmNode> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    InspectSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId);
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    SwarmNode exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<InspectSwarmNodeCmd, SwarmNode> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * List SwarmNodes
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface ListSwarmNodesCmd extends SyncDockerCmd<List<SwarmNode>> {
+
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    /**
+     * @param ids - Show only swarmNodes with the given ids
+     */
+    ListSwarmNodesCmd withIdFilter(List<String> ids);
+
+    /**
+     * @param names - Show only swarmNodes with the given names
+     */
+    ListSwarmNodesCmd withNameFilter(List<String> names);
+
+    /**
+     * @param memberships - Show only swarmNodes with the given memberships
+     */
+    ListSwarmNodesCmd withMembershipFilter(List<String> memberships);
+
+    /**
+     * @param roles - Show only swarmNodes with the given roles
+     */
+    ListSwarmNodesCmd withRoleFilter(List<String> roles);
+
+    interface Exec extends DockerCmdSyncExec<ListSwarmNodesCmd, List<SwarmNode>> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a swarmNode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface RemoveSwarmNodeCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    @CheckForNull
+    Boolean hasForceEnabled();
+
+    RemoveSwarmNodeCmd withContainerId(@Nonnull String containerId);
+
+    RemoveSwarmNodeCmd withForce(Boolean force);
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RemoveSwarmNodeCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.SwarmNodeSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Update swarmNode spec
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    UpdateSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId);
+
+    @CheckForNull
+    SwarmNodeSpec getSwarmNodeSpec();
+
+    UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);
+
+    interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -3,6 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * A node as returned by the /events API, for instance, when Swarm is used.
@@ -26,15 +29,46 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getId() {
         return id;
     }
 
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getAddr() {
         return addr;
     }
 
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
+
     public String getIp() {
         return ip;
     }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Reachability.java b/src/main/java/com/github/dockerjava/api/model/Reachability.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum Reachability {
+
+    @JsonProperty("unknown")
+    UNKNOWN,
+
+    @JsonProperty("unreachable")
+    UNREACHABLE,
+
+    @JsonProperty("reachable")
+    REACHABLE
+}