Minor refactoring of error method

Richard Lee · Richard Lee · commit 7ff167043548 · 2015-09-17T08:44:44.000-07:00
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -19,16 +19,18 @@ public class BuildResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isBuildSuccessIndicated() {
-        if (getStream() == null)
+        if (isErrorIndicated() || getStream() == null) {
             return false;
+        }
 
         return getStream().contains(BUILD_SUCCESS);
     }
 
     @JsonIgnore
     public String getImageId() {
-        if (!isBuildSuccessIndicated())
+        if (!isBuildSuccessIndicated()) {
             return null;
+        }
 
         return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -18,8 +18,9 @@ public class PullResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isPullSuccessIndicated() {
-        if (getStatus() == null)
+        if (isErrorIndicated() || getStatus() == null) {
             return false;
+        }
 
         return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
                 .contains("Downloaded newer image"));
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -11,16 +11,4 @@ public class PushResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 8256977108011295857L;
 
-    /**
-     * Returns whether the error field indicates an error
-     *
-     * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
-     */
-    @JsonIgnore
-    public boolean isErrorIndicated() {
-        if (getError() == null && getErrorDetail() == null)
-            return false;
-
-        return true;
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
@@ -25,6 +26,7 @@ public class ResponseItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
+    @Deprecated
     @JsonProperty("progress")
     private String progress;
 
@@ -40,6 +42,7 @@ public class ResponseItem implements Serializable {
     @JsonProperty("errorDetail")
     private ErrorDetail errorDetail;
 
+    @Deprecated
     @JsonProperty("error")
     private String error;
 
@@ -81,6 +84,17 @@ public String getError() {
         return error;
     }
 
+    /**
+     * Returns whether the error field indicates an error
+     *
+     * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
+     */
+    @JsonIgnore
+    public boolean isErrorIndicated() {
+        // check both the deprecated and current error fields, just in case
+        return getError() != null || getErrorDetail() != null;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = false)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
