From 38823d1afae3cfc62aad0a82a9da0d88cd30d465 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 15 May 2017 19:07:41 -0400 Subject: [PATCH] http-api: share a common http client --- .../src/main/java/net/runelite/http/api/RuneliteAPI.java | 3 +++ .../main/java/net/runelite/http/api/account/LoginClient.java | 4 +--- .../java/net/runelite/http/api/hiscore/HiscoreClient.java | 4 +--- .../src/main/java/net/runelite/http/api/xtea/XteaClient.java | 4 +--- .../net/runelite/http/service/hiscore/HiscoreService.java | 5 ++--- .../java/net/runelite/http/service/worlds/WorldsService.java | 5 ++--- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java index 4f193d08a9..2a499fc937 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +36,8 @@ public class RuneliteAPI { private static final Logger logger = LoggerFactory.getLogger(RuneliteAPI.class); + public static final OkHttpClient CLIENT = new OkHttpClient(); + private static final String BASE = "https://api.runelite.net/runelite-"; private static final String WSBASE = "wss://api.runelite.net/runelite-"; private static final Properties properties = new Properties(); diff --git a/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java b/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java index 60947380c2..ef03953340 100644 --- a/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java +++ b/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java @@ -30,7 +30,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import net.runelite.http.api.RuneliteAPI; import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; @@ -41,7 +40,6 @@ public class LoginClient { private static final Logger logger = LoggerFactory.getLogger(LoginClient.class); - private final OkHttpClient client = new OkHttpClient(); private final Gson gson = new Gson(); public OAuthResponse login() throws IOException @@ -58,7 +56,7 @@ public class LoginClient .url(url) .build(); - Response response = client.newCall(request).execute(); + Response response = RuneliteAPI.CLIENT.newCall(request).execute(); try (ResponseBody body = response.body()) { diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java index 7832c6b42c..23581669f7 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java @@ -30,7 +30,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import net.runelite.http.api.RuneliteAPI; import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; @@ -41,7 +40,6 @@ public class HiscoreClient { private static final Logger logger = LoggerFactory.getLogger(HiscoreClient.class); - private final OkHttpClient client = new OkHttpClient(); private final Gson gson = new Gson(); public HiscoreResult lookup(String username) throws IOException @@ -58,7 +56,7 @@ public class HiscoreClient .url(url) .build(); - Response response = client.newCall(request).execute(); + Response response = RuneliteAPI.CLIENT.newCall(request).execute(); try (ResponseBody body = response.body()) { diff --git a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java index 1fe82a19fa..79cd7fbc9b 100644 --- a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java @@ -29,7 +29,6 @@ import java.io.IOException; import net.runelite.http.api.RuneliteAPI; import okhttp3.HttpUrl; import okhttp3.MediaType; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @@ -42,7 +41,6 @@ public class XteaClient private static final Logger logger = LoggerFactory.getLogger(XteaClient.class); - private final OkHttpClient client = new OkHttpClient(); private final Gson gson = new Gson(); public Response submit(int revision, int region, int[] keys) throws IOException @@ -70,6 +68,6 @@ public class XteaClient .url(url) .build(); - return client.newCall(request).execute(); + return RuneliteAPI.CLIENT.newCall(request).execute(); } } diff --git a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java index e88ff4144b..5f265343e8 100644 --- a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java +++ b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java @@ -26,10 +26,10 @@ package net.runelite.http.service.hiscore; import java.io.IOException; import java.net.URISyntaxException; +import net.runelite.http.api.RuneliteAPI; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.Skill; import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; @@ -41,7 +41,6 @@ public class HiscoreService { private static final HttpUrl RUNESCAPE_HISCORE_SERVICE = HttpUrl.parse("http://services.runescape.com/m=hiscore_oldschool/index_lite.ws"); - private final OkHttpClient client = new OkHttpClient(); private HttpUrl url = RUNESCAPE_HISCORE_SERVICE; public HiscoreResult lookup(String username) throws IOException, URISyntaxException @@ -53,7 +52,7 @@ public class HiscoreService .url(builder.build()) .build(); - Response response = client.newCall(request).execute(); + Response response = RuneliteAPI.CLIENT.newCall(request).execute(); String responseStr; try (ResponseBody body = response.body()) diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java b/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java index e27b381e56..f31c1b0cf1 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java @@ -29,10 +29,10 @@ import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import net.runelite.http.api.RuneliteAPI; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldResult; import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; @@ -41,7 +41,6 @@ public class WorldsService { private static final HttpUrl WORLD_URL = HttpUrl.parse("http://www.runescape.com/g=oldscape/slr.ws?order=LPWM"); - private final OkHttpClient client = new OkHttpClient(); private HttpUrl url = WORLD_URL; public WorldResult listWorlds() throws IOException, URISyntaxException @@ -50,7 +49,7 @@ public class WorldsService .url(url) .build(); - Response response = client.newCall(request).execute(); + Response response = RuneliteAPI.CLIENT.newCall(request).execute(); byte[] b; try (ResponseBody body = response.body())