There are two different event streamed JSON objects that come back

magnayn · magnayn · commit 602008c24146 · 2015-02-03T11:34:33.000Z
from commands. Create representations for them.

Signed-off-by: Nigel Magnay &lt;nigel.magnay@gmail.com&gt;
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.api.model;
+
+import com.google.common.base.Objects;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * Represents an event stream
+ */
+@JsonIgnoreProperties(ignoreUnknown=true)
+public class EventStreamItem implements Serializable {
+
+    @JsonProperty("stream")
+    private String stream;
+
+    // {"error":"Error...", "errorDetail":{"code": 123, "message": "Error..."}}
+    @JsonProperty("error")
+    private String error;
+
+    @JsonProperty("errorDetail")
+    private ErrorDetail errorDetail;
+
+    public String getStream() {
+        return stream;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public ErrorDetail getErrorDetail() {
+        return errorDetail;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown=true)
+    public static class ErrorDetail implements Serializable {
+        @JsonProperty("code")
+        String code;
+        @JsonProperty("message")
+        String message;
+
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this)
+                    .add("code", code)
+                    .add("message", message)
+                    .toString();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("stream", stream)
+                .add("error", error)
+                .add("errorDetail", errorDetail)
+                .toString();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.api.model;
+
+import com.google.common.base.Objects;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * Represents an item returned from push
+ */
+@JsonIgnoreProperties(ignoreUnknown=true)
+public class PushEventStreamItem implements Serializable {
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("progress")
+    private String progress;
+
+    @JsonProperty("progressDetail")
+    private ProgressDetail progressDetail;
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getProgress() {
+        return progress;
+    }
+
+    public ProgressDetail getProgressDetail() {
+        return progressDetail;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown=true)
+    public static class ProgressDetail implements Serializable {
+        @JsonProperty("current")
+        int current;
+
+
+        @Override
+        public String toString() {
+            return "current " + current;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("status", status)
+                .add("progress", progress)
+                .add("progressDetail", progressDetail)
+                .toString();
+    }
+}
