From 94b3ce819ff81656f3e94242edbbb3a41db7ca3e Mon Sep 17 00:00:00 2001
From: MJRLegends <MJRLegends@users.noreply.github.com>
Date: Fri, 20 Dec 2019 04:51:31 +0000
Subject: [PATCH 1/2] Updated Gson & Java Websockets versions

---
 pom.xml                                                  | 4 ++--
 .../mixer/api/resource/chat/ws/MixerChatConnectable.java | 9 +++++----
 .../constellation/ws/MixerConstellationConnectable.java  | 9 +++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba291dd..bc1f432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
         <guava.version>17.0</guava.version>
         <httpclient.version>4.3.6</httpclient.version>
         <java-jwt.version>2.2.0</java-jwt.version>
-        <gson.version>2.2.4</gson.version>
-        <java-websocket.version>1.3.4</java-websocket.version>
+        <gson.version>2.8.5</gson.version>
+        <java-websocket.version>1.4.0</java-websocket.version>
         <junit.version>4.11</junit.version>
         <powermock.version>1.9.0-rc1</powermock.version>
 
diff --git a/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnectable.java b/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnectable.java
index 95c7de4..1dc3f91 100644
--- a/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnectable.java
+++ b/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnectable.java
@@ -11,6 +11,11 @@
 import com.mixer.api.resource.chat.replies.ReplyHandler;
 
 import javax.net.ssl.SSLSocketFactory;
+
+import org.java_websocket.enums.Opcode;
+import org.java_websocket.framing.FramedataImpl1;
+
+
 import java.io.IOException;
 
 public class MixerChatConnectable {
@@ -84,10 +89,6 @@ public boolean isClosing() {
         return connection.isClosing();
     }
 
-    public boolean isConnecting() {
-        return connection.isConnecting();
-    }
-
     public boolean isOpen() {
         return connection.isOpen();
     }
diff --git a/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java b/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java
index 30a868b..4d52f6e 100644
--- a/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java
+++ b/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java
@@ -7,7 +7,8 @@
 import com.mixer.api.resource.constellation.MixerConstellation;
 import com.mixer.api.resource.constellation.events.EventHandler;
 import com.mixer.api.resource.constellation.replies.ReplyHandler;
-import org.java_websocket.framing.Framedata;
+
+import org.java_websocket.enums.Opcode;
 import org.java_websocket.framing.FramedataImpl1;
 
 import javax.net.ssl.SSLSocketFactory;
@@ -82,7 +83,7 @@ public void run() {
      */
     private void ping()
     {
-        FramedataImpl1 frame = FramedataImpl1.get(Framedata.Opcode.PING);
+        FramedataImpl1 frame = FramedataImpl1.get(Opcode.PING);
         frame.setFin(true);
         connection.sendFrame(frame);
     }
@@ -121,10 +122,6 @@ public boolean isClosing() {
         return connection.isClosing();
     }
 
-    public boolean isConnecting() {
-        return connection.isConnecting();
-    }
-
     public boolean isOpen() {
         return connection.isOpen();
     }

From 7a1f831c669c41f3b71ae238729af4ad52fbf665 Mon Sep 17 00:00:00 2001
From: MJRLegends <MJRLegends@users.noreply.github.com>
Date: Fri, 8 May 2020 20:58:46 +0100
Subject: [PATCH 2/2] Bump Java-WebSocket from 1.4.0 to 1.5.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bc1f432..5358c8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
         <httpclient.version>4.3.6</httpclient.version>
         <java-jwt.version>2.2.0</java-jwt.version>
         <gson.version>2.8.5</gson.version>
-        <java-websocket.version>1.4.0</java-websocket.version>
+        <java-websocket.version>1.5.0</java-websocket.version>
         <junit.version>4.11</junit.version>
         <powermock.version>1.9.0-rc1</powermock.version>