Skip to content

Deprecate "network" and enable "networks" stats (remote Docker API 1.21) (branch 2.x) #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 3 commits into from
Nov 24, 2015
Merged

Deprecate "network" and enable "networks" stats (remote Docker API 1.21) (branch 2.x) #362

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8a5fb4
Deprecate "network" and enable "networks" stats (remote Docker API 1.21)
bonigarcia Nov 10, 2015
ef03027
Improve JavaDoc and include @CheckForNull
bonigarcia Nov 10, 2015
ee1b8cf
Remove "Stats" from "networks" field in statistics
bonigarcia Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/Statistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -16,6 +18,17 @@ 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;

Expand All @@ -28,6 +41,18 @@ public class Statistics {
@JsonProperty("cpu_stats")
private Map<String, Object> cpuStats;

/**
* @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> getNetworkStats() {
return networkStats;
}
Expand Down