Merge branch '2.x'

Marcus Linke · Marcus Linke · commit b9d28351154d · 2015-11-24T20:06:46.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import javax.annotation.CheckForNull;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -19,8 +21,19 @@ public class Statistics {
     @JsonProperty("read")
     private String read;
 
+    /**
+     * @since Docker Remote API 1.21
+     */
+    @CheckForNull
+    @JsonProperty("networks")
+    private Map<String, Object> networks;
+
+    /**
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #networks}
+     */
+    @Deprecated
     @JsonProperty("network")
-    private Map<String, Object> networkStats;
+    private Map<String, Object> network;
 
     @JsonProperty("memory_stats")
     private Map<String, Object> memoryStats;
@@ -31,8 +44,20 @@ public class Statistics {
     @JsonProperty("cpu_stats")
     private Map<String, Object> cpuStats;
 
-    public Map<String, Object> getNetworkStats() {
-        return networkStats;
+    /**
+     * @since Docker Remote API 1.21
+     */
+    @CheckForNull
+    public Map<String, Object> getNetworks() {
+        return networks;
+    }
+
+    /**
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
+     */
+    @Deprecated
+    public Map<String, Object> getNetwork() {
+        return network;
     }
 
     public Map<String, Object> getCpuStats() {
