docker-java · KostyaSha · Feb 17, 2016 · Feb 17, 2016 · Feb 17, 2016 · Feb 17, 2016
diff --git a/docs/devel.adoc b/docs/devel.adoc
@@ -0,0 +1,25 @@
+### Code Design
+  * Model is based on Objects and not primitives that allows nullify requests and have null values for data
+  that wasn't provided by docker daemon.
+  * For null safeness findbugs annotations are used.
+  ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something)
+     should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package.
+  ** Methods that can't return `null` must be annotated with `@Nonnull`.
+  ** The same for Arguments.
+  ** `@Nullable` must be used only for changing inherited (other typed) qualifier.
+  * Setters in builder style must be prefixed with `withXX`.
+  * All classes should provide `toString()` `equals()` and `hashCode()` defined methods.
+  * Javadocs
+  ** Provide full information on field:
+  *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`.
+  ** getters/setters should refernce to field `@see #$field`.
+
+### Coding style
+  * TBD, some initial styling already enforced with checkstyle.
+  IDEA/checkstyle file analogues will be provided soon.
+
+### Testing
+  * Unit tests for serder (serialization-deserialization).
+  * Integration tests for commands.
+  * If model object has builders, then fill it with data and compare by `equals()` with expected response
+  from docker daemon. If failed, then some fields mappings are wrong.
diff --git a/pom.xml b/pom.xml
@@ -72,8 +72,8 @@
 		<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
 		<maven-compiler-plugin.version>2.3.1</maven-compiler-plugin.version>
 		<maven-release-plugin.version>2.3.1</maven-release-plugin.version>
-		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
 		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
 	</properties>
 
@@ -124,6 +124,11 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.apache.commons</groupId>-->
+			<!--<artifactId>commons-collections4</artifactId>-->
+			<!--<version>4.1</version>-->
+		<!--</dependency>-->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -53,6 +53,7 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
@@ -175,6 +176,15 @@ public interface DockerClient extends Closeable {
 
     public KillContainerCmd killContainerCmd(@Nonnull String containerId);
 
+    /**
+     * Update container settings
+     *
+     * @param containerId id of the container
+     * @return command
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
+
     public RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
     public CommitCmd commitCmd(@Nonnull String containerId);

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -80,6 +80,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     public ExposedPort[] getExposedPorts();
 
+    @CheckForNull
+    public String getStopSignal();
+
     @CheckForNull
     public String[] getExtraHosts();
 
@@ -280,6 +283,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 
+    public CreateContainerCmd withStopSignal(String stopSignal);
+
     public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
 
     /**

diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -69,6 +69,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public KillContainerCmd.Exec createKillContainerCmdExec();
 
+    UpdateContainerCmd.Exec createUpdateContainerCmdExec();
+
     public RestartContainerCmd.Exec createRestartContainerCmdExec();
 
     public CommitCmd.Exec createCommitCmdExec();

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -9,6 +9,8 @@
 import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.core.RemoteApiVersion;
 
+import javax.annotation.CheckForNull;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectExecResponse {
     @JsonProperty("ID")
@@ -26,15 +28,37 @@ public class InspectExecResponse {
     @JsonProperty("Running")
     private Boolean running;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("CanRemove")
+    private Boolean canRemove;
+
     @JsonProperty("ExitCode")
     private Integer exitCode;
 
     @JsonProperty("ProcessConfig")
     private ProcessConfig processConfig;
 
+    /**
+     * @deprecated @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @Deprecated
     @JsonProperty("Container")
     private Container container;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ContainerID")
+    private String containerID;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("DetachKeys")
+    private String detachKeys;
+
     public String getId() {
         return id;
     }
@@ -63,10 +87,38 @@ public ProcessConfig getProcessConfig() {
         return processConfig;
     }
 
+    /**
+     * @see #container
+     */
+    @Deprecated
     public Container getContainer() {
         return container;
     }
 
+    /**
+     * @see #canRemove
+     */
+    @CheckForNull
+    public Boolean getCanRemove() {
+        return canRemove;
+    }
+
+    /**
+     * @see #containerID
+     */
+    @CheckForNull
+    public String getContainerID() {
+        return containerID;
+    }
+
+    /**
+     * @see #detachKeys
+     */
+    @CheckForNull
+    public String getDetachKeys() {
+        return detachKeys;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -0,0 +1,68 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerResponse> {
+    @CheckForNull
+    String getContainerId();
+
+    @CheckForNull
+    public Integer getBlkioWeight();
+
+    public UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    public UpdateContainerCmd withContainerId(String containerId);
+
+    @CheckForNull
+    public Integer getCpuPeriod();
+
+    public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    @CheckForNull
+    public Integer getCpuQuota();
+
+    public UpdateContainerCmd withCpuQuota(Integer cpuQuota);
+
+    @CheckForNull
+    public String getCpusetCpus();
+
+    public UpdateContainerCmd withCpusetCpus(String cpusetCpus);
+
+    @CheckForNull
+    public String getCpusetMems();
+
+    public UpdateContainerCmd withCpusetMems(String cpusetMems);
+
+    @CheckForNull
+    public Integer getCpuShares();
+
+    public UpdateContainerCmd withCpuShares(Integer cpuShares);
+
+    @CheckForNull
+    public Long getKernelMemory();
+
+    public UpdateContainerCmd withKernelMemory(Long kernelMemory);
+
+    @CheckForNull
+    public Long getMemory();
+
+    public UpdateContainerCmd withMemory(Long memory);
+
+    @CheckForNull
+    public Long getMemoryReservation();
+
+    public UpdateContainerCmd withMemoryReservation(Long memoryReservation);
+
+    @CheckForNull
+    Long getMemorySwap();
+
+    UpdateContainerCmd withMemorySwap(Long memorySwap);
+
+    interface Exec extends DockerCmdSyncExec<UpdateContainerCmd, UpdateContainerResponse> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.CheckForNull;
+
 @JsonInclude(Include.NON_NULL)
 public class AuthConfig {
 
@@ -32,6 +34,12 @@ public class AuthConfig {
     @JsonProperty("auth")
     private String auth;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("registrytoken")
+    private String registrytoken;
+
     public String getUsername() {
         return username;
     }
@@ -77,6 +85,22 @@ public AuthConfig withAuth(String auth) {
         return this;
     }
 
+    /**
+     * @see #registrytoken
+     */
+    @CheckForNull
+    public String getRegistrytoken() {
+        return registrytoken;
+    }
+
+    /**
+     * @see #registrytoken
+     */
+    public AuthConfig withRegistrytoken(String registrytoken) {
+        this.registrytoken = registrytoken;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);