Merge branch '2.x'

Marcus Linke · Marcus Linke · commit 264f37b5400b · 2015-12-03T00:09:34.000+01:00
Conflicts:
	CHANGELOG.md
	
Use objects instead of primitives in ResponseItem
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ All changes
 
 2.1.3-SNAPSHOT
 ---
+* [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 
 v2.1.2
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,7 +2,10 @@
 
 import java.io.Serializable;
 
+import javax.annotation.CheckForNull;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
@@ -37,7 +40,7 @@ public class ResponseItem implements Serializable {
     private String from;
 
     @JsonProperty("time")
-    private long time;
+    private Long time;
 
     @JsonProperty("errorDetail")
     private ErrorDetail errorDetail;
@@ -46,35 +49,43 @@ public class ResponseItem implements Serializable {
     @JsonProperty("error")
     private String error;
 
+    @CheckForNull
     public String getStream() {
         return stream;
     }
 
+    @CheckForNull
     public String getStatus() {
         return status;
     }
 
+    @CheckForNull
     public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
+    @CheckForNull
     @Deprecated
     public String getProgress() {
         return progress;
     }
 
+    @CheckForNull
     public String getId() {
         return id;
     }
 
+    @CheckForNull
     public String getFrom() {
         return from;
     }
 
-    public long getTime() {
+    @CheckForNull
+    public Long getTime() {
         return time;
     }
 
+    @CheckForNull
     public ErrorDetail getErrorDetail() {
         return errorDetail;
     }
@@ -100,13 +111,28 @@ public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        long current;
+        Long current;
 
         @JsonProperty("total")
-        long total;
+        Long total;
 
         @JsonProperty("start")
-        long start;
+        Long start;
+
+        @CheckForNull
+        public Long getCurrent() {
+            return current;
+        }
+
+        @CheckForNull
+        public Long getTotal() {
+            return total;
+        }
+
+        @CheckForNull
+        public Long getStart() {
+            return start;
+        }
 
         @Override
         public String toString() {
@@ -119,11 +145,21 @@ public static class ErrorDetail implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
         @JsonProperty("code")
-        int code;
+        Integer code;
 
         @JsonProperty("message")
         String message;
 
+        @CheckForNull
+        public Integer getCode() {
+            return code;
+        }
+
+        @CheckForNull
+        public String getMessage() {
+            return message;
+        }
+
         @Override
         public String toString() {
             return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
