Rewrote Exception handling

Author: Miic

src/main/java/com/elyssiamc/Micc/JavaMee6APIWrapper/DataStructures/SimpleAPICache.java

@@ -6,6 +6,8 @@
 import java.io.InputStreamReader;
 import java.lang.reflect.Array;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
 import java.net.URL;
 
 import com.google.gson.Gson;
@@ -28,53 +30,48 @@ public SimpleAPICache(String url, int limit, long cacheLifespan) {
 		gson = new Gson();
 	}
 
-	public MeeResponse getJson() {
+	public MeeResponse getJson() throws IOException {
 		if (cache != null && System.currentTimeMillis() - lastQuery < cacheLifespan) {
 			return cache;
 		}
 
-		try {
-			int page = 0;
-			boolean contFlag = false;
-			
-			do {
-		       	HttpURLConnection httpcon = (HttpURLConnection) ((new URL(toBeCheck + "?limit=" + limit + "&page=" + page).openConnection()));
-		    	httpcon.setDoOutput(true);
-		    	httpcon.addRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64)");
-		    	httpcon.setRequestMethod("GET");
-		    	httpcon.connect();
-		    	
-		    	//Read response
-		    	InputStream is = httpcon.getInputStream();
-		    	BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-		    	String line = null;
-		    	StringBuffer sb = new StringBuffer();
-		    	while ((line = reader.readLine()) != null) {
-		    	    sb.append(line);
-		    	}
-		    	is.close();
-		    	httpcon.disconnect();
-		    	//Get specified data needed.	    	
-		    	
-		    	MeeResponse responseInstance = gson.fromJson(sb.toString(), MeeResponse.class);
-		    	
-		    	if (cache == null) {
-		    		cache = gson.fromJson(sb.toString(), MeeResponse.class);
-		    	} else if (cache.getPlayers().length != 0) {
-		    		cache.setPlayers(concatenate(cache.getPlayers(), responseInstance.getPlayers()));
-		    	}
-		    	
-		    	if (responseInstance.getPlayers().length == limit) {
-		    		contFlag = true;
-		    		page++;
-		    	}
-			} while (contFlag);
+		int page = 0;
+		boolean contFlag = false;
+		
+		do {
+	       	HttpURLConnection httpcon = (HttpURLConnection) ((new URL(toBeCheck + "?limit=" + limit + "&page=" + page).openConnection()));
+	    	httpcon.setDoOutput(true);
+	    	httpcon.addRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64)");
+	    	httpcon.setRequestMethod("GET");
+	    	httpcon.connect();
 
-	    	return cache;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		}
+	    	//Read response
+	    	InputStream is = httpcon.getInputStream();
+	    	BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+	    	String line = null;
+	    	StringBuffer sb = new StringBuffer();
+	    	while ((line = reader.readLine()) != null) {
+	    	    sb.append(line);
+	    	}
+	    	is.close();
+	    	httpcon.disconnect();
+	    	//Get specified data needed.	    	
+	    	
+	    	MeeResponse responseInstance = gson.fromJson(sb.toString(), MeeResponse.class);
+	    	
+	    	if (cache == null) {
+	    		cache = gson.fromJson(sb.toString(), MeeResponse.class);
+	    	} else if (cache.getPlayers().length != 0) {
+	    		cache.setPlayers(concatenate(cache.getPlayers(), responseInstance.getPlayers()));
+	    	}
+	    	
+	    	if (responseInstance.getPlayers().length == limit) {
+	    		contFlag = true;
+	    		page++;
+	    	}
+		} while (contFlag);
+    	
+    	return cache;
 	}
 
 	private static Players[] concatenate(Players[] a, Players[] b) {

src/main/java/com/elyssiamc/Micc/JavaMee6APIWrapper/Mee6API.java

@@ -1,5 +1,7 @@
 package com.elyssiamc.Micc.JavaMee6APIWrapper;
 
+import java.io.IOException;
+
 import com.elyssiamc.Micc.JavaMee6APIWrapper.DataStructures.Guild;
 import com.elyssiamc.Micc.JavaMee6APIWrapper.DataStructures.MeeResponse;
 import com.elyssiamc.Micc.JavaMee6APIWrapper.DataStructures.Players;
@@ -15,34 +17,42 @@ public Mee6API(String serverid) {
 		this.serverid = serverid;
 		mee = new SimpleAPICache(
 			"https://api.mee6.xyz/plugins/levels/leaderboard/" +
-			serverid, 1000, 30000);
+			serverid, 1000, 300000);
 	}
 
 	public String getServerId() {
 		return serverid;
 	}
 
 	public Guild getGuild() {
-		return getAbstractResponse().getGuild();
+		MeeResponse response = getAbstractResponse();
+		return response != null ? response.getGuild() : null;
 	}
 
 	public Role_rewards[] getRewards() {
-		return getAbstractResponse().getRole_rewards();
+		MeeResponse response = getAbstractResponse();
+		return response != null ? response.getRole_rewards() : null;
 	}
 
 	public MeeResponse getAbstractResponse() {
-		return mee.getJson();
+		try {
+			return mee.getJson();
+		} catch (IOException e) {}
+		return null;
 	}
 
 	public Players[] getPlayers() {
-		return getAbstractResponse().getPlayers();
+		MeeResponse response = getAbstractResponse();
+		return response != null ? response.getPlayers() : null;
 	}
 
 	public Players getPlayer(String discordid) {
 		Players[] meePlayers = getPlayers();
-		for(Players player : meePlayers) {
-			if (player.getId().equals(discordid)) {
-				return player;
+		if (meePlayers != null) {
+			for(Players player : meePlayers) {
+				if (player.getId().equals(discordid)) {
+					return player;
+				}
 			}
 		}
 		return null;