Add node to model package

martin894 · martin894 · commit ea40071422fe · 2016-08-17T14:56:44.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -41,8 +41,8 @@ public class Event {
     /**
      * ??
      */
-    @JsonProperty("node")
-    private Node node;
+    @JsonProperty("eventNode")
+    private EventNode eventNode;
 
     /*
      * @since 1.
@@ -183,17 +183,17 @@ public Event withTimenano(Long timenano) {
     }
 
     /**
-     * Returns the node when working against docker swarm
+     * Returns the eventNode when working against docker swarm
      */
-    public Node getNode() {
-        return node;
+    public EventNode getEventNode() {
+        return eventNode;
     }
 
     /**
-     * @see #node
+     * @see #eventNode
      */
-    public Event withNode(Node node) {
-        this.node = node;
+    public Event withNode(EventNode eventNode) {
+        this.eventNode = eventNode;
         return this;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/EventNode.java b/src/main/java/com/github/dockerjava/api/model/EventNode.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A node as returned by the /events API, for instance, when Swarm is used.
+ */
+@JsonInclude(Include.NON_NULL)
+public class EventNode {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Id")
+    private String id;
+
+    @JsonProperty("Addr")
+    private String addr;
+
+    @JsonProperty("Ip")
+    private String ip;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -1,40 +1,70 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * A node as returned by the /events API, for instance, when Swarm is used.
+ * Used for Listing containers.
+ *
+ * @author Martin Root
  */
-@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Node {
-
-    @JsonProperty("Name")
-    private String name;
-
     @JsonProperty("Id")
     private String id;
 
-    @JsonProperty("Addr")
-    private String addr;
+    @JsonProperty("Version")
+    private String[] version;
 
-    @JsonProperty("Ip")
-    private String ip;
+    @JsonProperty("CreatedAt")
+    private String createdAt;
 
-    public String getName() {
-        return name;
-    }
+    @JsonProperty("UpdatedAt")
+    private String updatedAt;
+
+    @JsonProperty("Spec")
+    private NodeSpec spec;
+
+    @JsonProperty("Description")
+    private NodeDescription description;
+
+    @JsonProperty("Status")
+    private NodeStatus status;
+
+    @JsonProperty("ManagerStatus")
+    private NodeManagerStatus managerStatus;
 
     public String getId() {
         return id;
     }
 
-    public String getAddr() {
-        return addr;
+    public String[] getVersion() {
+        return version;
+    }
+
+    public String getCreatedAt() {
+        return createdAt;
+    }
+
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public NodeSpec getSpec() {
+        return spec;
+    }
+
+    public NodeDescription getDescription() {
+        return description;
+    }
+
+    public NodeStatus getStatus() {
+        return status;
     }
 
-    public String getIp() {
-        return ip;
+    public NodeManagerStatus getManagerStatus() {
+        return managerStatus;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeDescription.java b/src/main/java/com/github/dockerjava/api/model/NodeDescription.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodeDescription {
+    @JsonProperty("Hostname")
+    private String hostname;
+
+    @JsonProperty("Platform")
+    private NodePlatform platform;
+
+    @JsonProperty("Resources")
+    private NodeResources resources;
+
+    @JsonProperty("Engine")
+    private NodeEngine engine;
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public NodePlatform getPlatform() {
+        return platform;
+    }
+
+    public NodeResources getResources() {
+        return resources;
+    }
+
+    public NodeEngine getEngine() {
+        return engine;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeEngine.java b/src/main/java/com/github/dockerjava/api/model/NodeEngine.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodeEngine {
+
+    @JsonProperty("EngineVersion")
+    private String engineVersion;
+
+    @JsonProperty("Labels")
+    private Map<String,String> labels;
+
+    @JsonProperty("Plugins")
+    private NodePlugin[] plugins;
+
+    public String getEngineVersion() {
+        return engineVersion;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    public NodePlugin[] getPlugins() {
+        return plugins;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeManagerStatus.java b/src/main/java/com/github/dockerjava/api/model/NodeManagerStatus.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodeManagerStatus {
+
+    @JsonProperty("Leader")
+    private boolean leader;
+
+    @JsonProperty("Reachability")
+    private String reachability;
+
+    @JsonProperty("Addr")
+    private String addr;
+
+    public boolean isLeader() {
+        return leader;
+    }
+
+    public String getReachability() {
+        return reachability;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodePlatform.java b/src/main/java/com/github/dockerjava/api/model/NodePlatform.java
@@ -0,0 +1,13 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class NodePlatform {
+
+    @JsonProperty("Architecture")
+    private String architecture;
+
+    @JsonProperty("OS")
+    private String os;
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodePlugin.java b/src/main/java/com/github/dockerjava/api/model/NodePlugin.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodePlugin {
+
+    @JsonProperty("Type")
+    private String type;
+
+    @JsonProperty("Name")
+    private String name;
+
+    public String getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeResources.java b/src/main/java/com/github/dockerjava/api/model/NodeResources.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodeResources {
+
+    @JsonProperty("NanoCPUs")
+    private Long nanoCPUs;
+
+    @JsonProperty("MemoryBytes")
+    private Long memoryBytes;
+
+    public Long getNanoCPUs() {
+        return nanoCPUs;
+    }
+
+    public Long getMemoryBytes() {
+        return memoryBytes;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeSpec.java b/src/main/java/com/github/dockerjava/api/model/NodeSpec.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NodeSpec {
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Role")
+    private String id;
+
+    @JsonProperty("Availability")
+    private String availability;
+
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getAvailability() {
+        return availability;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeStatus.java b/src/main/java/com/github/dockerjava/api/model/NodeStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/NodeVersion.java b/src/main/java/com/github/dockerjava/api/model/NodeVersion.java
diff --git a/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
