more better, quite look code

Author: Damian Staszewski

src/main/java/pl/stachuofficial/hirezapi/HiRezAPI.java

@@ -51,6 +51,9 @@ public synchronized String setProperty(String key, String value) {
      * @param authKey Authorization Key (AuthKey)
      */
     public HiRezAPI(String devId, String authKey) {
+        if (!Boolean.valueOf(System.getProperty("hirez.debug"))) {
+            System.setProperty("hirez.debug","false");
+        }
         this.devId = devId;
         this.authKey = authKey;
         try {

src/main/java/pl/stachuofficial/hirezapi/api/HttpClient.java

@@ -4,7 +4,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
@@ -36,14 +35,23 @@ protected String request(String endpoint, String... args) {
             url += (Arrays.asList(args).toArray().length > 0) ?
                     String.join("/", Arrays.asList(args)) :
                     "";
+            if (Boolean.valueOf(System.getProperty("hirez.debug"))) {
+                System.out.println(url);
+            }
 
             Request request = new Request.Builder()
                     .url(url)
                     .header("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.52 Safari/537.36")
                     .build();
 
             Response response = client.newCall(request).execute();
-                if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+                if (!response.isSuccessful()) {
+                    String res_data = "Protocol: " + response.protocol().toString();
+                    res_data += ";\r\nCode: " + response.code();
+                    res_data += ";\r\nMessage: " + response.message();
+                    res_data += ";\r\nURL: " + url;
+                    throw new SessionException("Unexpected code \r\n" + res_data);
+                }
 
             return response.body().string();
         } catch (Exception ex) {

src/main/java/pl/stachuofficial/hirezapi/api/Session.java

@@ -10,15 +10,11 @@
  */
 public class Session extends HttpClient {
     private final String platform;
-    private final String devId;
-    private final String authKey;
     private final Signature sig;
 
     public Session(Smite.Platform platform, String devId, String authKey) {
         super(platform.getUrl());
         this.platform = "SMITE_" + platform.name();
-        this.devId = devId;
-        this.authKey = authKey;
         this.sig = new Signature(platform, devId, authKey);
         if (!HiRezAPI.sessions.containsKey(this.platform)) this.generateSession();
         if (!testSession().toString().startsWith("\"This was a successful test with the following parameters added:")) this.generateSession();
@@ -27,8 +23,6 @@ public Session(Smite.Platform platform, String devId, String authKey) {
     public Session(Paladins.Platform platform, String devId, String authKey) {
         super(platform.getUrl());
         this.platform = "PALADINS_" + platform.name();
-        this.devId = devId;
-        this.authKey = authKey;
         this.sig = new Signature(platform, devId, authKey);
         if (!HiRezAPI.sessions.containsKey(this.platform)) this.generateSession();
         if (!testSession().toString().startsWith("\"This was a successful test with the following parameters added:")) this.generateSession();
@@ -38,15 +32,16 @@ public StringData get(String endpoint, String... args) {
         return new StringData(request(this.sig.generateUrl(endpoint), args));
     }
 
-    public void generateSession() {
+    public StringData generateSession() {
+        StringData data = new StringData(request(this.sig.createSession()));
         try {
-            StringData data = new StringData(request(this.sig.createSession()));
             if (data.toJsonObject().getString("ret_msg").equals("Approved")) {
                 HiRezAPI.sessions.setProperty(this.platform, data.toJsonObject().getString("session_id"));
-            } else throw new Exception(data.toJsonObject().getString("ret_msg"));
-        } catch (Exception ex) {
+            } else throw new SessionException(data.toJsonObject().getString("ret_msg"));
+        } catch (SessionException ex) {
             ex.printStackTrace();
         }
+        return data;
     }
 
     public String testSession() {

src/main/java/pl/stachuofficial/hirezapi/api/SessionException.java

@@ -0,0 +1,13 @@
+package pl.stachuofficial.hirezapi.api;
+
+class SessionException extends Exception {
+
+    SessionException(String message) {
+        super(message);
+    }
+
+    SessionException(Throwable message) {
+        super(message);
+    }
+
+}

src/main/java/pl/stachuofficial/hirezapi/api/StringData.java

@@ -25,7 +25,7 @@ public StringData(String string) {
      */
     @Override
     public String toString() {
-        return string;
+        return string.replace("\\\"", "");
     }
 
     /**

src/main/java/pl/stachuofficial/hirezapi/games/HiRez.java

@@ -41,12 +41,12 @@ public StringData get(String endpoint, String... args) {
      * @return A quick way of validating access to the Hi-Rez API.
      */
     public String ping() {
-        return request("pingJson").replace("\\", "");
+        return new StringData(request("pingJson")).toString();
     }
     /**
      * A required step to Authenticate the developerId/signature for further API use.
      */
-    public void createSession() { this.session.generateSession(); }
+    public StringData createSession() { return this.session.generateSession(); }
     /**
      * Testing session when it is established.
      * @return A means of validating that a session is established.
@@ -193,8 +193,8 @@ public StringData getMatchIDsByQueue(Smite.Queue queue, Date date, boolean allDa
         SimpleDateFormat date_path = (allDay) ? new SimpleDateFormat("yyyyMMdd/-1") : new SimpleDateFormat("yyyyMMdd/HH");
         SimpleDateFormat minute = new SimpleDateFormat("mm");
         String min = String.valueOf(Integer.parseInt(minute.format(date)) - (Integer.parseInt(minute.format(date)) % 10));
-        String path = date_path.format(date) + ((allDay) ? "," + min : "");
-        return get("getmatchidsbyqueue", path);
+        String path = date_path.format(date) + ((!allDay) ? "," + min : "");
+        return get("getmatchidsbyqueue", Integer.toString(queue.getId()), path);
     }
 
     /**
@@ -208,8 +208,8 @@ public StringData getMatchIDsByQueue(Paladins.Queue queue, Date date, boolean al
         SimpleDateFormat date_path = (allDay) ? new SimpleDateFormat("yyyyMMdd/-1") : new SimpleDateFormat("yyyyMMdd/HH");
         SimpleDateFormat minute = new SimpleDateFormat("mm");
         String min = String.valueOf(Integer.parseInt(minute.format(date)) - (Integer.parseInt(minute.format(date)) % 10));
-        String path = date_path.format(date) + ((allDay) ? "," + min : "");
-        return get("getmatchidsbyqueue", path);
+        String path = date_path.format(date) + ((!allDay) ? "," + min : "");
+        return get("getmatchidsbyqueue", Integer.toString(queue.getId()), path);
     }
 
     /**
@@ -231,7 +231,7 @@ public StringData getLeagueLeaderboard(Smite.Queue queue, TierLeauge tier, Strin
      * @return Returns the top players for a particular league (as indicated by the queue/tier/season parameters).
      */
     public StringData getLeagueLeaderboard(Paladins.Queue queue, TierLeauge tier, String season) {
-        return get("getleagueleaderboard", String.valueOf(queue.getId()), String.valueOf(tier.getId()), season);
+        return get("getleagueleaderboard", Integer.toString(queue.getId()), String.valueOf(tier.getId()), season);
     }
 
     /**

src/main/java/pl/stachuofficial/hirezapi/games/hirez/Player.java

@@ -0,0 +1,23 @@
+package pl.stachuofficial.hirezapi.games.hirez;
+
+import org.json.JSONObject;
+import pl.stachuofficial.hirezapi.api.StringData;
+
+import java.util.Map;
+
+public class Player {
+    private final Map<String, Object> playerdata;
+
+    public Player(StringData player, StringData achievements) {
+        JSONObject stats = achievements.toJsonObject();
+        JSONObject user = player.toJsonObject();
+        stats.remove("Id");
+        String tag = user.getString("Name").replace(stats.getString("Name"), "");
+        user.put("Name", stats.getString("Name"));
+        user.put("Team_Tag", tag.substring(1, tag.length() - 1));
+        stats.remove("Name");
+        user.put("Stats", stats);
+
+        this.playerdata = user.toMap();
+    }
+}