docker-java · marcuslinke · Nov 5, 2015 · Nov 4, 2015 · Nov 4, 2015 · KostyaSha
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -1,13 +1,16 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.api.model.WaitResponse;
 
 /**
  * Wait a container
  *
  * Block until container stops, then returns its exit code
  */
-public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
+public interface WaitContainerCmd extends AsyncDockerCmd<WaitContainerCmd, WaitResponse> {
 
     public String getContainerId();
 
@@ -18,9 +21,9 @@ public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
      *             container not found
      */
     @Override
-    public Integer exec() throws NotFoundException;
+    public <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdSyncExec<WaitContainerCmd, Integer> {
+    public static interface Exec extends DockerCmdAsyncExec<WaitContainerCmd, WaitResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Represents a wait container command response
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class WaitResponse  {
+
+    @JsonProperty("StatusCode")
+    private Integer statusCode;
+
+    public Integer getStatusCode() {
+        return statusCode;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -8,10 +8,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.CheckForNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.async.ResultCallback;
+import com.google.common.base.Throwables;
 
 /**
  * Abstract template implementation of {@link ResultCallback}
@@ -30,6 +33,8 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
 
     private boolean closed = false;
 
+    private Throwable firstError = null;
+
     @Override
     public void onStart(Closeable stream) {
         this.stream = stream;
@@ -38,12 +43,15 @@ public void onStart(Closeable stream) {
 
     @Override
     public void onError(Throwable throwable) {
+
         if (closed)
             return;
 
+        if (this.firstError == null)
+            this.firstError = throwable;
+
         try {
             LOGGER.error("Error during callback", throwable);
-            throw new RuntimeException(throwable);
         } finally {
             try {
                 close();
@@ -76,6 +84,8 @@ public void close() throws IOException {
     @SuppressWarnings("unchecked")
     public RC_T awaitCompletion() throws InterruptedException {
         completed.await();
+        // eventually (re)throws RuntimeException
+        getFirstError();
         return (RC_T) this;
     }
 
@@ -87,4 +97,14 @@ public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedE
         completed.await(timeout, timeUnit);
         return (RC_T) this;
     }
+
+    @CheckForNull
+    protected RuntimeException getFirstError() {
+        if (firstError != null) {
+            // this call throws a RuntimeException
+            return Throwables.propagate(firstError);
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -3,13 +3,14 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitResponse;
 
 /**
  * Wait a container
- * 
+ *
  * Block until container stops, then returns its exit code
  */
-public class WaitContainerCmdImpl extends AbstrDockerCmd<WaitContainerCmd, Integer> implements WaitContainerCmd {
+public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements WaitContainerCmd {
 
     private String containerId;
 

diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -0,0 +1,75 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.CheckForNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import com.google.common.base.Throwables;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
+
+    @CheckForNull
+    private WaitResponse waitResponse = null;
+
+    @Override
+    public void onNext(WaitResponse waitResponse) {
+        this.waitResponse = waitResponse;
+        LOGGER.debug(waitResponse.toString());
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getStatusCode();
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) {
+        try {
+            awaitCompletion(timeout, timeUnit);
+        } catch (InterruptedException e) {
+            throw new DockerClientException("Awaiting status code interrupted: ", e);
+        }
+
+        return getStatusCode();
+    }
+
+    private Integer getStatusCode() {
+        if (waitResponse == null) {
+            throw new DockerClientException("Error while wait container");
+        } else {
+            return waitResponse.getStatusCode();
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -1,15 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-public class WaitContainerCmdExec extends AbstrSyncDockerCmdExec<WaitContainerCmd, Integer> implements
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+
+public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
         WaitContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
@@ -19,14 +26,16 @@ public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCli
     }
 
     @Override
-    protected Integer execute(WaitContainerCmd command) {
+    protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerCmd command,
+            ResultCallback<WaitResponse> resultCallback) {
+
         WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON).post(null, ObjectNode.class);
 
-        return ObjectNode.get("StatusCode").asInt();
+        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(
+                WaitResponse.class), resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -16,6 +16,7 @@
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
 
 /**
  * Unit test for DockerClient.
@@ -61,7 +62,7 @@ public void testRunShlex() throws DockerException {
             CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
             dockerClient.startContainerCmd(container.getId());
 
-            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
             assertThat(exitcode, equalTo(0));
         }
     }

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -158,7 +158,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         return containerLog(container.getId());
     }

diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -53,7 +53,7 @@ public void testContainerDiff() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
         assertThat(exitCode, equalTo(0));
 
         List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -41,7 +41,8 @@ public void deleteDockerContainerImage() throws Exception {
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
         // wait for the container to be successfully executed
-        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
+                .exec(new WaitContainerResultCallback()).awaitStatusCode();
         assertEquals(0, exitCode);
 
         Iterator<Frame> response = getLoggingFrames().iterator();

diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -17,7 +17,6 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -56,7 +55,8 @@ public void asyncLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
@@ -80,7 +80,7 @@ public void onError(Throwable throwable) {
                 assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
 
                 try {
-                    // close the callback to prevent the call to onFinish
+                    // close the callback to prevent the call to onComplete
                     close();
                 } catch (IOException e) {
                     throw new RuntimeException();
@@ -111,7 +111,8 @@ public void asyncMultipleLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
@@ -150,7 +151,8 @@ public void asyncLogContainerWithSince() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 

diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -56,7 +56,7 @@ public void removeContainer() throws DockerException {
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
 
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         LOG.info("Removing container: {}", container.getId());
         dockerClient.removeContainerCmd(container.getId()).exec();

diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -87,7 +87,7 @@ public void startContainerWithVolumes() throws DockerException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();