Clean-up. · docker-java/docker-java@36a5ff5

File tree

8 files changed

lines changed

- main/java/com/github/dockerjava
- test/java/com/github/dockerjava

8 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,13 @@ public interface DockerClient extends Closeable {`
`186`	`186`	`*/`
`187`	`187`	`UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);`
`188`	`188`
	`189`	`+/**`
	`190`	`+ * Rename container.`
	`191`	`+ *`
	`192`	`+ * @param containerId id of the container`
	`193`	`+ * @return command`
	`194`	`+ * @since {@link RemoteApiVersion#VERSION_1_22}`
	`195`	`+ */`
`189`	`196`	`RenameContainerCmd renameContainerCmd(@Nonnull String containerId);`
`190`	`197`
`191`	`198`	`RestartContainerCmd restartContainerCmd(@Nonnull String containerId);`

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import javax.net.ssl.SSLContext;`
`7`	`7`
`8`	`8`	`import com.github.dockerjava.core.DockerClientConfig;`
	`9`	`+import com.github.dockerjava.core.RemoteApiVersion;`
`9`	`10`
`10`	`11`	`public interface DockerCmdExecFactory extends Closeable {`
`11`	`12`
`@@ -71,6 +72,11 @@ public interface DockerCmdExecFactory extends Closeable {`
`71`	`72`
`72`	`73`	`UpdateContainerCmd.Exec createUpdateContainerCmdExec();`
`73`	`74`
	`75`	`+/**`
	`76`	`+ * Rename container.`
	`77`	`+ *`
	`78`	`+ * @since {@link RemoteApiVersion#VERSION_1_22}`
	`79`	`+ */`
