Skip to content

Commit c7f3d02

Browse files
KostyaShaKostyaSha
committed
Fixup
1 parent 76be397 commit c7f3d02

File tree

6 files changed

+37
-22
lines changed

6 files changed

+37
-22
lines changed

‎src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
5858
import com.github.dockerjava.api.command.RemoveVolumeCmd;
5959
import com.github.dockerjava.api.command.RenameContainerCmd;
60+
import com.github.dockerjava.api.command.ResizeContainerCmd;
61+
import com.github.dockerjava.api.command.ResizeExecCmd;
6062
import com.github.dockerjava.api.command.RestartContainerCmd;
6163
import com.github.dockerjava.api.command.SaveImageCmd;
6264
import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -128,6 +130,8 @@
128130
import com.github.dockerjava.core.exec.RemoveSwarmNodeCmdExec;
129131
import com.github.dockerjava.core.exec.RemoveVolumeCmdExec;
130132
import com.github.dockerjava.core.exec.RenameContainerCmdExec;
133+
import com.github.dockerjava.core.exec.ResizeContainerCmdExec;
134+
import com.github.dockerjava.core.exec.ResizeExecCmdExec;
131135
import com.github.dockerjava.core.exec.RestartContainerCmdExec;
132136
import com.github.dockerjava.core.exec.SaveImageCmdExec;
133137
import com.github.dockerjava.core.exec.SearchImagesCmdExec;
@@ -282,6 +286,16 @@ public ExecStartCmd.Exec createExecStartCmdExec() {
282286
return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
283287
}
284288

289+
@Override
290+
public ResizeContainerCmd.Exec createResizeContainerCmdExec() {
291+
return new ResizeContainerCmdExec(getBaseResource(), getDockerClientConfig());
292+
}
293+
294+
@Override
295+
public ResizeExecCmd.Exec createResizeExecCmdExec() {
296+
return new ResizeExecCmdExec(getBaseResource(), getDockerClientConfig());
297+
}
298+
285299
@Override
286300
public InspectExecCmd.Exec createInspectExecCmdExec() {
287301
return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());

‎src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConf
2020

2121
@Override
2222
protected String execute(CommitCmd command) {
23-
WebTarget webTarget = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
24-
.queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
25-
.queryParam("m", command.getMessage()).queryParam("author", command.getAuthor());
23+
WebTarget webTarget = getBaseResource().path("/commit")
24+
.queryParam("container", command.getContainerId())
25+
.queryParam("repo", command.getRepository())
26+
.queryParam("tag", command.getTag())
27+
.queryParam("m", command.getMessage())
28+
.queryParam("author", command.getAuthor());
2629

2730
webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
2831

‎src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import com.github.dockerjava.core.MediaType;
1111
import com.github.dockerjava.core.WebTarget;
1212

13-
public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
14-
ExecCreateCmd.Exec {
13+
public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements ExecCreateCmd.Exec {
1514

1615
private static final Logger LOGGER = LoggerFactory.getLogger(ExecCreateCmdExec.class);
1716

src/main/java/com/github/dockerjava/netty/exec/ResizeContainerCmdExec.java renamed to src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package com.github.dockerjava.netty.exec;
2-
3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
1+
package com.github.dockerjava.core.exec;
52

63
import com.github.dockerjava.api.command.ResizeContainerCmd;
74
import com.github.dockerjava.core.DockerClientConfig;
8-
import com.github.dockerjava.netty.MediaType;
9-
import com.github.dockerjava.netty.WebTarget;
5+
import com.github.dockerjava.core.MediaType;
6+
import com.github.dockerjava.core.WebTarget;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
109

1110
public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec<ResizeContainerCmd, Void> implements ResizeContainerCmd.Exec {
1211

@@ -18,8 +17,10 @@ public ResizeContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
1817

1918
@Override
2019
protected Void execute(ResizeContainerCmd command) {
21-
WebTarget webResource = getBaseResource().path("/containers/{id}/resize").resolveTemplate("id", command.getContainerId())
22-
.queryParam("h", command.getHeight()).queryParam("w", command.getWidth());
20+
WebTarget webResource = getBaseResource().path("/containers/{id}/resize")
21+
.resolveTemplate("id", command.getContainerId())
22+
.queryParam("h", command.getHeight())
23+
.queryParam("w", command.getWidth());
2324

2425
LOGGER.trace("POST: {}", webResource);
2526
webResource.request().accept(MediaType.APPLICATION_JSON).post(command);

src/main/java/com/github/dockerjava/netty/exec/ResizeExecCmdExec.java renamed to src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.github.dockerjava.netty.exec;
1+
package com.github.dockerjava.core.exec;
22

3+
import com.github.dockerjava.core.MediaType;
4+
import com.github.dockerjava.core.WebTarget;
35
import org.slf4j.Logger;
46
import org.slf4j.LoggerFactory;
57

68
import com.github.dockerjava.api.command.ResizeExecCmd;
79
import com.github.dockerjava.core.DockerClientConfig;
8-
import com.github.dockerjava.netty.MediaType;
9-
import com.github.dockerjava.netty.WebTarget;
1010

1111
public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec<ResizeExecCmd, Void> implements ResizeExecCmd.Exec {
1212

@@ -18,8 +18,10 @@ public ResizeExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClient
1818

1919
@Override
2020
protected Void execute(ResizeExecCmd command) {
21-
WebTarget webResource = getBaseResource().path("/exec/{id}/resize").resolveTemplate("id", command.getExecId())
22-
.queryParam("h", command.getHeight()).queryParam("w", command.getWidth());
21+
WebTarget webResource = getBaseResource().path("/exec/{id}/resize")
22+
.resolveTemplate("id", command.getExecId())
23+
.queryParam("h", command.getHeight())
24+
.queryParam("w", command.getWidth());
2325

2426
LOGGER.trace("POST: {}", webResource);
2527
webResource.request().accept(MediaType.APPLICATION_JSON).post(command);

‎src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
import com.github.dockerjava.core.WebTarget;
1818
import io.netty.util.concurrent.Future;
1919
import io.netty.util.concurrent.GenericFutureListener;
20-
import com.github.dockerjava.api.command.ResizeContainerCmd;
21-
import com.github.dockerjava.api.command.ResizeExecCmd;
22-
import com.github.dockerjava.netty.exec.ResizeContainerCmdExec;
23-
import com.github.dockerjava.netty.exec.ResizeExecCmdExec;
2420
import org.apache.commons.lang.SystemUtils;
2521

2622
import com.github.dockerjava.api.command.DockerCmdExecFactory;

0 commit comments

Comments
 (0)