Merge pull request #67 from mixer/fix/travis

fix(build): change travis jdk to openjdk7

Author: pahimar

.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: java
-jdk: oraclejdk7
+jdk: openjdk7
 cache:
   directories: $HOME/.m2
 script:

README.md

@@ -36,7 +36,7 @@ And secondly, add this project as a `dependency` in your `pom.xml`:
   <dependency>
     <groupId>com.mixer</groupId>
     <artifactId>api</artifactId>
-    <version>5.0.3-SNAPSHOT</version>
+    <version>5.0.4-SNAPSHOT</version>
   </dependency>
 </dependencies>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mixer</groupId>
     <artifactId>api</artifactId>
-    <version>5.0.2-SNAPSHOT</version>
+    <version>5.0.4-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -20,7 +20,7 @@
         <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.1-SNAPSHOT</java-websocket.version>
+        <java-websocket.version>1.3.4</java-websocket.version>
         <junit.version>4.11</junit.version>
         <powermock.version>1.9.0-rc1</powermock.version>
 

…om/mixer/api/http/ws/CookieDraft_17.java …/mixer/api/http/ws/CookieDraft_6455.javasrc/main/java/com/mixer/api/http/ws/CookieDraft_17.java renamed to src/main/java/com/mixer/api/http/ws/CookieDraft_6455.java src/main/java/com/mixer/api/http/ws/CookieDraft_17.java renamed to src/main/java/com/mixer/api/http/ws/CookieDraft_6455.java

@@ -4,16 +4,16 @@
 import com.mixer.api.http.MixerHttpClient;
 import org.apache.http.cookie.Cookie;
 import org.java_websocket.drafts.Draft;
-import org.java_websocket.drafts.Draft_17;
+import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.handshake.ClientHandshakeBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class CookieDraft_17 extends Draft_17 {
+public class CookieDraft_6455 extends Draft_6455 {
     protected final MixerHttpClient httpClient;
 
-    public CookieDraft_17(MixerHttpClient httpClient) {
+    public CookieDraft_6455(MixerHttpClient httpClient) {
         this.httpClient = httpClient;
     }
 
@@ -31,6 +31,6 @@ public ClientHandshakeBuilder postProcessHandshakeRequestAsClient(ClientHandshak
 
     @Override
     public Draft copyInstance() {
-        return new CookieDraft_17(this.httpClient);
+        return new CookieDraft_6455(this.httpClient);
     }
 }

src/main/java/com/mixer/api/http/ws/MixerWebsocketClient.java

@@ -11,13 +11,13 @@ public class MixerWebsocketClient extends WebSocketClient {
     protected final MixerAPI mixer;
 
     public MixerWebsocketClient(MixerAPI mixer, URI uri) {
-        super(uri, new CookieDraft_17(mixer.http));
+        super(uri, new CookieDraft_6455(mixer.http));
 
         this.mixer = mixer;
     }
 
     public MixerWebsocketClient(MixerAPI mixer, URI uri, Map<String, String> httpHeaders) {
-        super(uri, new CookieDraft_17(mixer.http), httpHeaders, 0);
+        super(uri, new CookieDraft_6455(mixer.http), httpHeaders, 0);
 
         this.mixer = mixer;
     }

src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnectable.java

@@ -82,7 +82,7 @@ public void run() {
      */
     private void ping()
     {
-        FramedataImpl1 frame = new FramedataImpl1(Framedata.Opcode.PING);
+        FramedataImpl1 frame = FramedataImpl1.get(Framedata.Opcode.PING);
         frame.setFin(true);
         connection.sendFrame(frame);
     }