From 4fc98a0d406e000915db5e55ca3d1a6f82e8e1ff Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Fri, 6 May 2016 16:39:53 +0200
Subject: [PATCH 1/3] Docker inspect command now shows sizes if request.

---
 .../dockerjava/api/command/InspectContainerCmd.java  |  4 ++++
 .../api/command/InspectContainerResponse.java        |  7 +++++++
 .../core/command/InspectContainerCmdImpl.java        | 12 ++++++++++++
 .../dockerjava/jaxrs/InspectContainerCmdExec.java    |  5 +++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index cb782c64d..c0f666fa3 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -12,6 +12,10 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo
 
     InspectContainerCmd withContainerId(@Nonnull String containerId);
 
+    InspectContainerCmd withSize(Boolean showSize);
+
+    boolean getSize();
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index d19bc0329..59a267e9d 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -56,6 +56,9 @@ public class InspectContainerResponse {
     @JsonProperty("Id")
     private String id;
 
+    @JsonProperty("SizeRootFs")
+    private Integer sizeRootFs;
+
     @JsonProperty("Image")
     private String imageId;
 
@@ -102,6 +105,10 @@ public String getId() {
         return id;
     }
 
+    public Integer getSizeRootFs() {
+        return  sizeRootFs;
+    }
+
     public String getCreated() {
         return created;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index 51b1bdf5a..b6ba08540 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -13,6 +13,7 @@ public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd,
         InspectContainerCmd {
 
     private String containerId;
+    private boolean size;
 
     public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -31,6 +32,17 @@ public InspectContainerCmd withContainerId(String containerId) {
         return this;
     }
 
+    @Override
+    public InspectContainerCmd withSize(Boolean showSize) {
+        this.size = showSize;
+        return this;
+    }
+
+    @Override
+    public boolean getSize() {
+        return size;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 74bcc801c..2edbe2d29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -21,8 +21,9 @@ public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig docker
 
     @Override
     protected InspectContainerResponse execute(InspectContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
-                command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/json")
+                                                 .queryParam("size", command.getSize())
+                                                 .resolveTemplate("id", command.getContainerId());
 
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);

From 61869c8a75cd9e3e295aadacc74b92471b591d1f Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Mon, 9 May 2016 19:33:43 +0200
Subject: [PATCH 2/3] Adds tests for inspect command when size is used.

---
 .../command/InspectContainerCmdImplTest.java    | 17 +++++++++++++++++
 .../netty/exec/InspectContainerCmdExecTest.java | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index 47ed11201..2a20edc6e 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -63,6 +63,23 @@ public void inspectContainer() throws DockerException {
 
     }
 
+    @Test()
+    public void inspectContainerWithSize() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId())
+                                                             .withSize(true)
+                                                             .exec();
+        assertNotNull(containerInfo.getSizeRootFs());
+        assertEquals(containerInfo.getId(), container.getId());
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
         dockerClient.inspectContainerCmd("non-existing").exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 87fe3b48b..8f38dde79 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -63,6 +63,21 @@ public void inspectContainer() throws DockerException {
 
     }
 
+    @Test()
+    public void inspectContainerWithSize() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+        assertNotNull(containerInfo.getSizeRootFs());
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
         dockerClient.inspectContainerCmd("non-existing").exec();

From 72b2e73a686c39851c177cc440725ef2f888de9d Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Mon, 9 May 2016 19:58:00 +0200
Subject: [PATCH 3/3] Strenghten tests for withSize in InspectContainer.

---
 .../core/command/InspectContainerCmdImplTest.java      | 10 ++++++----
 .../netty/exec/InspectContainerCmdExecTest.java        |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index 2a20edc6e..c0eaab3a6 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.api.command.InspectContainerCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -73,11 +74,12 @@ public void inspectContainerWithSize() throws DockerException {
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId())
-                                                             .withSize(true)
-                                                             .exec();
-        assertNotNull(containerInfo.getSizeRootFs());
+        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId()).withSize(true);
+        assertTrue(command.getSize());
+        InspectContainerResponse containerInfo  = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
+        assertNotNull(containerInfo.getSizeRootFs());
+        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 8f38dde79..af32cebce 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.api.command.InspectContainerCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -73,9 +74,13 @@ public void inspectContainerWithSize() throws DockerException {
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId())
+                                                      .withSize(true);
+        assertTrue(command.getSize());
+        InspectContainerResponse containerInfo  = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
         assertNotNull(containerInfo.getSizeRootFs());
+        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
     }
 
     @Test(expectedExceptions = NotFoundException.class)