Skip to content

Commit 17924f8

Browse files
marci4marci4
committed
Introduction of Draft_6455
1 parent 253ae5c commit 17924f8

File tree

9 files changed

+33
-16
lines changed

9 files changed

+33
-16
lines changed

‎src/main/example/ChatClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.java_websocket.WebSocketImpl;
1717
import org.java_websocket.client.WebSocketClient;
1818
import org.java_websocket.drafts.Draft;
19-
import org.java_websocket.drafts.Draft_17;
19+
import org.java_websocket.drafts.Draft_6455;
2020
import org.java_websocket.handshake.ServerHandshake;
2121

2222
public class ChatClient extends JFrame implements ActionListener {
@@ -38,7 +38,7 @@ public ChatClient( String defaultlocation ) {
3838
layout.setRows( 6 );
3939
c.setLayout( layout );
4040

41-
Draft[] drafts = { new Draft_17() };
41+
Draft[] drafts = { new Draft_6455() };
4242
draft = new JComboBox( drafts );
4343
c.add( draft );
4444

‎src/main/example/ExampleClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import org.java_websocket.client.WebSocketClient;
55
import org.java_websocket.drafts.Draft;
6-
import org.java_websocket.drafts.Draft_17;
6+
import org.java_websocket.drafts.Draft_6455;
77
import org.java_websocket.framing.Framedata;
88
import org.java_websocket.handshake.ServerHandshake;
99

@@ -47,7 +47,7 @@ public void onError( Exception ex ) {
4747
}
4848

4949
public static void main( String[] args ) throws URISyntaxException {
50-
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_17() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
50+
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_6455() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
5151
c.connect();
5252
}
5353

‎src/main/example/FragmentedFramesExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import org.java_websocket.WebSocket;
99
import org.java_websocket.client.WebSocketClient;
10-
import org.java_websocket.drafts.Draft_17;
10+
import org.java_websocket.drafts.Draft_6455;
1111
import org.java_websocket.framing.Framedata.Opcode;
1212

1313
/**
@@ -22,7 +22,7 @@ public class FragmentedFramesExample {
2222
public static void main( String[] args ) throws URISyntaxException , IOException , InterruptedException {
2323
// WebSocketImpl.DEBUG = true; // will give extra output
2424

25-
WebSocketClient websocket = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_17() ); // Draft_17 is implementation of rfc6455
25+
WebSocketClient websocket = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_6455() ); // Draft_6455 is implementation of rfc6455
2626
if( !websocket.connectBlocking() ) {
2727
System.err.println( "Could not connect to the server." );
2828
return;

‎src/main/java/org/java_websocket/WebSocketImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class WebSocketImpl implements WebSocket {
4141
public static/*final*/ boolean DEBUG = false; // must be final in the future in order to take advantage of VM optimization
4242

4343
static {
44-
defaultdraftlist.add( new Draft_17() );
44+
defaultdraftlist.add( new Draft_6455() );
4545
}
4646

4747
/**

‎src/main/java/org/java_websocket/client/WebSocketClient.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
import org.java_websocket.AbstractWebSocket;
1818
import org.java_websocket.WebSocket;
19-
import org.java_websocket.WebSocketAdapter;
2019
import org.java_websocket.WebSocketImpl;
2120
import org.java_websocket.drafts.Draft;
22-
import org.java_websocket.drafts.Draft_17;
21+
import org.java_websocket.drafts.Draft_6455;
2322
import org.java_websocket.exceptions.InvalidHandshakeException;
2423
import org.java_websocket.framing.CloseFrame;
2524
import org.java_websocket.framing.Framedata;
2625
import org.java_websocket.framing.Framedata.Opcode;
27-
import org.java_websocket.framing.FramedataImpl1;
2826
import org.java_websocket.handshake.HandshakeImpl1Client;
2927
import org.java_websocket.handshake.Handshakedata;
3028
import org.java_websocket.handshake.ServerHandshake;
@@ -70,7 +68,7 @@ public abstract class WebSocketClient extends AbstractWebSocket implements Runna
7068
* @param serverUri the server URI to connect to
7169
*/
7270
public WebSocketClient( URI serverUri ) {
73-
this( serverUri, new Draft_17() );
71+
this( serverUri, new Draft_6455());
7472
}
7573

7674
/**

‎src/main/java/org/java_websocket/drafts/Draft_17.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
import org.java_websocket.handshake.ClientHandshake;
55
import org.java_websocket.handshake.ClientHandshakeBuilder;
66

7+
/**
8+
* Implementation of the Hybi 17 Draft
9+
* Please use the Draft_6455 for your websocket implementation
10+
*/
11+
@Deprecated
712
public class Draft_17 extends Draft_10 {
813
@Override
914
public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) throws InvalidHandshakeException {

‎src/main/java/org/java_websocket/drafts/Draft_6455.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.java_websocket.drafts;
2+
3+
/**
4+
* Implementation for the RFC 6455 websocket protocol
5+
* This is the recommended class for your websocket connection
6+
*/
7+
public class Draft_6455 extends Draft_17 {
8+
9+
@Override
10+
public Draft copyInstance() {
11+
return new Draft_6455();
12+
}
13+
}

‎src/test/java/org/java_websocket/example/AutobahnClientTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.java_websocket.WebSocketImpl;
1111
import org.java_websocket.client.WebSocketClient;
1212
import org.java_websocket.drafts.Draft;
13-
import org.java_websocket.drafts.Draft_17;
13+
import org.java_websocket.drafts.Draft_6455;
1414
import org.java_websocket.framing.FrameBuilder;
1515
import org.java_websocket.framing.Framedata;
1616
import org.java_websocket.handshake.ServerHandshake;
@@ -37,12 +37,12 @@ public static void main( String[] args ) {
3737
BufferedReader sysin = new BufferedReader( new InputStreamReader( System.in ) );
3838

3939
/*First of the thinks a programmer might want to change*/
40-
Draft d = new Draft_17();
40+
Draft d = new Draft_6455();
4141
String clientname = "tootallnate/websocket";
4242

4343
String protocol = "ws";
4444
String host = "localhost";
45-
int port = 9001;
45+
int port = 9003;
4646

4747
String serverlocation = protocol + "://" + host + ":" + port;
4848
String line = "";

‎src/test/java/org/java_websocket/example/AutobahnServerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.java_websocket.WebSocket;
99
import org.java_websocket.WebSocketImpl;
1010
import org.java_websocket.drafts.Draft;
11-
import org.java_websocket.drafts.Draft_17;
11+
import org.java_websocket.drafts.Draft_6455;
1212
import org.java_websocket.framing.FrameBuilder;
1313
import org.java_websocket.framing.Framedata;
1414
import org.java_websocket.handshake.ClientHandshake;
@@ -73,7 +73,8 @@ public static void main( String[] args ) throws UnknownHostException {
7373
System.out.println( "No port specified. Defaulting to 9003" );
7474
port = 9003;
7575
}
76-
new AutobahnServerTest( port, new Draft_17() ).start();
76+
AutobahnServerTest test = new AutobahnServerTest( port, new Draft_6455() );
77+
test.start();
7778
}
7879

7980
}

0 commit comments

Comments
 (0)