Merge remote-tracking branch 'origin/master'

Author: Taylor Caldwell

pom.xml

@@ -25,7 +25,7 @@
     <dependency>
 	<groupId>com.google.code.gson</groupId>
     	<artifactId>gson</artifactId>
-    	<version>2.3.1</version>
+    	<version>2.5</version>
     </dependency>
   </dependencies>
 

src/main/java/riotapi/MatchApi.java

@@ -46,13 +46,14 @@ public static MatchDetail getMatch(Region region, String key, long matchId, bool
 
 		return matchDetail;
 	}
-	
-	public static MatchDetail getMatchForTournament(Region region, String key, long matchId, String tournamentCode, boolean includeTimeline) throws RiotApiException {
+
+	public static MatchDetail getMatchForTournament(Region region, String key, long matchId, String tournamentCode, boolean includeTimeline)
+			throws RiotApiException {
 		String url = region.getEndpoint() + VERSION + "match/for-tournament/" + matchId + "?tournamentCode=" + tournamentCode + "&api_key=" + key;
 		if (includeTimeline) {
 			url += "&includeTimeline=" + includeTimeline;
 		}
-		
+
 		MatchDetail matchDetail = null;
 		try {
 			matchDetail = new Gson().fromJson(Request.sendGet(url, null), MatchDetail.class);
@@ -65,7 +66,7 @@ public static MatchDetail getMatchForTournament(Region region, String key, long
 
 		return matchDetail;
 	}
-	
+
 	public static List<Long> getMatchesByTournament(Region region, String key, String tournamentCode) throws RiotApiException {
 		String url = region.getEndpoint() + VERSION + "match/by-tournament/" + tournamentCode + "/ids?api_key=" + key;
 

src/main/java/riotapi/Request.java

@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -12,22 +11,24 @@
 
 public class Request {
 
-	private static String execute(String method, String URL, String key, String body) throws RiotApiException {
+	protected enum RequestMethod {
+		DELETE, GET, POST, PUT
+	};
 
+	protected static String execute(RequestMethod method, String requestURL, String key, String body) throws RiotApiException {
 		HttpURLConnection connection = null;
-
 		try {
-			String requestURL = URL;
 			URL url = new URL(requestURL);
-
 			connection = (HttpURLConnection) url.openConnection();
-			connection.setRequestMethod(method);
+			connection.setRequestMethod(method.name());
 			connection.setInstanceFollowRedirects(false);
-			if(key != null) {
+
+			if (key != null) {
 				connection.setRequestProperty("X-Riot-Token", key);
 			}
-			
-			if(method.equals("PUT") || method.equals("POST")) {
+
+			if (method == RequestMethod.POST || method == RequestMethod.PUT) {
+
 				connection.setRequestProperty("Content-Type", "application/json");
 				connection.setDoOutput(true);
 				DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
@@ -37,33 +38,28 @@ private static String execute(String method, String URL, String key, String body
 			}
 
 			int responseCode = connection.getResponseCode();
-			
 			if (responseCode == 429) {
 				String retryAfterString = connection.getHeaderField("Retry-After");
 				String rateLimitType = connection.getHeaderField("X-Rate-Limit-Type");
-				if(retryAfterString != null) {
+				if (retryAfterString != null) {
 					int retryAfter = Integer.parseInt(retryAfterString);
 					throw new RiotApiException(responseCode, retryAfter, rateLimitType);
 				} else {
 					throw new RiotApiException(responseCode, 0, rateLimitType);
-				}	
-			}
-			
-			else if (responseCode != 200 && responseCode != 204) {
+				}
+			} else if (responseCode != 200 && responseCode != 204) {
+				System.out.println(requestURL);
 				throw new RiotApiException(responseCode);
 			}
-			
-			InputStream is = connection.getInputStream();
-			BufferedReader rd = new BufferedReader(new InputStreamReader(is, "utf-8"));
-			StringBuilder response = new StringBuilder();
 
+			BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
+			StringBuilder response = new StringBuilder();
 			String line;
-			while ((line = rd.readLine()) != null) {
+			while ((line = br.readLine()) != null) {
 				response.append(line);
-				response.append('\r');
+				response.append(System.lineSeparator());
 			}
-			rd.close();
-
+			br.close();
 			connection.disconnect();
 			return response.toString();
 		} catch (IOException ex) {
@@ -75,19 +71,19 @@ else if (responseCode != 200 && responseCode != 204) {
 			}
 		}
 	}
-	
+
 	// HTTP GET request
 	protected static String sendGet(String URL, String key) throws RiotApiException {
-		return execute("GET", URL, key, null);
+		return execute(RequestMethod.GET, URL, key, null);
 	}
-	
+
 	// HTTP POST request
 	protected static String sendPost(String URL, String key, String body) throws RiotApiException {
-		return execute("POST", URL, key, body);
+		return execute(RequestMethod.POST, URL, key, body);
 	}
-	
+
 	// HTTP PUT request
 	protected static String sendPut(String URL, String key, String body) throws RiotApiException {
-		return execute("PUT", URL, key, body);
+		return execute(RequestMethod.PUT, URL, key, body);
 	}
 }

src/main/java/riotapi/RiotApi.java

@@ -2829,7 +2829,7 @@ public MatchDetail getMatchForTournament(Region region, long matchId, String tou
 	public MatchDetail getMatchForTournament(long matchId, String tournamentCode, boolean includeTimeline) throws RiotApiException {
 		return getMatchForTournament(getRegion(), matchId, tournamentCode, includeTimeline);
 	}
-	
+
 	/**
 	 * Retrieve match by match ID and tournament code.
 	 *
@@ -2865,7 +2865,7 @@ public MatchDetail getMatchForTournament(Region region, long matchId, String tou
 	 *             if the API returns an error or unparsable result
 	 */
 	public MatchDetail getMatchForTournament(long matchId, String tournamentCode) throws RiotApiException {
-		return getMatchForTournament(getRegion(), matchId, tournamentCode, false);
+		return getMatchForTournament(getRegion(), matchId, tournamentCode);
 	}
 
 	/**