diff --git a/README.md b/README.md index e77d4ada3..92068f1d1 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/ ###### Prerequisites: -* Java 1.6+ +* Java 1.7+ * Maven 3.0.5 * Docker daemon running diff --git a/pom.xml b/pom.xml index 1ed10c4ff..431c0a0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,8 @@ UTF-8 true false - 1.6 - 1.6 + 1.7 + 1.7 1.6.1 diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java index 3420773a4..aeff50f29 100644 --- a/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -113,6 +113,7 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd( public UnpauseContainerCmd unpauseContainerCmd(String containerId); + @Override public void close() throws IOException; } \ No newline at end of file diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java index effb8292f..ac0a7bb5e 100644 --- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java @@ -1,7 +1,5 @@ package com.github.dockerjava.api.command; -import java.io.InputStream; - import com.github.dockerjava.api.NotFoundException; import com.github.dockerjava.api.model.ExposedPorts; import com.github.dockerjava.api.model.Volumes; @@ -108,6 +106,7 @@ public interface CommitCmd extends DockerCmd{ /** * @throws NotFoundException No such container */ + @Override public String exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java index 516ea3650..21d99045d 100644 --- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java @@ -13,6 +13,7 @@ public interface ContainerDiffCmd extends DockerCmd> { public ContainerDiffCmd withContainerId(String containerId); + @Override public String toString(); /** @@ -20,6 +21,7 @@ public interface ContainerDiffCmd extends DockerCmd> { * @throws InternalServerErrorException server error * @throws DockerException unexpected http status code */ + @Override public List exec() throws NotFoundException; public static interface Exec extends DockerCmdExec> { diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java index 0ebd3cc10..8d2bfbb41 100644 --- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java @@ -21,6 +21,7 @@ public interface CopyFileFromContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public InputStream exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { 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 6534bb547..a58f65877 100644 --- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -69,6 +69,7 @@ public interface DockerCmdExecFactory extends Closeable { public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec(); + @Override public void close() throws IOException; } \ No newline at end of file diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java index ca6a9a695..f67fe4aea 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java @@ -11,6 +11,7 @@ public interface InspectContainerCmd extends DockerCmd /** * @throws NotFoundException No such container */ + @Override public InspectContainerResponse exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java index f25234879..d064badba 100644 --- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java @@ -14,6 +14,7 @@ public interface InspectImageCmd extends DockerCmd{ /** * @throws NotFoundException No such image */ + @Override public InspectImageResponse exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java index aff39f9e5..b9522cb8c 100644 --- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java @@ -18,6 +18,7 @@ public interface KillContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java index e0f20f9a8..36a41beb5 100644 --- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java @@ -58,6 +58,7 @@ public interface LogContainerCmd extends DockerCmd{ /** * @throws NotFoundException No such container */ + @Override public InputStream exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java index a05733f94..652d433e4 100644 --- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java @@ -17,6 +17,7 @@ public interface PauseContainerCmd extends DockerCmd{ /** * @throws NotFoundException No such container */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java index cd3e66814..3f2e9aa9c 100644 --- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java @@ -26,6 +26,7 @@ public interface PushImageCmd extends DockerCmd{ /** * @throws NotFoundException No such image */ + @Override public InputStream exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java index be9b9d259..b9c1f9437 100644 --- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java @@ -27,6 +27,7 @@ public interface RemoveContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java index 021a37665..58be790c2 100644 --- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java @@ -26,6 +26,7 @@ public interface RemoveImageCmd extends DockerCmd{ /** * @throws NotFoundException No such image */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java index 793919c24..8da41d38a 100644 --- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java @@ -21,6 +21,7 @@ public interface RestartContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java index 8f0a9d8cf..3f35f8543 100644 --- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java @@ -52,6 +52,7 @@ public interface StartContainerCmd extends DockerCmd { * @throws NotFoundException No such container * @throws NotModifiedException Container already started */ + @Override public Void exec() throws NotFoundException, NotModifiedException; public abstract String getNetworkMode(); diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java index 7e706c06e..19c248552 100644 --- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java @@ -24,6 +24,7 @@ public interface StopContainerCmd extends DockerCmd { * @throws NotFoundException No such container * @throws NotModifiedException Container already stopped */ + @Override public Void exec() throws NotFoundException, NotModifiedException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java index c7818a79d..63865c2a6 100644 --- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java @@ -18,6 +18,7 @@ public interface TopContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public TopContainerResponse exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java index e74df14cf..166bfa6a8 100644 --- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java @@ -17,6 +17,7 @@ public interface UnpauseContainerCmd extends DockerCmd { /** * @throws NotFoundException No such container */ + @Override public Void exec() throws NotFoundException; public static interface Exec extends DockerCmdExec { diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java index 5a182c044..969243f62 100644 --- a/src/main/java/com/github/dockerjava/api/model/Ports.java +++ b/src/main/java/com/github/dockerjava/api/model/Ports.java @@ -7,6 +7,7 @@ import java.util.Map.Entry; import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.ToStringStyle; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -20,6 +21,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.node.NullNode; + import org.apache.commons.lang.builder.ToStringBuilder; @JsonDeserialize(using = Ports.Deserializer.class) @@ -81,7 +83,7 @@ public int getHostPort() { @Override public String toString() { - return ToStringBuilder.reflectionToString(this); + return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); } @Override @@ -91,9 +93,19 @@ public boolean equals(Object obj) { return new EqualsBuilder() .append(hostIp, other.getHostIp()) .append(hostPort, other.getHostPort()).isEquals(); - } else - return super.equals(obj); + } else { + return super.equals(obj); + } } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((hostIp == null) ? 0 : hostIp.hashCode()); + result = prime * result + hostPort; + return result; + } } diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java index 2cf341bdc..de2621648 100644 --- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java +++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java @@ -3,6 +3,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import java.io.*; @@ -26,7 +27,8 @@ public static File archiveTARFiles(File base, Iterable files, String archi tos.putArchiveEntry(tarEntry); if (!file.isDirectory()) { - FileUtils.copyFile(file, tos); + InputStream fileStream = new FileInputStream(file); + IOUtils.copy(fileStream, tos); } tos.closeArchiveEntry(); } diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 812127e3f..c36921765 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -55,7 +55,8 @@ public DockerCmdExecFactory getDockerCmdExecFactory() { } - public AuthConfig authConfig() { + @Override + public AuthConfig authConfig() { checkNotNull(dockerClientConfig.getUsername(), "Configured username is null."); checkNotNull(dockerClientConfig.getPassword(), "Configured password is null."); checkNotNull(dockerClientConfig.getEmail(), "Configured email is null."); diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java index 3fc9329fa..2892676b6 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java @@ -29,7 +29,7 @@ public Void exec(AuthCmd command) { if(response.getStatus() == 401) { throw new UnauthorizedException("Unauthorized"); - }; + } return null; } diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java index 06852c03a..7f942c990 100644 --- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java +++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java @@ -26,20 +26,25 @@ public class DockerClientTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(DockerClientTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java index fbd1d171d..1684d9176 100644 --- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java @@ -18,21 +18,25 @@ public class AuthCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java index b689c81df..4cae4157b 100644 --- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java @@ -30,21 +30,25 @@ public class BuildImageCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java index bc69d9507..ab0fe48ff 100644 --- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java @@ -23,21 +23,25 @@ public class CommitCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java index c689e220a..76e64a3d9 100644 --- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java @@ -24,21 +24,25 @@ public class ContainerDiffCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java index 15c6d80e2..6065aaa02 100644 --- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java @@ -14,22 +14,26 @@ public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest { - @BeforeTest + @Override + @BeforeTest public void beforeTest() { super.beforeTest(); } - @AfterTest + @Override + @AfterTest public void afterTest() { super.afterTest(); } - @BeforeMethod + @Override + @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } - @AfterMethod + @Override + @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); } diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java index e0332d418..ae83e8260 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java @@ -22,21 +22,25 @@ public class CreateContainerCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java index c8333966e..80d44603e 100644 --- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java @@ -20,21 +20,25 @@ public class InfoCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java index c68c57ef5..be9ed3995 100644 --- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java @@ -27,21 +27,25 @@ public class KillContainerCmdImplTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(KillContainerCmdImplTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java index c0f85d927..012c5b338 100644 --- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java @@ -30,21 +30,25 @@ public class ListContainersCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java index 3d892b0fe..1d4bbf76f 100644 --- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java @@ -20,21 +20,25 @@ public class ListImagesCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java index 1ebcb40df..efdcfec6d 100644 --- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java @@ -6,7 +6,6 @@ import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; -import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; @@ -23,21 +22,25 @@ public class LogContainerCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java index cea292ac8..0010b99ff 100644 --- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java @@ -23,21 +23,25 @@ public class PullImageCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java index 952f0b286..c675da699 100644 --- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java @@ -27,21 +27,26 @@ public class PushImageCmdImplTest extends AbstractDockerClientTest { String username; + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); username = dockerClient.authConfig().getUsername(); } + + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java index b4ab9d93b..785da9970 100644 --- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java @@ -29,20 +29,25 @@ public class RemoveContainerCmdImplTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(RemoveContainerCmdImplTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java index e5bda718f..0b23018fc 100644 --- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java @@ -30,20 +30,25 @@ public class RemoveImageCmdImplTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(RemoveImageCmdImplTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java index b637d5e79..827a1d583 100644 --- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java @@ -22,21 +22,25 @@ public class RestartContainerCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java index 5d9f60f0e..3091c891b 100644 --- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java @@ -24,21 +24,25 @@ public class SearchImagesCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java index 79bc3488f..729e158a6 100644 --- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java @@ -29,21 +29,25 @@ public class StartContainerCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java index 588f3296d..30d42d02e 100644 --- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java @@ -27,21 +27,25 @@ public class StopContainerCmdImplTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(StopContainerCmdImplTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java index 706dc1b77..d37b682ef 100644 --- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java @@ -20,20 +20,25 @@ public class TagImageCmdImplTest extends AbstractDockerClientTest { public static final Logger LOG = LoggerFactory .getLogger(TagImageCmdImplTest.class); + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java index 0f9883eec..cd3996bdf 100644 --- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java @@ -16,21 +16,25 @@ public class VersionCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result); diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java index f8d439aeb..a322dd2b1 100644 --- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java @@ -22,21 +22,25 @@ public class WaitContainerCmdImplTest extends AbstractDockerClientTest { + @Override @BeforeTest public void beforeTest() throws DockerException { super.beforeTest(); } + @Override @AfterTest public void afterTest() { super.afterTest(); } + @Override @BeforeMethod public void beforeMethod(Method method) { super.beforeMethod(method); } + @Override @AfterMethod public void afterMethod(ITestResult result) { super.afterMethod(result);