docker-java · marcuslinke · Jan 28, 2015 · Jan 28, 2015
diff --git 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;
 
 }
diff --git 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<String>{
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public String exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<CommitCmd, String> {

diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -13,13 +13,15 @@ public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
 
 	public ContainerDiffCmd withContainerId(String containerId);
 
+	@Override
 	public String toString();
 
 	/**
 	 * @throws NotFoundException No such container
 	 * @throws InternalServerErrorException server error
 	 * @throws DockerException unexpected http status code
 	 */
+	@Override
 	public List<ChangeLog> exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {

diff --git 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<InputStream> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public InputStream exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {

diff --git 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;
 
 }
diff --git 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<InspectContainerResponse>
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public InspectContainerResponse exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {

diff --git 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<InspectImageResponse>{
 	/**
 	 * @throws NotFoundException No such image
 	 */
+	@Override
 	public InspectImageResponse exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {

diff --git 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<Void> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {

diff --git 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<InputStream>{
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public InputStream exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<LogContainerCmd, InputStream> {

diff --git 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<Void>{
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {

diff --git 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<InputStream>{
 	/**
 	 * @throws NotFoundException No such image
 	 */
+	@Override
 	public InputStream exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<PushImageCmd, InputStream> {

diff --git 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<Void> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {

diff --git 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<Void>{
 	/**
 	 * @throws NotFoundException No such image
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {

diff --git 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<Void> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {

diff --git 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<Void> {
 	 * @throws NotModifiedException
 	 *             Container already started
 	 */
+	@Override
 	public Void exec() throws NotFoundException, NotModifiedException;
 
 	public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {

diff --git 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<Void> {
 	 * @throws NotFoundException No such container
 	 * @throws NotModifiedException Container already stopped
 	 */
+	@Override
 	public Void exec() throws NotFoundException, NotModifiedException;
 
 	public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {

diff --git 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<TopContainerResponse> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public TopContainerResponse exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {

diff --git 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<Void> {
 	/**
 	 * @throws NotFoundException No such container
 	 */
+	@Override
 	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;