Resize container and exec

xuchenCN · KostyaSha · commit 76be3979069c · 2019-08-22T16:50:33.000+03:00
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -54,6 +54,8 @@
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -157,6 +159,8 @@ public interface DockerClient extends Closeable {
      */
     StartContainerCmd startContainerCmd(@Nonnull String containerId);
 
+    ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId);
+
     ExecCreateCmd execCreateCmd(@Nonnull String containerId);
 
     InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
@@ -169,6 +173,8 @@ public interface DockerClient extends Closeable {
 
     ExecStartCmd execStartCmd(@Nonnull String execId);
 
+    ResizeExecCmd resizeExecCmd(@Nonnull String execId);
+
     InspectExecCmd inspectExecCmd(@Nonnull String execId);
 
     LogContainerCmd logContainerCmd(@Nonnull String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -52,8 +52,12 @@ public interface DockerCmdExecFactory extends Closeable {
 
     AttachContainerCmd.Exec createAttachContainerCmdExec();
 
+    ResizeContainerCmd.Exec createResizeContainerCmdExec();
+
     ExecStartCmd.Exec createExecStartCmdExec();
 
+    ResizeExecCmd.Exec createResizeExecCmdExec();
+
     InspectExecCmd.Exec createInspectExecCmdExec();
 
     LogContainerCmd.Exec createLogContainerCmdExec();
diff --git a/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.api.command;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+public interface ResizeContainerCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getContainerId();
+
+    Integer getHeight();
+
+    Integer getWidth();
+
+    ResizeContainerCmd withContainerId(@Nonnull String execId);
+
+    ResizeContainerCmd withSize(int height, int width);
+
+    /**
+     *
+     * @throws NotFoundException
+     *             No such container instance
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ResizeContainerCmd, Void> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java b/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.api.command;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+public interface ResizeExecCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getExecId();
+
+    Integer getHeight();
+
+    Integer getWidth();
+
+    ResizeExecCmd withExecId(@Nonnull String execId);
+
+    ResizeExecCmd withSize(int height, int width);
+
+    /**
+     *
+     * @throws NotFoundException
+     *             No such exec instance
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ResizeExecCmd, Void> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -56,6 +56,8 @@
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -131,6 +133,8 @@
 import com.github.dockerjava.core.command.RemoveServiceCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
+import com.github.dockerjava.core.command.ResizeContainerCmdImpl;
+import com.github.dockerjava.core.command.ResizeExecCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
 import com.github.dockerjava.core.command.SearchImagesCmdImpl;
@@ -356,11 +360,21 @@ public AttachContainerCmd attachContainerCmd(String containerId) {
         return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId);
     }
 
+    @Override
+    public ResizeContainerCmd resizeContainerCmd(String containerId) {
+        return new ResizeContainerCmdImpl(getDockerCmdExecFactory().createResizeContainerCmdExec(), containerId);
+    }
+
     @Override
     public ExecStartCmd execStartCmd(String execId) {
         return new ExecStartCmdImpl(getDockerCmdExecFactory().createExecStartCmdExec(), execId);
     }
 
+    @Override
+    public ResizeExecCmd resizeExecCmd(String execId) {
+        return new ResizeExecCmdImpl(getDockerCmdExecFactory().createResizeExecCmdExec(), execId);
+    }
+
     @Override
     public InspectExecCmd inspectExecCmd(String execId) {
         return new InspectExecCmdImpl(getDockerCmdExecFactory().createInspectExecCmdExec(), execId);
diff --git a/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+@JsonInclude(Include.NON_NULL)
+public class ResizeContainerCmdImpl extends AbstrDockerCmd<ResizeContainerCmd, Void> implements ResizeContainerCmd {
+
+    private String containerId;
+
+    private Integer height;
+
+    private Integer width;
+
+    public ResizeContainerCmdImpl(ResizeContainerCmd.Exec exec, String execId) {
+        super(exec);
+        withContainerId(execId);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    @Override
+    public ResizeContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public ResizeContainerCmd withSize(int height, int width) {
+        this.height = height;
+        this.width = width;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such exec instance
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+@JsonInclude(Include.NON_NULL)
+public class ResizeExecCmdImpl extends AbstrDockerCmd<ResizeExecCmd, Void> implements ResizeExecCmd {
+
+    private String execId;
+
+    private Integer height;
+
+    private Integer width;
+
+    public ResizeExecCmdImpl(ResizeExecCmd.Exec exec, String execId) {
+        super(exec);
+        withExecId(execId);
+    }
+
+    @Override
+    public String getExecId() {
+        return execId;
+    }
+
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    @Override
+    public ResizeExecCmd withExecId(String execId) {
+        checkNotNull(execId, "execId was not specified");
+        this.execId = execId;
+        return this;
+    }
+
+    @Override
+    public ResizeExecCmd withSize(int height, int width) {
+        this.height = height;
+        this.width = width;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such exec instance
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -60,6 +60,8 @@
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd.Exec;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -424,11 +426,21 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() {
         return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public Exec createResizeContainerCmdExec() {
+        return new ResizeContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public ExecStartCmd.Exec createExecStartCmdExec() {
         return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ResizeExecCmd.Exec createResizeExecCmdExec() {
+        return new ResizeExecCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
         return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ResizeContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ResizeContainerCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec<ResizeContainerCmd, Void> implements ResizeContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class);
+
+    public ResizeContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ResizeContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/resize").resolveTemplate("id", command.getContainerId())
+                .queryParam("h", command.getHeight()).queryParam("w", command.getWidth());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ResizeExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ResizeExecCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec<ResizeExecCmd, Void> implements ResizeExecCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResizeExecCmdExec.class);
+
+    public ResizeExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ResizeExecCmd command) {
+        WebTarget webResource = getBaseResource().path("/exec/{id}/resize").resolveTemplate("id", command.getExecId())
+                .queryParam("h", command.getHeight()).queryParam("w", command.getWidth());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -17,6 +17,10 @@
 import com.github.dockerjava.core.WebTarget;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.netty.exec.ResizeContainerCmdExec;
+import com.github.dockerjava.netty.exec.ResizeExecCmdExec;
 import org.apache.commons.lang.SystemUtils;
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -118,7 +122,6 @@ public void init(DockerClientConfig dockerClientConfig) {
         baseResource = new NettyWebTarget(channelProvider, host).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
-
     private DuplexChannel connect() {
         try {
             return connect(bootstrap);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ResizeContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ResizeContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ResizeExecCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ResizeExecCmdExec.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ResizeCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ResizeCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
