From 6071592e578c975b9d9c37629a697dea576a1400 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 17 May 2019 00:40:52 +0200 Subject: [PATCH 1/2] Change RuneLiteAPI#apiRoot to #sessionBase - Rename apiRoot method to sessionBase method - Move /session context path to sessionBase method Signed-off-by: Tomas Slusny --- .../src/main/java/net/runelite/http/api/RuneLiteAPI.java | 4 ++-- .../src/main/java/net/runelite/client/SessionClient.java | 9 +++------ 2 files changed, 5 insertions(+), 8 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 3dee9272d9..65aeab39f1 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 @@ -95,9 +95,9 @@ public class RuneLiteAPI .build(); } - public static HttpUrl getApiRoot() + public static HttpUrl getSessionBase() { - return HttpUrl.parse(BASE); + return HttpUrl.parse(BASE + "/session"); } public static HttpUrl getApiBase() diff --git a/runelite-client/src/main/java/net/runelite/client/SessionClient.java b/runelite-client/src/main/java/net/runelite/client/SessionClient.java index 9d02ee1961..e3166dfc98 100644 --- a/runelite-client/src/main/java/net/runelite/client/SessionClient.java +++ b/runelite-client/src/main/java/net/runelite/client/SessionClient.java @@ -39,8 +39,7 @@ class SessionClient { UUID open() throws IOException { - HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() - .addPathSegment("session") + HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() .build(); Request request = new Request.Builder() @@ -62,8 +61,7 @@ class SessionClient void ping(UUID uuid) throws IOException { - HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() - .addPathSegment("session") + HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() .addPathSegment("ping") .addQueryParameter("session", uuid.toString()) .build(); @@ -83,8 +81,7 @@ class SessionClient void delete(UUID uuid) throws IOException { - HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() - .addPathSegment("session") + HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() .addQueryParameter("session", uuid.toString()) .build(); From e4cd2bb0b9f7375a6d803e8b324f0726ddc609bb Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 5 Mar 2019 08:30:01 +0100 Subject: [PATCH 2/2] Support specifying API endpoins via java props - Add support fo specifying runelite.session.url java prop to be used instead of RuneLite session base - Add support fo specifying runelite.http-service.url java prop to be used instead of RuneLite api base url - Add support fo specifying runelite.ws.url java prop to be used instead of RuneLite websocket url - Add support for specifying runelite.static.url java prop to be used instead of RuneLite s.r.n url Signed-off-by: Tomas Slusny --- .../net/runelite/http/api/RuneLiteAPI.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) 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 65aeab39f1..472c241f72 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 @@ -97,21 +97,49 @@ public class RuneLiteAPI public static HttpUrl getSessionBase() { + final String prop = System.getProperty("runelite.session.url"); + + if (prop != null && !prop.isEmpty()) + { + return HttpUrl.parse(prop); + } + return HttpUrl.parse(BASE + "/session"); } public static HttpUrl getApiBase() { + final String prop = System.getProperty("runelite.http-service.url"); + + if (prop != null && !prop.isEmpty()) + { + return HttpUrl.parse(prop); + } + return HttpUrl.parse(BASE + "/runelite-" + getVersion()); } public static HttpUrl getStaticBase() { + final String prop = System.getProperty("runelite.static.url"); + + if (prop != null && !prop.isEmpty()) + { + return HttpUrl.parse(prop); + } + return HttpUrl.parse(STATICBASE); } public static HttpUrl getWsEndpoint() { + final String prop = System.getProperty("runelite.ws.url"); + + if (prop != null && !prop.isEmpty()) + { + return HttpUrl.parse(prop); + } + return HttpUrl.parse(WSBASE); }