From faf0be8646aa5f5ae6511f7ba2cadd5255ce96ba Mon Sep 17 00:00:00 2001 From: lujian <254461627@qq.com> Date: Thu, 17 Mar 2016 10:13:41 +0800 Subject: [PATCH 1/4] RenameContainer --- .../github/dockerjava/api/DockerClient.java | 3 + .../api/command/DockerCmdExecFactory.java | 2 + .../api/command/RenameContainerCmd.java | 36 +++++++++ .../dockerjava/core/DockerClientImpl.java | 7 ++ .../core/command/RenameContainerCmdImpl.java | 56 ++++++++++++++ .../jaxrs/DockerCmdExecFactoryImpl.java | 6 ++ .../jaxrs/RenameContainerCmdExec.java | 34 +++++++++ .../netty/DockerCmdExecFactoryImpl.java | 7 ++ .../netty/exec/RenameContainerCmdExec.java | 32 ++++++++ .../core/TestDockerCmdExecFactory.java | 5 ++ .../command/RenameContainerCmdImplTest.java | 75 ++++++++++++++++++ .../exec/RenameContainerCmdExecTest.java | 76 +++++++++++++++++++ 12 files changed, 339 insertions(+) create mode 100644 src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java create mode 100644 src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java create mode 100644 src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java index 3ceabf3e7..64ee5e6fa 100644 --- a/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -56,6 +56,7 @@ import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.command.VersionCmd; import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Identifier; @@ -185,6 +186,8 @@ public interface DockerClient extends Closeable { */ UpdateContainerCmd updateContainerCmd(@Nonnull String containerId); + RenameContainerCmd renameContainerCmd(@Nonnull String containerId); + RestartContainerCmd restartContainerCmd(@Nonnull String containerId); CommitCmd commitCmd(@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 index 8cc42cf15..f803820af 100644 --- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -71,6 +71,8 @@ public interface DockerCmdExecFactory extends Closeable { UpdateContainerCmd.Exec createUpdateContainerCmdExec(); + RenameContainerCmd.Exec createRenameContainerCmdExec(); + RestartContainerCmd.Exec createRestartContainerCmdExec(); CommitCmd.Exec createCommitCmdExec(); diff --git a/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java new file mode 100644 index 000000000..52ba5270a --- /dev/null +++ b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java @@ -0,0 +1,36 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.core.RemoteApiVersion; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +/** + * rename a container. + * + * Created by lujian on 16/3/16. + * @since {@link RemoteApiVersion#VERSION_1_22} + */ +public interface RenameContainerCmd extends SyncDockerCmd { + + @CheckForNull + String getContainerId(); + + RenameContainerCmd withContainerId(@Nonnull String containerId); + + @CheckForNull + String getName(); + + RenameContainerCmd withName(@Nonnull String name); + + + /** + * @throws com.github.dockerjava.api.exception.NotFoundException No such container + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } +} diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 9d342e249..9f4f0f88b 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -58,6 +58,7 @@ import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.command.VersionCmd; import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Identifier; import com.github.dockerjava.core.command.AttachContainerCmdImpl; @@ -109,6 +110,7 @@ import com.github.dockerjava.core.command.UpdateContainerCmdImpl; import com.github.dockerjava.core.command.VersionCmdImpl; import com.github.dockerjava.core.command.WaitContainerCmdImpl; +import com.github.dockerjava.core.command.RenameContainerCmdImpl; import javax.annotation.Nonnull; @@ -364,6 +366,11 @@ public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) { return new UpdateContainerCmdImpl(getDockerCmdExecFactory().createUpdateContainerCmdExec(), containerId); } + @Override + public RenameContainerCmd renameContainerCmd(@Nonnull String containerId) { + return new RenameContainerCmdImpl(getDockerCmdExecFactory().createRenameContainerCmdExec(), containerId); + } + @Override public RestartContainerCmd restartContainerCmd(String containerId) { return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId); diff --git a/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java new file mode 100644 index 000000000..73fdece21 --- /dev/null +++ b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java @@ -0,0 +1,56 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.Nonnull; +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * rename a container. + * Created by lujian on 16/3/16. + */ +public class RenameContainerCmdImpl extends AbstrDockerCmd implements RenameContainerCmd { + + private String containerId; + + private String name; + + public RenameContainerCmdImpl(RenameContainerCmd.Exec exec, String containerId) { + super(exec); + withContainerId(containerId); + } + + @Override + public String getContainerId() { + return containerId; + } + + @Override + public String getName() { + return name; + } + + @Override + public RenameContainerCmd withContainerId(String containerId) { + checkNotNull(containerId, "containerId was not specified"); + this.containerId = containerId; + return this; + } + + @Override + public RenameContainerCmd withName(@Nonnull String name) { + checkNotNull(name, "name was not specified"); + this.name = name; + return this; + } + + /** + * @throws NotFoundException + * No such container + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java index 4716877af..f64cf4e2b 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java +++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java @@ -80,6 +80,7 @@ import com.github.dockerjava.api.command.UnpauseContainerCmd; import com.github.dockerjava.api.command.VersionCmd; import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.LocalDirectorySSLConfig; @@ -417,6 +418,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec() { + return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public RestartContainerCmd.Exec createRestartContainerCmdExec() { return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java new file mode 100644 index 000000000..82b246143 --- /dev/null +++ b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.jaxrs; + +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; + +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Created by lujian on 16/3/17. + */ +public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(RenameContainerCmdExec.class); + + public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(RenameContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/rename").resolveTemplate("id", command.getContainerId()) + .queryParam("name", command.getName()); + + + LOGGER.trace("POST: {}", webResource); + webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + + return null; + } + +} diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java index 1210c56bc..08a0179a1 100644 --- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java +++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java @@ -50,6 +50,7 @@ import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.command.VersionCmd; import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.core.LocalDirectorySSLConfig; @@ -102,6 +103,7 @@ import com.github.dockerjava.netty.exec.UpdateContainerCmdExec; import com.github.dockerjava.netty.exec.VersionCmdExec; import com.github.dockerjava.netty.exec.WaitContainerCmdExec; +import com.github.dockerjava.netty.exec.RenameContainerCmdExec; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelInitializer; @@ -465,6 +467,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec() { + return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public RestartContainerCmd.Exec createRestartContainerCmdExec() { return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java new file mode 100644 index 000000000..29a067ca4 --- /dev/null +++ b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java @@ -0,0 +1,32 @@ +package com.github.dockerjava.netty.exec; + +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.netty.MediaType; +import com.github.dockerjava.netty.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * rename a container. + * Created by lujian on 16/3/17. + */ +public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(RenameContainerCmdExec.class); + + public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(RenameContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/rename").resolveTemplate("id", command.getContainerId()) + .queryParam("name", command.getName()); + + LOGGER.trace("POST: {}", webResource); + webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + + return null; + } +} diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java index b2b86601c..ba05ab4e3 100644 --- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java +++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java @@ -240,6 +240,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { return delegate.createUpdateContainerCmdExec(); } + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec(){ + return delegate.createRenameContainerCmdExec(); + } + @Override public RestartContainerCmd.Exec createRestartContainerCmdExec() { return delegate.createRestartContainerCmdExec(); diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java new file mode 100644 index 000000000..ea4113870 --- /dev/null +++ b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java @@ -0,0 +1,75 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.client.AbstractDockerClientTest; +import org.testng.ITestResult; +import org.testng.annotations.*; + +import java.lang.reflect.Method; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; + +/** + * Created by lujian on 16/3/17. + */ +@Test(groups = "integration") +public class RenameContainerCmdImplTest extends AbstractDockerClientTest { + @BeforeTest + public void beforeTest() throws Exception { + super.beforeTest(); + } + + @AfterTest + public void afterTest() { + super.afterTest(); + } + + @BeforeMethod + public void beforeMethod(Method method) { + super.beforeMethod(method); + } + + @AfterMethod + public void afterMethod(ITestResult result) { + super.afterMethod(result); + } + + @Test + public void renameContainer() throws DockerException { + + CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec(); + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(isEmptyString())); + dockerClient.startContainerCmd(container.getId()).exec(); + + InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); + LOG.info("Container Inspect: {}", inspectContainerResponse.toString()); + + String name1 = inspectContainerResponse.getName(); + + dockerClient.renameContainerCmd(container.getId()).withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec(); + + InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec(); + LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString()); + + String name2 = inspectContainerResponse2.getName(); + + assertNotEquals(name1, name2); + + dockerClient.killContainerCmd(container.getId()).exec(); + } + + @Test + public void renameExistingContainer() throws DockerException, InterruptedException { + try { + dockerClient.renameContainerCmd("non-existing").exec(); + fail("expected NotFoundException"); + } catch (NotFoundException e) { + } + + } +} diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java new file mode 100644 index 000000000..4a6656c11 --- /dev/null +++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java @@ -0,0 +1,76 @@ +package com.github.dockerjava.netty.exec; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.netty.AbstractNettyDockerClientTest; +import org.testng.ITestResult; +import org.testng.annotations.*; + +import java.lang.reflect.Method; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; + +/** + * Created by lujian on 16/3/17. + */ +@Test(groups = "integration") +public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest { + + @BeforeTest + public void beforeTest() throws Exception { + super.beforeTest(); + } + + @AfterTest + public void afterTest() { + super.afterTest(); + } + + @BeforeMethod + public void beforeMethod(Method method) { + super.beforeMethod(method); + } + + @AfterMethod + public void afterMethod(ITestResult result) { + super.afterMethod(result); + } + + @Test + public void restartContainer() throws DockerException { + CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec(); + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(isEmptyString())); + dockerClient.startContainerCmd(container.getId()).exec(); + + InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); + LOG.info("Container Inspect: {}", inspectContainerResponse.toString()); + + String name1 = inspectContainerResponse.getName(); + + dockerClient.renameContainerCmd(container.getId()).withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec(); + + InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec(); + LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString()); + + String name2 = inspectContainerResponse2.getName(); + + assertNotEquals(name1, name2); + + dockerClient.killContainerCmd(container.getId()).exec(); + } + + @Test + public void restartNonExistingContainer() throws DockerException, InterruptedException { + try { + dockerClient.restartContainerCmd("non-existing").exec(); + fail("expected NotFoundException"); + } catch (NotFoundException e) { + } + + } + +} From 8046e45c5d51298305a8e4d187718f2e17955119 Mon Sep 17 00:00:00 2001 From: lujian <254461627@qq.com> Date: Thu, 17 Mar 2016 19:29:57 +0800 Subject: [PATCH 2/4] RenameContainer --- .../dockerjava/netty/exec/RenameContainerCmdExecTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java index 4a6656c11..a283f2d64 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java @@ -40,7 +40,7 @@ public void afterMethod(ITestResult result) { } @Test - public void restartContainer() throws DockerException { + public void renameContainer() throws DockerException { CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); assertThat(container.getId(), not(isEmptyString())); @@ -64,7 +64,7 @@ public void restartContainer() throws DockerException { } @Test - public void restartNonExistingContainer() throws DockerException, InterruptedException { + public void renameNonExistingContainer() throws DockerException, InterruptedException { try { dockerClient.restartContainerCmd("non-existing").exec(); fail("expected NotFoundException"); From 5c5ed1b21ce513e4d5bd56ad7eede3bda0f8b9f9 Mon Sep 17 00:00:00 2001 From: lujian <254461627@qq.com> Date: Thu, 17 Mar 2016 19:33:08 +0800 Subject: [PATCH 3/4] RenameContainer test --- .../dockerjava/core/command/RenameContainerCmdImplTest.java | 2 +- .../dockerjava/netty/exec/RenameContainerCmdExecTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java index ea4113870..f1ff4b784 100644 --- a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java @@ -66,7 +66,7 @@ public void renameContainer() throws DockerException { @Test public void renameExistingContainer() throws DockerException, InterruptedException { try { - dockerClient.renameContainerCmd("non-existing").exec(); + dockerClient.renameContainerCmd("non-existing").withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec(); fail("expected NotFoundException"); } catch (NotFoundException e) { } diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java index a283f2d64..86c027d11 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java @@ -66,7 +66,7 @@ public void renameContainer() throws DockerException { @Test public void renameNonExistingContainer() throws DockerException, InterruptedException { try { - dockerClient.restartContainerCmd("non-existing").exec(); + dockerClient.renameContainerCmd("non-existing").withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec(); fail("expected NotFoundException"); } catch (NotFoundException e) { } From 8a160702ebdd67cb8cb8c22875f12dfccd5be18e Mon Sep 17 00:00:00 2001 From: lujian <254461627@qq.com> Date: Thu, 17 Mar 2016 19:38:40 +0800 Subject: [PATCH 4/4] remove same notes --- .../github/dockerjava/api/command/RenameContainerCmd.java | 1 - .../dockerjava/core/command/RenameContainerCmdImpl.java | 1 - .../com/github/dockerjava/jaxrs/RenameContainerCmdExec.java | 3 --- .../github/dockerjava/netty/exec/RenameContainerCmdExec.java | 1 - .../dockerjava/core/command/RenameContainerCmdImplTest.java | 3 --- .../dockerjava/netty/exec/RenameContainerCmdExecTest.java | 5 +---- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java index 52ba5270a..3cf78386f 100644 --- a/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java @@ -9,7 +9,6 @@ /** * rename a container. * - * Created by lujian on 16/3/16. * @since {@link RemoteApiVersion#VERSION_1_22} */ public interface RenameContainerCmd extends SyncDockerCmd { diff --git a/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java index 73fdece21..f22e45cc2 100644 --- a/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java @@ -8,7 +8,6 @@ /** * rename a container. - * Created by lujian on 16/3/16. */ public class RenameContainerCmdImpl extends AbstrDockerCmd implements RenameContainerCmd { diff --git a/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java index 82b246143..87e7628d3 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java @@ -8,9 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * Created by lujian on 16/3/17. - */ public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(RenameContainerCmdExec.class); diff --git a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java index 29a067ca4..3afc8893e 100644 --- a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java +++ b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java @@ -9,7 +9,6 @@ /** * rename a container. - * Created by lujian on 16/3/17. */ public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java index f1ff4b784..675c4cee7 100644 --- a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java @@ -13,9 +13,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -/** - * Created by lujian on 16/3/17. - */ @Test(groups = "integration") public class RenameContainerCmdImplTest extends AbstractDockerClientTest { @BeforeTest diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java index 86c027d11..f606af50f 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java @@ -13,11 +13,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -/** - * Created by lujian on 16/3/17. - */ @Test(groups = "integration") -public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest { +public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest { @BeforeTest public void beforeTest() throws Exception {