Merge pull request #138 from docker-java/cfx-interop

marcuslinke · marcuslinke · commit 9b95d082450a · 2015-01-29T22:19:43.000+01:00
Cfx interop
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/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -84,18 +84,4 @@ public String toString() {
     public InputStream exec() throws NotFoundException {
     	return super.exec();
     }
-
-//	protected InputStream impl() throws DockerException {
-//
-//		CopyFileFromContainerCmd command = this;
-//		
-//		WebTarget webResource =
-//				baseResource.path("/containers/{id}/copy").resolveTemplate("id", command.getContainerId());
-//
-//		LOGGER.trace("POST: " + webResource.toString());
-//		
-//		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);		
-//	}
-
-
 }
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/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
 import java.io.InputStream;
 
 import javax.ws.rs.client.WebTarget;
@@ -13,29 +11,34 @@
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
 
-public class AttachContainerCmdExec extends AbstrDockerCmdExec<AttachContainerCmd, InputStream> implements AttachContainerCmd.Exec {
-	
+public class AttachContainerCmdExec extends
+		AbstrDockerCmdExec<AttachContainerCmd, InputStream> implements
+		AttachContainerCmd.Exec {
+
 	private static final Logger LOGGER = LoggerFactory
 			.getLogger(AttachContainerCmdExec.class);
-	
+
 	public AttachContainerCmdExec(WebTarget baseResource) {
 		super(baseResource);
 	}
 
 	@Override
 	protected InputStream execute(AttachContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/attach")
-                .resolveTemplate("id", command.getContainerId())
-                .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
-             // .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
-                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-                .queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");
+		WebTarget webResource = getBaseResource()
+				.path("/containers/{id}/attach")
+				.resolveTemplate("id", command.getContainerId())
+				.queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
+				// .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
+				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
+				.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
+				.queryParam("stream",
+						command.hasFollowStreamEnabled() ? "1" : "0");
 
 		LOGGER.trace("POST: {}", webResource);
-		
-		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-				.post(entity(null, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);
+
+		return webResource.request()
+				.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+				.post(null, Response.class).readEntity(InputStream.class);
 	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -25,6 +25,9 @@ protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
 
-        return webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
+		return webResource
+				.request()
+				.accept(MediaType.APPLICATION_JSON)
+				.post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -26,6 +26,9 @@ protected InputStream execute(ExecStartCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
 
-        return webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);
+		return webResource
+				.request()
+				.accept(MediaType.APPLICATION_JSON)
+				.post(entity(command, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
@@ -10,25 +8,28 @@
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-public class KillContainerCmdExec extends AbstrDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
-	
+public class KillContainerCmdExec extends
+		AbstrDockerCmdExec<KillContainerCmd, Void> implements
+		KillContainerCmd.Exec {
+
 	private static final Logger LOGGER = LoggerFactory
 			.getLogger(KillContainerCmdExec.class);
-	
+
 	public KillContainerCmdExec(WebTarget baseResource) {
 		super(baseResource);
 	}
 
 	@Override
 	protected Void execute(KillContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id", command.getContainerId());
+		WebTarget webResource = getBaseResource().path("/containers/{id}/kill")
+				.resolveTemplate("id", command.getContainerId());
 
-		if(command.getSignal() != null) {
+		if (command.getSignal() != null) {
 			webResource = webResource.queryParam("signal", command.getSignal());
 		}
-	
+
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(null, MediaType.APPLICATION_JSON));	
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(`
`105`	`105`
`106`	`106`	`public EventsCmd eventsCmd(EventCallback eventCallback);`
`107`	`107`
	`108`	`+ @Override`
`108`	`109`	`public void close() throws IOException;`
`109`	`110`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public interface DockerCmdExecFactory extends Closeable {`
`75`	`75`
`76`	`76`	`public EventsCmd.Exec createEventsCmdExec();`
`77`	`77`
	`78`	`+ @Override`
`78`	`79`	`public void close() throws IOException;`
`79`	`80`
`80`	`81`	`}`