From 7ee2c9d4b6fb255510aa34b2bb21c7742f1065d6 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 23 Jan 2018 11:21:43 +0100 Subject: [PATCH] Fix access levels of WSClient - Change some public access modifiers to private - Remove getSession and change it to checkSession that simply returns boolean that checks if other session is equal with current and update SessionManager according to that - Fix naming of gson const (change it to GSON) Signed-off-by: Tomas Slusny --- .../client/account/SessionManager.java | 2 +- .../net/runelite/client/account/WSClient.java | 22 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java index 9aaa7fcfac..87527a8f43 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java @@ -127,7 +127,7 @@ public class SessionManager public void openSession(AccountSession session) { // If the ws session already exists, don't need to do anything - if (wsclient == null || !wsclient.getSession().equals(session)) + if (wsclient == null || !wsclient.checkSession(session)) { if (wsclient != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java index 005698d6e0..4df3d3aca0 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java @@ -47,29 +47,27 @@ import okhttp3.WebSocketListener; public class WSClient extends WebSocketListener implements AutoCloseable { private static final Duration PING_TIME = Duration.ofSeconds(30); - - private static final Gson gson = WebsocketGsonFactory.build(); + private static final Gson GSON = WebsocketGsonFactory.build(); private final OkHttpClient client = new OkHttpClient(); - private final EventBus eventBus; + private final ScheduledFuture pingFuture; private final AccountSession session; private WebSocket webSocket; - private final ScheduledFuture pingFuture; - public WSClient(EventBus eventBus, ScheduledExecutorService executor, AccountSession session) + WSClient(EventBus eventBus, ScheduledExecutorService executor, AccountSession session) { this.eventBus = eventBus; this.session = session; this.pingFuture = executor.scheduleWithFixedDelay(this::ping, PING_TIME.getSeconds(), PING_TIME.getSeconds(), TimeUnit.SECONDS); } - public AccountSession getSession() + boolean checkSession(AccountSession session) { - return session; + return session.equals(this.session); } - public void connect() + void connect() { Request request = new Request.Builder() .url(RuneLiteAPI.getWsEndpoint()) @@ -82,14 +80,14 @@ public class WSClient extends WebSocketListener implements AutoCloseable send(handshake); } - public void ping() + private void ping() { Ping ping = new Ping(); ping.setTime(Instant.now()); send(ping); } - public void send(WebsocketMessage message) + private void send(WebsocketMessage message) { if (webSocket == null) { @@ -98,7 +96,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable connect(); } - String json = gson.toJson(message, WebsocketMessage.class); + String json = GSON.toJson(message, WebsocketMessage.class); webSocket.send(json); log.debug("Sent: {}", json); @@ -127,7 +125,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable @Override public void onMessage(WebSocket webSocket, String text) { - WebsocketMessage message = gson.fromJson(text, WebsocketMessage.class); + WebsocketMessage message = GSON.fromJson(text, WebsocketMessage.class); log.debug("Got message: {}", message); eventBus.post(message);