From db4cf1d5821b8e6d96660f4af288b74e9e86155d Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Wed, 28 Jan 2015 13:49:47 +0100 Subject: [PATCH] Patched LoggingFilter to work with CXF. Added missing @Override tags. --- .../java/com/github/dockerjava/api/DockerClient.java | 1 + .../com/github/dockerjava/api/command/CommitCmd.java | 1 + .../dockerjava/api/command/ContainerDiffCmd.java | 2 ++ .../api/command/CopyFileFromContainerCmd.java | 1 + .../dockerjava/api/command/DockerCmdExecFactory.java | 1 + .../dockerjava/api/command/InspectContainerCmd.java | 1 + .../github/dockerjava/api/command/InspectImageCmd.java | 1 + .../dockerjava/api/command/KillContainerCmd.java | 1 + .../github/dockerjava/api/command/LogContainerCmd.java | 1 + .../dockerjava/api/command/PauseContainerCmd.java | 1 + .../github/dockerjava/api/command/PushImageCmd.java | 1 + .../dockerjava/api/command/RemoveContainerCmd.java | 1 + .../github/dockerjava/api/command/RemoveImageCmd.java | 1 + .../dockerjava/api/command/RestartContainerCmd.java | 1 + .../dockerjava/api/command/StartContainerCmd.java | 1 + .../dockerjava/api/command/StopContainerCmd.java | 1 + .../github/dockerjava/api/command/TopContainerCmd.java | 1 + .../dockerjava/api/command/UnpauseContainerCmd.java | 1 + .../java/com/github/dockerjava/api/model/Links.java | 1 - .../dockerjava/core/command/ExecCreateCmdImpl.java | 10 ++++++++++ .../github/dockerjava/jaxrs/AbstrDockerCmdExec.java | 1 + .../github/dockerjava/jaxrs/RemoveImageCmdExec.java | 1 - .../github/dockerjava/jaxrs/util/LoggingFilter.java | 2 +- .../core/command/WaitContainerCmdImplTest.java | 1 - 24 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java index 53b212605..f7addfa27 100644 --- a/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -105,6 +105,7 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd( public EventsCmd eventsCmd(EventCallback eventCallback); + @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 5eb5a3e8b..ac0a7bb5e 100644 --- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java @@ -106,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 df26743e1..73381d692 100644 --- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -75,6 +75,7 @@ public interface DockerCmdExecFactory extends Closeable { public EventsCmd.Exec createEventsCmdExec(); + @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 c746fd7c2..f50beb01e 100644 --- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java @@ -33,6 +33,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 212c9290c..be65ca41e 100644 --- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java @@ -41,6 +41,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 ef96267f7..40fb23a9f 100644 --- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java @@ -135,6 +135,7 @@ public interface StartContainerCmd extends DockerCmd { * @throws NotModifiedException * Container already started */ + @Override public Void exec() throws NotFoundException, NotModifiedException; public static interface Exec extends DockerCmdExec { 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/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java index d901ea8d2..9bbef25d0 100644 --- a/src/main/java/com/github/dockerjava/api/model/Links.java +++ b/src/main/java/com/github/dockerjava/api/model/Links.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Map; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java index 219b789da..5819fa498 100644 --- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java @@ -31,48 +31,58 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) { withContainerId(containerId); } + @Override public ExecCreateCmd withContainerId(String containerId) { checkNotNull(containerId, "containerId was not specified"); this.containerId = containerId; return this; } + @Override public ExecCreateCmd withAttachStdin(boolean attachStdin) { this.attachStdin = attachStdin; return this; } + @Override public ExecCreateCmd withAttachStdin() { return withAttachStdin(true); } + @Override public ExecCreateCmd withAttachStdout(boolean attachStdout) { this.attachStdout = attachStdout; return this; } + @Override public ExecCreateCmd withAttachStdout() { return withAttachStdout(true); } + @Override public ExecCreateCmd withAttachStderr(boolean attachStderr) { this.attachStderr = attachStderr; return this; } + @Override public ExecCreateCmd withAttachStderr() { return withAttachStderr(true); } + @Override public ExecCreateCmd withTty(boolean tty) { this.tty = tty; return this; } + @Override public ExecCreateCmd withTty() { return withTty(true); } + @Override public ExecCreateCmd withCmd(String... cmd) { this.cmd = cmd; return this; diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java index 4e63d8a4a..95c13b26f 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java @@ -39,6 +39,7 @@ protected String registryAuth(AuthConfig authConfig) { } } + @Override public RES_T exec(CMD_T command) { // this hack works because of ResponseStatusExceptionFilter RES_T result; diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java index 6bfeecd71..d5d7b8000 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java @@ -1,7 +1,6 @@ package com.github.dockerjava.jaxrs; import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java index 5a37720ad..9679f230a 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java @@ -211,7 +211,7 @@ private InputStream logInboundEntity(final StringBuilder b, InputStream stream) } stream.mark(maxEntitySize + 1); final byte[] entity = new byte[maxEntitySize + 1]; - final int entitySize = stream.read(entity); + final int entitySize = Math.max(0, stream.read(entity)); b.append(new String(entity, 0, Math.min(entitySize, maxEntitySize))); if (entitySize > maxEntitySize) { b.append("...more..."); 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 32434eead..19c7057d2 100644 --- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java @@ -16,7 +16,6 @@ import org.testng.annotations.Test; import com.github.dockerjava.api.DockerException; -import com.github.dockerjava.api.InternalServerErrorException; import com.github.dockerjava.api.NotFoundException; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse;