From 6071592e578c975b9d9c37629a697dea576a1400 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 17 May 2019 00:40:52 +0200 Subject: [PATCH] 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();