docker-java · marcuslinke · Jul 15, 2015 · Jul 14, 2015 · Jul 15, 2015
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -44,8 +44,11 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.api.model.Statistics;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
@@ -114,13 +117,13 @@ public interface DockerClient extends Closeable {
 
     public WaitContainerCmd waitContainerCmd(String containerId);
 
-    public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
+    public AttachContainerCmd attachContainerCmd(String containerId);
 
     public ExecStartCmd execStartCmd(String containerId);
 
     public InspectExecCmd inspectExecCmd(String execId);
 
-    public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
+    public LogContainerCmd logContainerCmd(String containerId);
 
     public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
@@ -148,9 +151,9 @@ public interface DockerClient extends Closeable {
 
     public UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-    public EventsCmd eventsCmd(ResultCallback<Event> resultCallback);
+    public EventsCmd eventsCmd();
 
-    public StatsCmd statsCmd(ResultCallback<Statistics> resultCallback);
+    public StatsCmd statsCmd();
 
     @Override
     public void close() throws IOException;

diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -5,15 +5,15 @@
 /**
  * Result callback
  */
-public interface ResultCallback<RES_T> extends Closeable {
+public interface ResultCallback<A_RES_T> extends Closeable {
     /**
      * Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the
      * processing
      */
     void onStart(Closeable closeable);
 
     /** Called when an async result event occurs */
-    void onNext(RES_T object);
+    void onNext(A_RES_T object);
 
     /** Called when an exception occurs while processing */
     void onError(Throwable throwable);

diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -11,10 +11,9 @@
  * @author marcus
  *
  */
-public interface AsyncDockerCmd<CMD_T extends DockerCmd<RES_T>, A_RES_T, RES_T> extends DockerCmd<RES_T> {
+public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
 
-    public ResultCallback<A_RES_T> getResultCallback();
 
-    public CMD_T withResultCallback(ResultCallback<A_RES_T> resultCallback);
+    public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -3,7 +3,6 @@
 import java.io.InputStream;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 
 /**
@@ -21,7 +20,7 @@
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame, Void> {
+public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
     public String getContainerId();
 
@@ -63,16 +62,7 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     public AttachContainerCmd withLogs();
 
-    /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     *
-     * @throws NotFoundException
-     *             No such container
-     */
-    @Override
-    public Void exec() throws NotFoundException;
-
-    public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -5,11 +5,11 @@
 import com.github.dockerjava.api.model.AuthResponse;
 
 /**
- * 
+ *
  * Authenticate with the server, useful for checking authentication.
- * 
+ *
  */
-public interface AuthCmd extends DockerCmd<AuthResponse> {
+public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
     public AuthConfig getAuthConfig();
 
@@ -24,7 +24,7 @@ public interface AuthCmd extends DockerCmd<AuthResponse> {
     @Override
     public AuthResponse exec() throws UnauthorizedException;
 
-    public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
+    public static interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,20 +1,19 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.EventStreamItem;
-
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+
 /**
- * 
+ *
  * Build an image from Dockerfile.
- * 
+ *
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
- * 
+ *
  */
-public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
+public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
     public BuildImageCmd withTag(String tag);
 
@@ -58,14 +57,9 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
+    public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
-    /**
-     * @see {@link com.github.dockerjava.core.command.EventStreamReader}
-     */
-    public static abstract class Response extends InputStream {
-        public abstract Iterable<EventStreamItem> getItems() 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
@@ -9,7 +9,7 @@
  * Create a new image from a container's changes. Returns the new image ID.
  *
  */
-public interface CommitCmd extends DockerCmd<String> {
+public interface CommitCmd extends SyncDockerCmd<String> {
 
     public String getContainerId();
 
@@ -110,7 +110,7 @@ public interface CommitCmd extends DockerCmd<String> {
     @Override
     public String exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<CommitCmd, String> {
+    public static interface Exec extends DockerCmdSyncExec<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
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ChangeLog;
 
-public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
+public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
 
     public String getContainerId();
 
@@ -27,7 +27,7 @@ public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
     @Override
     public List<ChangeLog> exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
+    public static interface Exec extends DockerCmdSyncExec<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
@@ -4,7 +4,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 
-public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
+public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     public String getContainerId();
 
@@ -20,14 +20,14 @@ public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     * 
+     *
      * @throws NotFoundException
      *             No such container
      */
     @Override
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -17,9 +17,9 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
-public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse> {
+public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
-    public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
+    public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
     }
 
     /**

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -2,7 +2,7 @@
 
 import java.io.InputStream;
 
-public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
+public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
 
     public String getRepository();
 
@@ -30,7 +30,7 @@ public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
      */
     public CreateImageCmd withTag(String tag);
 
-    public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
+    public static interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,6 +4,6 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
-    public RES_T exec();
+
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
@@ -0,0 +1,9 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+public interface DockerCmdAsyncExec<CMD_T extends DockerCmd<Void>, A_RES_T> {
+
+    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback);
+
+}
diff --git a/...dockerjava/api/command/DockerCmdExec.java → ...erjava/api/command/DockerCmdSyncExec.java b/...dockerjava/api/command/DockerCmdExec.java → ...erjava/api/command/DockerCmdSyncExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.command;
 
-public interface DockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
+public interface DockerCmdSyncExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
 
     public RES_T exec(CMD_T command);
 

diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -10,7 +10,7 @@
  * @param until
  *            - Stream events until this timestamp
  */
-public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
+public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
     public EventsCmd withSince(String since);
 
     public EventsCmd withUntil(String until);
@@ -19,6 +19,6 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
 
     public String getUntil();
 
-    public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.command;
 
-public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
+public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     public String getContainerId();
 
@@ -32,6 +32,6 @@ public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
 
     public boolean hasTtyEnabled();
 
-    public static interface Exec extends DockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> {
+    public static interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -4,7 +4,7 @@
 
 import java.io.InputStream;
 
-public interface ExecStartCmd extends DockerCmd<InputStream> {
+public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
     public String getExecId();
 
@@ -24,13 +24,13 @@ public interface ExecStartCmd extends DockerCmd<InputStream> {
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     * 
+     *
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such exec instance
      */
     @Override
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<ExecStartCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<ExecStartCmd, InputStream> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -2,9 +2,9 @@
 
 import com.github.dockerjava.api.model.Info;
 
-public interface InfoCmd extends DockerCmd<Info> {
+public interface InfoCmd extends SyncDockerCmd<Info> {
 
-    public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
+    public static interface Exec extends DockerCmdSyncExec<InfoCmd, Info> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 
-public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse> {
+public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerResponse> {
 
     public String getContainerId();
 
@@ -15,7 +15,7 @@ public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse>
     @Override
     public InspectContainerResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
+    public static interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
     }
 
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,6 @@

		public interface DockerCmd<RES_T> extends Closeable {

		public RES_T exec();


		}