Add awaitMessage

eddumelendez · eddumelendez · commit 142e59eaee50 · 2022-10-14T16:26:17.000-05:00
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.async.ResultCallbackTemplate;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.LoadResponseItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,8 +10,40 @@ public class LoadImageCallback extends ResultCallbackTemplate<LoadImageCallback,
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCallback.class);
 
+    private String message;
+
+    private String error;
+
     @Override
     public void onNext(LoadResponseItem item) {
+        if (item.isBuildSuccessIndicated()) {
+            this.message = item.getMessage();
+        } else if (item.isErrorIndicated()) {
+            this.error = item.getError();
+        }
+
         LOGGER.debug(item.toString());
     }
+
+    public String awaitMessage() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getMessage();
+    }
+
+    private String getMessage() {
+        if (this.message != null) {
+            return this.message;
+        }
+
+        if (this.error == null) {
+            throw new DockerClientException("Could not build image");
+        }
+
+        throw new DockerClientException("Could not build image: " + this.error);
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java
@@ -4,6 +4,8 @@
 
 public class LoadResponseItem extends ResponseItem {
 
+    private static final long serialVersionUID = 1L;
+
     private static final String IMPORT_SUCCESS = "Loaded image:";
 
     /**
@@ -17,4 +19,15 @@ public boolean isBuildSuccessIndicated() {
 
         return getStream().contains(IMPORT_SUCCESS);
     }
+
+    @JsonIgnore
+    public String getMessage() {
+        if (!isBuildSuccessIndicated()) {
+            return null;
+        } else if (getStream().contains(IMPORT_SUCCESS)) {
+            return getStream();
+        }
+
+        return null;
+    }
 }
