fix: arrange mistakes and fix properties

relates to: #93

Author: stachu540

api/src/main/java/hirez/api/Division.java

@@ -27,7 +27,7 @@ public enum Division {
     Diamond_III,
     Diamond_II,
     Diamond_I,
-    Master,
+    Master_I,
     Grandmaster;
 
     private final String value =

api/src/main/java/hirez/api/Endpoint.java

@@ -1,6 +1,5 @@
 package hirez.api;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import hirez.api.object.*;
@@ -76,8 +75,15 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
 
     protected final <T> Single<T> call(Class<T> type, String method, String... argv) {
         return get(type, configuration.createUrl(method, argv)).flatMap(r -> Single.create(sink -> {
-            if (type.isAssignableFrom(ReturnedMessage.class)) {
-                ReturnedMessage rm = (type.isArray()) ? ((ReturnedMessage[]) r)[0] : (ReturnedMessage) r;
+            ReturnedMessage rm = null;
+            if (r instanceof ReturnedMessage[] && ((ReturnedMessage[]) r).length > 0) {
+                rm = ((ReturnedMessage[]) r)[0];
+            }
+            if (r instanceof ReturnedMessage) {
+                rm = (ReturnedMessage) r;
+            }
+
+            if (rm != null) {
                 if (rm.getReturnedMessage() != null) {
                     if (method.equalsIgnoreCase("createsession")) {
                         if (rm.getReturnedMessage().equals("Approved")) {
@@ -145,12 +151,12 @@ public final Single<Ping> ping() {
                 .map(Ping::new);
     }
 
-    public final Single<DataUsage> getDataUsed() {
+    public Single<DataUsage> getDataUsed() {
         return testAndCall(DataUsage[].class, "getdataused")
                 .map(d -> d[0]);
     }
 
-    public final Flowable<HiRezServer> getHiRezServerStatus() {
+    public Flowable<HiRezServer> getHiRezServerStatus() {
         return testAndCall(HiRezServer[].class, "gethirezserverstatus")
                 .flattenAsFlowable(Arrays::asList);
     }

api/src/main/java/hirez/api/object/DataUsage.java

@@ -1,18 +1,31 @@
 package hirez.api.object;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import hirez.api.object.adapters.DurationTime;
 import hirez.api.object.interfaces.ReturnedMessage;
 import lombok.Data;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 @Data
 public class DataUsage implements ReturnedMessage {
+    @JsonAlias("Active_Sessions")
     private final int activeSessions;
+    @JsonAlias("Concurrent_Sessions")
     private final int concurrentSessions;
+    @JsonAlias("Request_Limit_Daily")
     private final long requestLimitDaily;
-    @JsonProperty("ret_msg")
-    private final String returnedMessage;
+    @JsonAlias("Session_Cap")
     private final int sessionCap;
-    private final long sessionTimeLimit;
+    @DurationTime(ChronoUnit.MINUTES)
+    @JsonAlias("Session_Time_Limit")
+    private final Duration sessionTimeLimit;
+    @JsonAlias("Total_Requests_Today")
     private final long totalRequestsToday;
+    @JsonAlias("Total_Sessions_Today")
     private final long totalSessionsToday;
+    @JsonProperty("ret_msg")
+    private final String returnedMessage;
 }

api/src/main/java/hirez/api/object/HiRezServer.java

@@ -5,12 +5,15 @@
 import hirez.api.object.interfaces.ReturnedMessage;
 import lombok.Data;
 
+import javax.annotation.Nullable;
 import java.util.Date;
 
 @Data
 public class HiRezServer implements ReturnedMessage {
-    @DateTimeFormat("yyyy-MM-dd hh:mm:ss.SSS")
+    @Nullable
+    @DateTimeFormat("yyyy-MM-dd  H:mm:ss.SSS")
     private final Date entryDatetime;
+    private final String environment;
     private final boolean limitedAccess;
     private final String platform;
     @JsonProperty("ret_msg")

api/src/main/java/hirez/api/object/LeagueSeason.java

@@ -14,5 +14,4 @@ public class LeagueSeason implements ReturnedMessage {
     private final String returnedMessage;
     private final int round;
     private final int season;
-
 }

api/src/main/java/hirez/api/object/MergedAccount.java

@@ -1,14 +1,18 @@
 package hirez.api.object;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import hirez.api.object.adapters.DateTimeFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class MergedAccount {
-    @DateTimeFormat("M/dd/yyyy  h:mm:ssa")
+    @JsonProperty("merge_datetime")
+    @DateTimeFormat("MMM dd yyyy  h:mma")
     private final Date mergeDatetime;
+    @JsonProperty("playerId")
     private final long playerId;
+    @JsonProperty("portalId")
     private final int portalId;
 }

api/src/main/java/hirez/api/object/PatchInfo.java

@@ -1,11 +1,13 @@
 package hirez.api.object;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import hirez.api.object.interfaces.ReturnedMessage;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PatchInfo implements ReturnedMessage {
     @JsonProperty("ret_msg")
     private final String returnedMessage;

api/src/main/java/hirez/api/object/PlayerQuery.java

@@ -1,14 +1,26 @@
 package hirez.api.object;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import hirez.api.object.adapters.TextToBoolean;
 import hirez.api.object.interfaces.ReturnedMessage;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 @Data
 public class PlayerQuery implements ReturnedMessage {
-    private final long id;
+    @JsonAlias("Name")
     private final String name;
+    @JsonProperty("hz_player_name")
+    private final String hiRezPlayerName;
+    @JsonAlias("player_id")
+    private final long id;
+    @JsonProperty("portal_id")
+    private final int portalId;
+    @TextToBoolean
+    @Accessors(fluent = true)
+    @JsonProperty("privacy_flag")
+    private final boolean isPrivate;
     @JsonProperty("ret_msg")
     private final String returnedMessage;
-    private final long steamId;
 }

api/src/main/java/hirez/api/object/PlayerStatus.java

@@ -7,7 +7,7 @@
 
 @Data
 public class PlayerStatus implements ReturnedMessage {
-    @JsonProperty("Match")
+    @JsonAlias("Match")
     private final long matchId;
     private final int matchQueueId;
     private final String personalStatusMessage;
@@ -17,5 +17,4 @@ public class PlayerStatus implements ReturnedMessage {
     private final int statusId;
     @JsonAlias("status")
     private final String statusString;
-
 }

api/src/main/java/hirez/api/object/adapters/DateTimeDeserializer.java

@@ -1,35 +1,35 @@
 package hirez.api.object.adapters;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 
 import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.TimeZone;
+import java.util.Locale;
 
 public class DateTimeDeserializer extends JsonDeserializer<Date> implements ContextualDeserializer {
 
     private DateTimeFormat annotationDTF;
 
     @Override
     public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-        SimpleDateFormat sdf = new SimpleDateFormat(annotationDTF.value());
-        sdf.setTimeZone(TimeZone.getTimeZone(ZoneOffset.UTC));
-
-        try {
-            return sdf.parse(p.getText());
-        } catch (ParseException e) {
-            throw new JsonParseException(p, "Cannot parse to Date format!", e);
-        }
+        if (p.hasToken(JsonToken.VALUE_NULL)) return null;
+        String text = p.getText();
+        if (text.isEmpty()) return null;
+
+        return Date.from(DateTimeFormatter.ofPattern(annotationDTF.value(), Locale.US)
+                .withZone(ZoneId.from(ZoneOffset.UTC))
+                .parse(text, Instant::from));
     }
 
     @Override