Merge branch 'AddSizeRootFs' of https://github.com/AE9999/docker-java into AE9999-AddSizeRootFs

Marcus Linke · Marcus Linke · commit e72935b6ba5a · 2016-05-12T19:45:25.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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);
diff --git 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;
@@ -63,6 +64,24 @@ 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()));
+
+        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)
     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
@@ -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;
@@ -63,6 +64,25 @@ 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()));
+
+        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)
     public void inspectNonExistingContainer() throws DockerException {
         dockerClient.inspectContainerCmd("non-existing").exec();
