Merge pull request docker-java#964 from fengxx/bugfix/service_spec

KostyaSha · web-flow · commit e3d0f5779629 · 2017-12-09T19:01:07.000+03:00
minor fix for data model
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -23,10 +23,10 @@ public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {
 
     UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);
 
-    UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId);
+    UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId);
 
     @CheckForNull
-    Integer getVersion();
+    Long getVersion();
 
     interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -200,6 +200,11 @@ public class HostConfig implements Serializable {
     @JsonProperty("PidsLimit")
     private Long pidsLimit;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_30}
+     */
+    @JsonProperty("Runtime")
+    private String runtime;
 
     @JsonIgnore
     public Bind[] getBinds() {
@@ -438,6 +443,10 @@ public boolean isUserDefinedNetwork() {
         return networkMode != null && !PREDEFINED_NETWORKS.contains(networkMode) && !networkMode.startsWith("container:");
     }
 
+    public String getRuntime() {
+        return runtime;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
@@ -816,6 +825,11 @@ public HostConfig withPidsLimit(Long pidsLimit) {
         this.pidsLimit = pidsLimit;
         return this;
     }
+
+    public HostConfig withRuntime(String runtime) {
+        this.runtime = runtime;
+        return this;
+    }
     // end of auto-generated
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -22,13 +22,13 @@ public class ObjectVersion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Index")
-    private Integer index = null;
+    private Long index = null;
 
-    public Integer getIndex() {
+    public Long getIndex() {
         return index;
     }
 
-    public ObjectVersion withIndex(Integer index) {
+    public ObjectVersion withIndex(Long index) {
         this.index = index;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -56,6 +56,12 @@ public class TaskSpec implements Serializable {
     @JsonProperty("ForceUpdate")
     private Integer forceUpdate;
 
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("Runtime")
+    private String runtime;
+
     /**
      * @see #containerSpec
      */
@@ -120,6 +126,15 @@ public TaskSpec withPlacement(ServicePlacement placement) {
         return this;
     }
 
+    public String getRuntime() {
+        return runtime;
+    }
+
+    public TaskSpec withRuntime(String runtime) {
+        this.runtime = runtime;
+        return this;
+    }
+
     /**
      * @see #logDriver
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serializable;
 
@@ -74,4 +76,9 @@ public TaskStatus withContainerStatus(TaskStatusContainerStatus containerStatus)
         this.containerStatus = containerStatus;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serializable;
 
@@ -50,4 +52,8 @@ public TaskStatusContainerStatus withExitCode(Integer exitCode) {
         this.exitCode = exitCode;
         return this;
     }
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
@@ -24,7 +24,7 @@ public class UpdateSwarmNodeCmdImpl extends AbstrDockerCmd<UpdateSwarmNodeCmd, V
 
     private SwarmNodeSpec swarmNodeSpec;
 
-    private Integer version;
+    private Long version;
 
     public UpdateSwarmNodeCmdImpl(Exec exec) {
         super(exec);
@@ -69,14 +69,14 @@ public UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec) {
     }
 
     @Override
-    public UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId) {
+    public UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId) {
         this.version = versionId;
         return this;
     }
 
     @CheckForNull
     @Override
-    public Integer getVersion() {
+    public Long getVersion() {
         return version;
     }
 
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -27,7 +27,7 @@ public void testUpdateSwarmNode() {
         docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
                 .withSwarmNodeSpec(nodeSpec).exec();
         nodes = docker1.listSwarmNodesCmd().exec();
-        assertThat(1, is(nodes.size()));
-        assertThat(SwarmNodeAvailability.PAUSE, is(nodes.get(0).getSpec().getAvailability()));
+        assertThat(nodes.size(), is(1));
+        assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {`
`23`	`23`
`24`	`24`	`UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);`
`25`	`25`
`26`		`- UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId);`
	`26`	`+ UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId);`
`27`	`27`
`28`	`28`	`@CheckForNull`
`29`		`- Integer getVersion();`
	`29`	`+ Long getVersion();`
`30`	`30`
`31`	`31`	`interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ public class ObjectVersion implements Serializable {`
`22`	`22`	`private static final long serialVersionUID = 1L;`
`23`	`23`
`24`	`24`	`@JsonProperty("Index")`
`25`		`- private Integer index = null;`
	`25`	`+ private Long index = null;`
`26`	`26`
`27`		`- public Integer getIndex() {`
	`27`	`+ public Long getIndex() {`
`28`	`28`	`return index;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public ObjectVersion withIndex(Integer index) {`
	`31`	`+ public ObjectVersion withIndex(Long index) {`
`32`	`32`	`this.index = index;`
`33`	`33`	`return this;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class UpdateSwarmNodeCmdImpl extends AbstrDockerCmd<UpdateSwarmNodeCmd, V`
`24`	`24`
`25`	`25`	`private SwarmNodeSpec swarmNodeSpec;`
`26`	`26`
`27`		`- private Integer version;`
	`27`	`+ private Long version;`
`28`	`28`
`29`	`29`	`public UpdateSwarmNodeCmdImpl(Exec exec) {`
`30`	`30`	`super(exec);`
`@@ -69,14 +69,14 @@ public UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- public UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId) {`
	`72`	`+ public UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId) {`
`73`	`73`	`this.version = versionId;`
`74`	`74`	`return this;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@CheckForNull`
`78`	`78`	`@Override`
`79`		`- public Integer getVersion() {`
	`79`	`+ public Long getVersion() {`
`80`	`80`	`return version;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void testUpdateSwarmNode() {`
`27`	`27`	`docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())`
`28`	`28`	`.withSwarmNodeSpec(nodeSpec).exec();`
`29`	`29`	`nodes = docker1.listSwarmNodesCmd().exec();`
`30`		`- assertThat(1, is(nodes.size()));`
`31`		`- assertThat(SwarmNodeAvailability.PAUSE, is(nodes.get(0).getSpec().getAvailability()));`
	`30`	`+ assertThat(nodes.size(), is(1));`
	`31`	`+ assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE));`
`32`	`32`	`}`
`33`	`33`	`}`