WIP

KostyaSha · KostyaSha · commit b15d9b0959f4 · 2016-08-17T00:53:30.000+03: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
@@ -1,36 +1,73 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 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;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 
+import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
+
 /**
  * Representation of a Docker event.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
 public class Event {
+
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("status")
     private String status;
 
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("id")
     private String id;
 
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("from")
     private String from;
 
-    private Long time;
-
-    @JsonIgnoreProperties
+    /**
+     * ??
+     */
+    @JsonProperty("node")
     private Node node;
 
     /*
-     * @since API Version 1.24
+     * @since 1.
      */
     @JsonProperty("Type")
-    private String type;
+    private EventType type;
+
+    /**
+     * @since 1.22
+     */
+    @JsonProperty("Action")
+    private String action;
+
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("time")
+    private Long time;
+
+    /**
+     * @since 1.21
+     */
+    @JsonProperty("timenano")
+    private Long timenano;
 
     /**
      * Default constructor for the deserialization.
@@ -41,16 +78,12 @@ public Event() {
     /**
      * Constructor.
      *
-     * @param id
-     *            Container ID
-     * @param status
-     *            Status string. List of statuses is available in <a
-     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
-     * @param from
-     *            Image, from which the container has been created
-     * @param time
-     *            Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
-     * @since TODO
+     * @param id     Container ID
+     * @param status Status string. List of statuses is available in <a
+     *               href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * @param from   Image, from which the container has been created
+     * @param time   Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * @since 1.16
      */
     public Event(String status, String id, String from, Long time) {
         this.status = status;
@@ -96,25 +129,46 @@ public Long getTime() {
         return time;
     }
 
+    /**
+     * @see #timenano
+     */
+    @CheckForNull
+    public Long getTimenano() {
+        return timenano;
+    }
+
     /**
      * Returns the node when working against docker swarm
      */
     public Node getNode() {
         return node;
     }
 
-    /*
-     * Get type of event.
-     *
-     * @return type of event
-     */
     @CheckForNull
-    public String getType() {
+    public EventType getType() {
         return type;
     }
 
+    /**
+     * @see #action
+     */
+    @CheckForNull
+    public String getAction() {
+        return action;
+    }
+
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
     }
 }
