Skip to content
This repository has been archived by the owner on Jul 21, 2020. It is now read-only.

Updated Gson & Java Websockets versions #77

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated Gson & Java Websockets versions #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b3ce8
Updated Gson & Java Websockets versions
MJRLegends Dec 20, 2019
7a1f831
Bump Java-WebSocket from 1.4.0 to 1.5.0
MJRLegends May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0</java-websocket.version>
<junit.version>4.11</junit.version>
<powermock.version>1.9.0-rc1</powermock.version>

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnectable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -84,10 +89,6 @@ public boolean isClosing() {
return connection.isClosing();
}

public boolean isConnecting() {
return connection.isConnecting();
}

public boolean isOpen() {
return connection.isOpen();
}
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -121,10 +122,6 @@ public boolean isClosing() {
return connection.isClosing();
}

public boolean isConnecting() {
return connection.isConnecting();
}

public boolean isOpen() {
return connection.isOpen();
}
Expand Down