From 8fc97a170867880aad6427adabc12bcc4f47ec40 Mon Sep 17 00:00:00 2001
From: Nikita Shmakov <nikita.shmakov@ncloudtech.ru>
Date: Tue, 12 Sep 2017 14:19:23 +0300
Subject: [PATCH] change OomScoreAdj type

---
 .../github/dockerjava/api/model/HostConfig.java |  6 +++---
 .../dockerjava/cmd/CreateContainerCmdIT.java    | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 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 d808ef245..50360a630 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -144,7 +144,7 @@ public class HostConfig implements Serializable {
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("OomScoreAdj")
-    private Boolean oomScoreAdj;
+    private Integer oomScoreAdj;
 
     @JsonProperty("PortBindings")
     private Ports portBindings;
@@ -345,7 +345,7 @@ public List<Object> getBlkioWeightDevice() {
      * @see #oomScoreAdj
      */
     @CheckForNull
-    public Boolean getOomScoreAdj() {
+    public Integer getOomScoreAdj() {
         return oomScoreAdj;
     }
 
@@ -692,7 +692,7 @@ public HostConfig withOomKillDisable(Boolean oomKillDisable) {
     /**
      * @see #oomScoreAdj
      */
-    public HostConfig withOomScoreAdj(Boolean oomScoreAdj) {
+    public HostConfig withOomScoreAdj(Integer oomScoreAdj) {
         this.oomScoreAdj = oomScoreAdj;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 6073e1506..925443fab 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -41,6 +41,7 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
@@ -827,4 +828,20 @@ public void createContainerWithNetworkID() {
         }
         assertThat(containerNetwork, notNullValue());
     }
+
+    @Test
+    public void createContainerWithOomScoreAdj() {
+        assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22));
+
+        Integer oomScoreAdj = 100;
+        HostConfig hostConfig = new HostConfig().withOomScoreAdj(oomScoreAdj);
+        CreateContainerResponse createResponse = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withHostConfig(hostConfig)
+                .withCmd("true")
+                .exec();
+        String containerId = createResponse.getId();
+        InspectContainerResponse inspectResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec();
+        Integer oomScoreAdjResult = inspectResponse.getHostConfig().getOomScoreAdj();
+        assertThat(oomScoreAdjResult, equalTo(oomScoreAdj));
+    }
 }