Change deserialiser

KostyaSha · KostyaSha · commit a06e9dd9eb4d · 2017-06-29T11:46:15.000+03:00
diff --git a/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
@@ -1,6 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * https://github.com/moby/moby/blob/master/api/types/swarm/swarm.go#L174-L188
@@ -9,26 +14,40 @@
  */
 public enum LocalNodeState {
 
-    @JsonProperty("inactive")
-    INACTIVE,
-
-    @JsonProperty("pending")
-    PENDING,
-
-    @JsonProperty("active")
-    ACTIVE,
-
-    @JsonProperty("error")
-    ERROR,
-
-    @JsonProperty("locked")
-    LOCKED,
+    INACTIVE("inactive"),
+    PENDING("pending"),
+    ACTIVE("active"),
+    ERROR("error"),
+    LOCKED("locked"),
 
     /**
      * Can not construct instance of com.github.dockerjava.api.model.LocalNodeState
      * from String value '': value not one of declared Enum instance names: [error, locked, inactive, active, pending]
      */
-    @JsonProperty("")
-    EMPTY
+    EMPTY("");
+
+    private static final Map<String, LocalNodeState> TYPES = new HashMap<>();
+
+    static {
+        for (LocalNodeState t : values()) {
+            TYPES.put(t.name().toLowerCase(), t);
+        }
+    }
+
+    private String value;
+
+    LocalNodeState(@Nonnull String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    @JsonCreator
+    public static LocalNodeState forValue(String s) {
+        return TYPES.get(s);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -18,8 +18,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmInfo implements Serializable {
-
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
@@ -34,8 +33,6 @@ public class SwarmInfo implements Serializable {
     private String nodeAddr;
 
     /**
-     * Not {@link LocalNodeState}, because in swarm it string and we got error:
-     *
      * @since 1.24
      */
     @JsonProperty("LocalNodeState")