`74`	`80`	`RenameContainerCmd.Exec createRenameContainerCmdExec();`
`75`	`81`
`76`	`82`	`RestartContainerCmd.Exec createRestartContainerCmdExec();`

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import javax.annotation.Nonnull;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * rename a container.`
	`10`	`+ * Rename a container.`
`11`	`11`	`*`
`12`	`12`	`* @since {@link RemoteApiVersion#VERSION_1_22}`
`13`	`13`	`*/`
`@@ -23,7 +23,6 @@ public interface RenameContainerCmd extends SyncDockerCmd<Void> {`
`23`	`23`
`24`	`24`	`RenameContainerCmd withName(@Nonnull String name);`
`25`	`25`
`26`		`-`
`27`	`26`	`/**`
`28`	`27`	`* @throws com.github.dockerjava.api.exception.NotFoundException No such container`
`29`	`28`	`*/`

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,10 @@`
`4`	`4`	`import com.github.dockerjava.api.exception.NotFoundException;`
`5`	`5`
`6`	`6`	`import javax.annotation.Nonnull;`
	`7`	`+`
`7`	`8`	`import static com.google.common.base.Preconditions.checkNotNull;`
`8`	`9`
`9`		`-/**`
`10`		`- * rename a container.`
`11`		`- */`
`12`		`-public class RenameContainerCmdImpl extends AbstrDockerCmd<RenameContainerCmd, Void> implements RenameContainerCmd {`
	`10`	`+public class RenameContainerCmdImpl extends AbstrDockerCmd<RenameContainerCmd, Void> implements RenameContainerCmd {`
`13`	`11`
`14`	`12`	`private String containerId;`
`15`	`13`
`@@ -45,8 +43,7 @@ public RenameContainerCmd withName(@Nonnull String name) {`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`/**`
`48`		`- * @throws NotFoundException`
`49`		`- * No such container`
	`46`	`+ * @throws NotFoundException No such container`
`50`	`47`	`*/`
`51`	`48`	`@Override`
`52`	`49`	`public Void exec() throws NotFoundException {`

Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,23 @@`
`8`	`8`	`import org.slf4j.Logger;`
`9`	`9`	`import org.slf4j.LoggerFactory;`
`10`	`10`
`11`		`-public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void> implements RenameContainerCmd.Exec {`
`12`		`-`
`13`		`-private static final Logger LOGGER = LoggerFactory.getLogger(RenameContainerCmdExec.class);`
	`11`	`+public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>`
	`12`	`+ implements RenameContainerCmd.Exec {`
	`13`	`+private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);`
`14`	`14`
`15`	`15`	`public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {`
`16`	`16`	`super(baseResource, dockerClientConfig);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`protected Void execute(RenameContainerCmd command) {`
`21`		`-WebTarget webResource = getBaseResource().path("/containers/{id}/rename").resolveTemplate("id", command.getContainerId())`
	`21`	`+WebTarget webResource = getBaseResource().path("/containers/{id}/rename")`
	`22`	`+ .resolveTemplate("id", command.getContainerId())`
`22`	`23`	`.queryParam("name", command.getName());`
`23`	`24`
`24`		`-`
`25`		`-LOGGER.trace("POST: {}", webResource);`
	`25`	`+LOG.trace("POST: {}", webResource);`
`26`	`26`	`webResource.request().accept(MediaType.APPLICATION_JSON).post(null);`
`27`	`27`
`28`	`28`	`return null;`
`29`	`29`	`}`
`30`		`-`
`31`	`30`	`}`

Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,21 @@`
`7`	`7`	`import org.slf4j.Logger;`
`8`	`8`	`import org.slf4j.LoggerFactory;`
`9`	`9`
`10`		`-/**`
`11`		`- * rename a container.`
`12`		`- */`
`13`		`-public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void> implements RenameContainerCmd.Exec {`
`14`		`-`
`15`		`-private static final Logger LOGGER = LoggerFactory.getLogger(RenameContainerCmdExec.class);`
	`10`	`+public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>`
	`11`	`+implements RenameContainerCmd.Exec {`
	`12`	`+private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);`
`16`	`13`
`17`	`14`	`public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {`
`18`	`15`	`super(baseResource, dockerClientConfig);`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`@Override`
`22`	`19`	`protected Void execute(RenameContainerCmd command) {`
`23`		`-WebTarget webResource = getBaseResource().path("/containers/{id}/rename").resolveTemplate("id", command.getContainerId())`
	`20`	`+WebTarget webResource = getBaseResource().path("/containers/{id}/rename")`
	`21`	`+ .resolveTemplate("id", command.getContainerId())`
`24`	`22`	`.queryParam("name", command.getName());`
`25`	`23`
`26`		`-LOGGER.trace("POST: {}", webResource);`
	`24`	`+LOG.trace("POST: {}", webResource);`
`27`	`25`	`webResource.request().accept(MediaType.APPLICATION_JSON).post(null);`
`28`	`26`
`29`	`27`	`return null;`

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public void renameContainer() throws DockerException {`
`48`	`48`
`49`	`49`	`String name1 = inspectContainerResponse.getName();`
`50`	`50`
`51`		`-dockerClient.renameContainerCmd(container.getId()).withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec();`
	`51`	`+dockerClient.renameContainerCmd(container.getId())`
	`52`	`+ .withName(getClass().getCanonicalName() + "renameContainer")`
	`53`	`+ .exec();`
`52`	`54`
`53`	`55`	`InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();`
`54`	`56`	`LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());`
`@@ -60,13 +62,10 @@ public void renameContainer() throws DockerException {`
`60`	`62`	`dockerClient.killContainerCmd(container.getId()).exec();`
`61`	`63`	`}`
`62`	`64`
`63`		`-@Test`
	`65`	`+@Test(expectedExceptions = NotFoundException.class)`
`64`	`66`	`public void renameExistingContainer() throws DockerException, InterruptedException {`
`65`		`-try {`
`66`		`-dockerClient.renameContainerCmd("non-existing").withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec();`
`67`		`-fail("expected NotFoundException");`
`68`		`- } catch (NotFoundException e) {`
`69`		`- }`
`70`		`-`
	`67`	`+dockerClient.renameContainerCmd("non-existing")`
	`68`	`+ .withName(getClass().getCanonicalName() + "renameExistingContainer")`
	`69`	`+ .exec();`
`71`	`70`	`}`
`72`	`71`	`}`

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public void renameContainer() throws DockerException {`
`48`	`48`
`49`	`49`	`String name1 = inspectContainerResponse.getName();`
`50`	`50`
`51`		`-dockerClient.renameContainerCmd(container.getId()).withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec();`
	`51`	`+dockerClient.renameContainerCmd(container.getId())`
	`52`	`+ .withName(getClass().getCanonicalName() + "renameContainer")`
	`53`	`+ .exec();`
`52`	`54`
`53`	`55`	`InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();`
`54`	`56`	`LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());`
`@@ -60,14 +62,10 @@ public void renameContainer() throws DockerException {`
`60`	`62`	`dockerClient.killContainerCmd(container.getId()).exec();`
`61`	`63`	`}`
`62`	`64`
`63`		`-@Test`
	`65`	`+@Test(expectedExceptions = NotFoundException.class)`
`64`	`66`	`public void renameNonExistingContainer() throws DockerException, InterruptedException {`
`65`		`-try {`
`66`		`-dockerClient.renameContainerCmd("non-existing").withName(String.valueOf(System.currentTimeMillis())+String.valueOf(System.nanoTime())).exec();`
`67`		`-fail("expected NotFoundException");`
`68`		`- } catch (NotFoundException e) {`
`69`		`- }`
`70`		`-`
	`67`	`+dockerClient.renameContainerCmd("non-existing")`
	`68`	`+ .withName(getClass().getCanonicalName() + "renameExistingContainer")`
	`69`	`+ .exec();`
`71`	`70`	`}`
`72`		`-`
`73`	`71`	`}`