Rewrite callables to use unrest

Using maven is now essential
- Also removed jcabi
- Redid the async stuff
- Simpler way to send queries to API
- Shutdown hook to terminate executors and unirest

Author: njb-said

README.md

@@ -5,11 +5,11 @@ A Java implementation of the [mc-api.net](https://mc-api.net) API.
 
 ## Custom Handlers
 
-A handler decides how to get a uuid or username. The default handler will just query the API and then cache the result. However you can create your own, custom handler.
+A handler decides how a uuid or username is obtained. The default handler will just query the API and then cache the result. However you can create your own, custom handler.
 
 There are two premade for [Bukkit](https://bukkit.org)/[Spigot](http://spigotmc.org) and [BungeeCord](https://github.com/spigotmc/bungeecord):
-- [Bukkit Handler](https://gist.github.com/njb-said/cec2f56907e8eaa54021)
-- [Bungee Handler](https://gist.github.com/njb-said/39e1b0fdebc18b02fc14)
+- [Bukkit Handler](https://gist.github.com/njb-said/cec2f56907e8eaa54021): Checks if player is online or has played before, before querying API
+- [Bungee Handler](https://gist.github.com/njb-said/39e1b0fdebc18b02fc14): Checks if player is online before querying API
 
 Just implement these somewhere within your project and then set it as the active handler using this example (example is for the BungeeHandler.
 ```java

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mcapi.uuid</groupId>
     <artifactId>uuid-java</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <name>uuid-java</name>
 
     <scm>
@@ -19,18 +19,18 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>com.jcabi</groupId>
-            <artifactId>jcabi-aspects</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>18.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.3.27</version>
+        </dependency>
+
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>

src/main/java/net/mcapi/uuid/UUIDAPI.java

@@ -1,10 +1,14 @@
 package net.mcapi.uuid;
 
+import java.io.IOException;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import net.mcapi.uuid.handlers.JavaHandler;
 
 import com.google.common.base.Preconditions;
+import com.mashape.unirest.http.Unirest;
 
 /**
  * A UUID lookup API for Java and
@@ -23,6 +27,7 @@
  */
 public class UUIDAPI {
 
+    private static ExecutorService service;
     private static UUIDHandler handler;
     private static ServerRegion region;
 
@@ -64,6 +69,22 @@ public static UUIDHandler getHandler() {
     static {
         handler = new JavaHandler();
         region = ServerRegion.US;
+        Unirest.setTimeouts(3500, 15000);
+        service = Executors.newFixedThreadPool(5);
+
+        Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+            public void run() {
+                if(!service.isShutdown()) {
+                    service.shutdown();
+                }
+                try {
+                    Unirest.shutdown();
+                } catch (IOException ex) {
+                    System.err.println("Error while shutting down MC-API unirest library: " + ex.getLocalizedMessage());
+                }
+                System.out.println("[MC-API] Shutdown");
+            }
+        }));
     }
 
     /**
@@ -116,4 +137,8 @@ public static String getUsername(String uuid) {
         return handler.getUsername(uuid);
     }
 
+    public static ExecutorService getExecutor() {
+        return service;
+    }
+
 }

src/main/java/net/mcapi/uuid/calls/base/Callable.java

@@ -0,0 +1,22 @@
+package net.mcapi.uuid.calls.base;
+
+import java.util.concurrent.Future;
+
+import net.mcapi.uuid.UUIDAPI;
+
+/**
+ * An async callable
+ *
+ * @param <T> type to call and return
+ */
+public abstract class Callable<T> implements java.util.concurrent.Callable<T> {
+
+    private Future<T> run() {
+        return UUIDAPI.getExecutor().submit(this);
+    }
+
+    public T execute() throws Exception {
+        return run().get();
+    }
+
+}

src/main/java/net/mcapi/uuid/calls/base/JSONCallable.java

@@ -0,0 +1,27 @@
+package net.mcapi.uuid.calls.base;
+
+import net.mcapi.uuid.utils.UUIDUtils;
+
+import org.json.simple.JSONObject;
+
+import com.mashape.unirest.http.*;
+
+public abstract class JSONCallable extends Callable<JSONObject> {
+
+    private final String url;
+
+    public JSONCallable(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public JSONObject call() throws Exception {
+        HttpResponse<JsonNode> response = Unirest.get(url).asJson();
+        if(response == null || response.getBody() == null || response.getBody().getObject() == null) {
+            return null;
+        }
+
+        return (JSONObject)UUIDUtils.PARSER.parse(response.getBody().getObject().toString());
+    }
+
+}

src/main/java/net/mcapi/uuid/handlers/JavaHandler.java

@@ -5,8 +5,7 @@
 
 import net.mcapi.uuid.UUIDAPI;
 import net.mcapi.uuid.UUIDHandler;
-import net.mcapi.uuid.queries.NameQuery;
-import net.mcapi.uuid.queries.UUIDQuery;
+import net.mcapi.uuid.queries.APIQuery;
 import net.mcapi.uuid.utils.ExpireHashMap;
 import net.mcapi.uuid.utils.UUIDUtils;
 
@@ -30,10 +29,10 @@ public UUID getUUID(String username) {
             return uuid_cache.get(username);
         }
 
-        UUIDQuery query = new UUIDQuery(username);
+        APIQuery query = new APIQuery(username, "full_uuid");
 
         try {
-            UUID uuid = query.call();
+            UUID uuid = UUID.fromString(query.request());
             uuid_cache.put(username, uuid, 1, TimeUnit.HOURS);
             return uuid;
         } catch (Exception ex) {
@@ -57,10 +56,9 @@ public String getUsername(UUID uuid) {
             return name_cache.get(uuid);
         }
 
-        NameQuery query = new NameQuery(uuid.toString().replace("-", ""));
-
+        APIQuery query = new APIQuery(uuid.toString().replace("-", ""), "name");
         try {
-            String username = query.call();
+            String username = query.request();
             name_cache.put(uuid, username, 1, TimeUnit.HOURS);
             return username;
         } catch (Exception ex) {

src/main/java/net/mcapi/uuid/queries/APIQuery.java

@@ -0,0 +1,26 @@
+package net.mcapi.uuid.queries;
+
+import net.mcapi.uuid.UUIDAPI;
+import net.mcapi.uuid.calls.base.JSONCallable;
+
+import org.json.simple.JSONObject;
+
+public class APIQuery extends JSONCallable {
+
+    private final String key;
+
+    public APIQuery(String query, String key) {
+        super(UUIDAPI.getRegion().buildURL() + "/v3/" + key + "/" + query);
+        this.key = key;
+    }
+
+    public String request() throws Exception {
+        JSONObject jsonReturn = call();
+
+        if(jsonReturn.containsKey(key)) {
+            return jsonReturn.get(key).toString();
+        }
+        return null;
+    }
+
+}