Merge branch 'master' into master-vuminhkh

vuminhkh · vuminhkh · commit 82320496385e · 2015-11-27T22:52:47.000+01:00
* master: Fix potential NullpointerExceptions Fix changelog Renamed networStats to network Remove "Stats" from "networks" field in statistics Improve JavaDoc and include @checkfornull Deprecate "network" and enable "networks" stats (remote Docker API 1.21)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,23 @@
 Change Log
 ===
-Latest SNAPSHOT (3.0.0-SNAPSHOT)
+
+3.0.0-SNAPSHOT
 ---
 Notes
 
 * The upcoming release will contain multiple API breaking changes therefore the major version switch
 
 All changes
 
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+2.1.3-SNAPSHOT
+---
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
+
 v2.1.2
 ---
 * [#350] (https://github.com/docker-java/docker-java/pull/350) Remove ServiceLoader logic
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -126,12 +126,12 @@ public String getResolvConfPath() {
 
     @JsonIgnore
     public VolumeBind[] getVolumes() {
-        return volumes.getBinds();
+        return volumes == null ? null : volumes.getBinds();
     }
 
     @JsonIgnore
     public VolumeRW[] getVolumesRW() {
-        return volumesRW.getVolumesRW();
+        return volumesRW == null ? null : volumesRW.getVolumesRW();
     }
 
     public String getHostnamePath() {
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() {
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -178,12 +178,13 @@ public static Boolean available(int port) {
      */
     public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
             Volume... expectedVolumes) {
-        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
 
         List<Volume> volumes = new ArrayList<Volume>();
-        for (VolumeBind bind : volumeBinds) {
-            volumes.add(new Volume(bind.getContainerPath()));
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        if (volumeBinds != null) {
+            for (VolumeBind bind : volumeBinds) {
+                volumes.add(new Volume(bind.getContainerPath()));
+            }
         }
         assertThat(volumes, contains(expectedVolumes));
     }

Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,12 @@ public String getResolvConfPath() {`
`126`	`126`
`127`	`127`	`@JsonIgnore`
`128`	`128`	`public VolumeBind[] getVolumes() {`
`129`		`- return volumes.getBinds();`
	`129`	`+ return volumes == null ? null : volumes.getBinds();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@JsonIgnore`
`133`	`133`	`public VolumeRW[] getVolumesRW() {`
`134`		`- return volumesRW.getVolumesRW();`
	`134`	`+ return volumesRW == null ? null : volumesRW.getVolumesRW();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public String getHostnamePath() {`