Add all missing fields to ResponseItem and related classes.

Richard Lee · Richard Lee · commit 1d38e935efe4 · 2015-09-16T15:37:16.000-07:00
Fix types to match Go code.
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -14,13 +14,6 @@ public class BuildResponseItem extends ResponseItem {
 
     private static final String BUILD_SUCCESS = "Successfully built";
 
-    @JsonProperty("stream")
-    private String stream;
-
-    public String getStream() {
-        return stream;
-    }
-
     /**
      * Returns whether the stream field indicates a successful build operation
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -18,7 +18,7 @@ public class PushResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isErrorIndicated() {
-        if (getError() == null)
+        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
@@ -16,57 +16,83 @@ public class ResponseItem implements Serializable {
 
     private static final long serialVersionUID = -5187169652557467828L;
 
+    @JsonProperty("stream")
+    private String stream;
+
     @JsonProperty("status")
     private String status;
 
+    @JsonProperty("progressDetail")
+    private ProgressDetail progressDetail;
+
     @JsonProperty("progress")
     private String progress;
 
-    @JsonProperty("progressDetail")
-    private ProgressDetail progressDetail;
+    @JsonProperty("id")
+    private String id;
 
-    @JsonProperty("error")
-    private String error;
+    @JsonProperty("from")
+    private String from;
+
+    @JsonProperty("time")
+    private long time;
 
     @JsonProperty("errorDetail")
     private ErrorDetail errorDetail;
 
-    @JsonProperty("id")
-    private String id;
+    @JsonProperty("error")
+    private String error;
 
-    public String getStatus() {
-        return status;
+    public String getStream() {
+        return stream;
     }
 
-    public String getProgress() {
-        return progress;
+    public String getStatus() {
+        return status;
     }
 
     public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
+    @Deprecated
+    public String getProgress() {
+        return progress;
+    }
+
     public String getId() {
         return id;
     }
 
-    public String getError() {
-        return error;
+    public String getFrom() {
+        return from;
+    }
+
+    public long getTime() {
+        return time;
     }
 
     public ErrorDetail getErrorDetail() {
         return errorDetail;
     }
 
+    @Deprecated
+    public String getError() {
+        return error;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = false)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        int current;
+        long current;
 
         @JsonProperty("total")
-        int total;
+        long total;
+
+        @JsonProperty("start")
+        long start;
 
         @Override
         public String toString() {
@@ -79,7 +105,7 @@ public static class ErrorDetail implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
         @JsonProperty("code")
-        String code;
+        int code;
 
         @JsonProperty("message")
         String message;
