From db8cc70815331347dbac4dad06671dc4f43739fe Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:04:40 +0200
Subject: [PATCH 1/5] Adding support for withPidMode #332

---
 .../api/command/CreateContainerCmd.java       |  3 +
 .../dockerjava/api/model/HostConfig.java      | 10 +++-
 .../core/command/CreateContainerCmdImpl.java  | 24 ++++++--
 .../command/CreateContainerCmdImplTest.java   | 55 ++++++++++---------
 4 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 638331240..0fd89a44e 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -134,6 +134,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public boolean isTty();
 
+    public String getPidMode();
+
     public CreateContainerCmd withAttachStderr(boolean attachStderr);
 
     public CreateContainerCmd withAttachStdin(boolean attachStdin);
@@ -291,6 +293,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
+    public CreateContainerCmd withPidMode(String pidMode);
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 9b31e05a9..d91118afe 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -75,13 +75,16 @@ public class HostConfig {
     @JsonProperty("CpuShares")
     private int cpuShares = 0;
 
+    @JsonProperty("PidMode")
+    private String pidMode;
+
     public HostConfig() {
     }
 
     public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
             boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
             VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits, String pidMode) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
@@ -101,6 +104,7 @@ public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logCo
         this.devices = devices;
         this.extraHosts = extraHosts;
         this.ulimits = ulimits;
+        this.pidMode = pidMode;
     }
 
     @JsonIgnore
@@ -194,6 +198,8 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    public String getPidMode() { return pidMode; }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
@@ -273,6 +279,8 @@ public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
+    public void setPidMode(String pidMode) { this.pidMode = pidMode; }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f29c5c05f..570153c69 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,11 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.ConflictException;
@@ -28,6 +22,11 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  *
@@ -397,6 +396,12 @@ public boolean isTty() {
         return tty;
     }
 
+    @Override
+    @JsonIgnore
+    public String getPidMode() {
+        return hostConfig.getPidMode();
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
@@ -733,4 +738,11 @@ public CreateContainerCmdImpl withWorkingDir(String workingDir) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withPidMode(String pidMode) {
+        checkNotNull(pidMode, "pidMode was not specified");
+        this.hostConfig.setPidMode(pidMode);
+        return this;
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 1aeeb5479..b290a618c 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,5 +1,14 @@
 package com.github.dockerjava.core.command;
 
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.*;
+
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,31 +30,10 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.AccessMode;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -451,6 +439,21 @@ public void createContainerWithRestartPolicy() throws DockerException {
         assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
     }
 
+    @Test
+    public void createContainerWithPidMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withPidMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getPidMode(), is(equalTo("host")));
+    }
+
     /**
      * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
      * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
@@ -543,4 +546,6 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
+
+
 }

From 0a730b81a8fc91fcef861d9b26f773d29524c6e3 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:12:49 +0200
Subject: [PATCH 2/5] Style fixes

---
 .../java/com/github/dockerjava/api/model/HostConfig.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index d91118afe..0e3a835ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -84,7 +84,8 @@ public HostConfig() {
     public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
             boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
             VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits, String pidMode) {
+            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits,
+            String pidMode) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
@@ -198,7 +199,9 @@ public int getCpuShares() {
         return cpuShares;
     }
 
-    public String getPidMode() { return pidMode; }
+    public String getPidMode() {
+        return pidMode;
+    }
 
     @JsonIgnore
     public void setBinds(Bind... binds) {

From 4b543c33db68959a43ce43b5d08039b8d324dfb9 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:25:21 +0200
Subject: [PATCH 3/5] Style fixes; * imports fixed

---
 .../api/command/CreateContainerCmd.java       |  3 +++
 .../dockerjava/api/model/HostConfig.java      |  4 +++-
 .../dockerjava/jaxrs/EventsCmdExec.java       |  4 ++--
 .../command/CreateContainerCmdImplTest.java   | 22 ++++++++++++++-----
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 0fd89a44e..ea7691446 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -18,6 +18,8 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
+import javax.annotation.CheckForNull;
+
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
     public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
@@ -134,6 +136,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public boolean isTty();
 
+    @CheckForNull
     public String getPidMode();
 
     public CreateContainerCmd withAttachStderr(boolean attachStderr);
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 0e3a835ee..4ab1cf76f 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -282,7 +282,9 @@ public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
-    public void setPidMode(String pidMode) { this.pidMode = pidMode; }
+    public void setPidMode(String pidMode) {
+        this.pidMode = pidMode;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 6720604df..7936ef15f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.*;
-
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
@@ -14,6 +12,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index b290a618c..a939bcbd9 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -4,10 +4,25 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
@@ -33,7 +48,6 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -546,6 +560,4 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
-
-
 }

From 6df5a7fa314396fa56ef2b112f6d663e6fcc0d52 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Tue, 29 Sep 2015 09:51:31 +0200
Subject: [PATCH 4/5] Adding checkfornull annotation

---
 src/main/java/com/github/dockerjava/api/model/HostConfig.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 4ab1cf76f..cbb6e84de 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -6,6 +6,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.CheckForNull;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
 
@@ -199,6 +201,7 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    @CheckForNull
     public String getPidMode() {
         return pidMode;
     }

From 4f094c1128a5c4b4974a51d7de446eb24f5350dc Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Tue, 29 Sep 2015 10:53:03 +0200
Subject: [PATCH 5/5] Renaming withPidMode to withPid (consistency)

---
 .../com/github/dockerjava/api/command/CreateContainerCmd.java   | 2 +-
 .../github/dockerjava/core/command/CreateContainerCmdImpl.java  | 2 +-
 .../dockerjava/core/command/CreateContainerCmdImplTest.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index ea7691446..46e099908 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -296,7 +296,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
-    public CreateContainerCmd withPidMode(String pidMode);
+    public CreateContainerCmd withPid(String pidMode);
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 570153c69..d07b43887 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -739,7 +739,7 @@ public CreateContainerCmdImpl withWorkingDir(String workingDir) {
     }
 
     @Override
-    public CreateContainerCmd withPidMode(String pidMode) {
+    public CreateContainerCmd withPid(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");
         this.hostConfig.setPidMode(pidMode);
         return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a939bcbd9..222a4a1e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -457,7 +457,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
     public void createContainerWithPidMode() throws DockerException {
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withPidMode("host").exec();
+                .withPid("host").exec();
 
         LOG.info("Created container {}", container.toString());