diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java index 3f7e171a3a0..e7c57a5717c 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java @@ -81,7 +81,7 @@ public class DeflateFrameExtension extends AbstractExtension catch(DataFormatException e) { Log.warn(e); - getConnection().close(WebSocketConnectionD11.CLOSE_PROTOCOL,e.toString()); + getConnection().close(WebSocketConnectionD12.CLOSE_PROTOCOL,e.toString()); } } diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/TestClient.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/TestClient.java index c35b8f8ed1d..c732533ba51 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/TestClient.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/TestClient.java @@ -138,7 +138,7 @@ public class TestClient implements WebSocket.OnFrame { __framesSent++; byte flags= (byte)(off+len==data.length?0x8:0); - byte op=(byte)(off==0?opcode:WebSocketConnectionD11.OP_CONTINUATION); + byte op=(byte)(off==0?opcode:WebSocketConnectionD12.OP_CONTINUATION); if (_verbose) System.err.printf("%s#addFrame %s|%s %s\n",this.getClass().getSimpleName(),TypeUtil.toHexString(flags),TypeUtil.toHexString(op),TypeUtil.toHexString(data,off,len)); @@ -240,11 +240,11 @@ public class TestClient implements WebSocket.OnFrame { long next = System.currentTimeMillis()+delay; - byte opcode=binary?WebSocketConnectionD11.OP_BINARY:WebSocketConnectionD11.OP_TEXT; + byte opcode=binary?WebSocketConnectionD12.OP_BINARY:WebSocketConnectionD12.OP_TEXT; byte data[]=null; - if (opcode==WebSocketConnectionD11.OP_TEXT) + if (opcode==WebSocketConnectionD12.OP_TEXT) { StringBuilder b = new StringBuilder(); while (b.length() _extensions; - private final WebSocketParserD11 _parser; + private final WebSocketParserD12 _parser; private final WebSocketParser.FrameHandler _inbound; - private final WebSocketGeneratorD11 _generator; + private final WebSocketGeneratorD12 _generator; private final WebSocketGenerator _outbound; private final WebSocket _webSocket; private final OnFrame _onFrame; @@ -119,14 +119,14 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc /* ------------------------------------------------------------ */ - public WebSocketConnectionD11(WebSocket websocket, EndPoint endpoint, WebSocketBuffers buffers, long timestamp, int maxIdleTime, String protocol, List extensions,int draft) + public WebSocketConnectionD12(WebSocket websocket, EndPoint endpoint, WebSocketBuffers buffers, long timestamp, int maxIdleTime, String protocol, List extensions,int draft) throws IOException { this(websocket,endpoint,buffers,timestamp,maxIdleTime,protocol,extensions,draft,null); } /* ------------------------------------------------------------ */ - public WebSocketConnectionD11(WebSocket websocket, EndPoint endpoint, WebSocketBuffers buffers, long timestamp, int maxIdleTime, String protocol, List extensions,int draft, MaskGen maskgen) + public WebSocketConnectionD12(WebSocket websocket, EndPoint endpoint, WebSocketBuffers buffers, long timestamp, int maxIdleTime, String protocol, List extensions,int draft, MaskGen maskgen) throws IOException { super(endpoint,timestamp); @@ -145,7 +145,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc _onTextMessage=_webSocket instanceof OnTextMessage ? (OnTextMessage)_webSocket : null; _onBinaryMessage=_webSocket instanceof OnBinaryMessage ? (OnBinaryMessage)_webSocket : null; _onControl=_webSocket instanceof OnControl ? (OnControl)_webSocket : null; - _generator = new WebSocketGeneratorD11(buffers, _endp,maskgen); + _generator = new WebSocketGeneratorD12(buffers, _endp,maskgen); _extensions=extensions; if (_extensions!=null) @@ -164,7 +164,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc _outbound=(_extensions==null||_extensions.size()==0)?_generator:extensions.get(extensions.size()-1); _inbound=(_extensions==null||_extensions.size()==0)?_frameHandler:extensions.get(0); - _parser = new WebSocketParserD11(buffers, endpoint,_inbound,maskgen==null); + _parser = new WebSocketParserD12(buffers, endpoint,_inbound,maskgen==null); _protocol=protocol; @@ -277,7 +277,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc public void idleExpired() { long idle = System.currentTimeMillis()-((SelectChannelEndPoint)_endp).getIdleTimestamp(); - closeOut(WebSocketConnectionD11.CLOSE_NORMAL,"Idle for "+idle+"ms"); + closeOut(WebSocketConnectionD12.CLOSE_NORMAL,"Idle for "+idle+"ms"); } /* ------------------------------------------------------------ */ @@ -294,10 +294,10 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc { closed=_closeCode==0; if (closed) - _closeCode=WebSocketConnectionD11.CLOSE_NOCLOSE; + _closeCode=WebSocketConnectionD12.CLOSE_NOCLOSE; } if (closed) - _webSocket.onClose(WebSocketConnectionD11.CLOSE_NOCLOSE,"closed"); + _webSocket.onClose(WebSocketConnectionD12.CLOSE_NOCLOSE,"closed"); } /* ------------------------------------------------------------ */ @@ -373,11 +373,11 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc else { if (code<=0) - code=WebSocketConnectionD11.CLOSE_NORMAL; + code=WebSocketConnectionD12.CLOSE_NORMAL; byte[] bytes = ("xx"+(message==null?"":message)).getBytes(StringUtil.__ISO_8859_1); bytes[0]=(byte)(code/0x100); bytes[1]=(byte)(code%0x100); - _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD11.OP_CLOSE,bytes,0,bytes.length); + _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD12.OP_CLOSE,bytes,0,bytes.length); } _outbound.flush(); @@ -410,8 +410,8 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc private class WSFrameConnection implements WebSocket.FrameConnection { volatile boolean _disconnecting; - int _maxTextMessage=WebSocketConnectionD11.this._maxTextMessageSize; - int _maxBinaryMessage=WebSocketConnectionD11.this._maxBinaryMessageSize; + int _maxTextMessage=WebSocketConnectionD12.this._maxTextMessageSize; + int _maxBinaryMessage=WebSocketConnectionD12.this._maxBinaryMessageSize; /* ------------------------------------------------------------ */ public void sendMessage(String content) throws IOException @@ -419,7 +419,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc if (_closedOut) throw new IOException("closedOut "+_closeCode+":"+_closeMessage); byte[] data = content.getBytes(StringUtil.__UTF8); - _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD11.OP_TEXT,data,0,data.length); + _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD12.OP_TEXT,data,0,data.length); checkWriteable(); _idle.access(_endp); } @@ -429,7 +429,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc { if (_closedOut) throw new IOException("closedOut "+_closeCode+":"+_closeMessage); - _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD11.OP_BINARY,content,offset,length); + _outbound.addFrame((byte)FLAG_FIN,WebSocketConnectionD12.OP_BINARY,content,offset,length); checkWriteable(); _idle.access(_endp); } @@ -472,7 +472,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc if (_disconnecting) return; _disconnecting=true; - WebSocketConnectionD11.this.closeOut(code,message); + WebSocketConnectionD12.this.closeOut(code,message); } /* ------------------------------------------------------------ */ @@ -609,7 +609,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc { boolean lastFrame = isLastFrame(flags); - synchronized(WebSocketConnectionD11.this) + synchronized(WebSocketConnectionD12.this) { // Ignore incoming after a close if (_closedIn) @@ -634,10 +634,10 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc switch(opcode) { - case WebSocketConnectionD11.OP_CONTINUATION: + case WebSocketConnectionD12.OP_CONTINUATION: { // If text, append to the message buffer - if (_onTextMessage!=null && _opcode==WebSocketConnectionD11.OP_TEXT) + if (_onTextMessage!=null && _opcode==WebSocketConnectionD12.OP_TEXT) { if (_utf8.append(buffer.array(),buffer.getIndex(),buffer.length(),_connection.getMaxTextMessageSize())) { @@ -677,23 +677,23 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc } break; } - case WebSocketConnectionD11.OP_PING: + case WebSocketConnectionD12.OP_PING: { Log.debug("PING {}",this); if (!_closedOut) - _connection.sendControl(WebSocketConnectionD11.OP_PONG,buffer.array(),buffer.getIndex(),buffer.length()); + _connection.sendControl(WebSocketConnectionD12.OP_PONG,buffer.array(),buffer.getIndex(),buffer.length()); break; } - case WebSocketConnectionD11.OP_PONG: + case WebSocketConnectionD12.OP_PONG: { Log.debug("PONG {}",this); break; } - case WebSocketConnectionD11.OP_CLOSE: + case WebSocketConnectionD12.OP_CLOSE: { - int code=WebSocketConnectionD11.CLOSE_NOCODE; + int code=WebSocketConnectionD12.CLOSE_NOCODE; String message=null; if (buffer.length()>=2) { @@ -705,7 +705,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc break; } - case WebSocketConnectionD11.OP_TEXT: + case WebSocketConnectionD12.OP_TEXT: { if(_onTextMessage!=null) { @@ -725,7 +725,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc } else { - _opcode=WebSocketConnectionD11.OP_TEXT; + _opcode=WebSocketConnectionD12.OP_TEXT; } } else @@ -769,7 +769,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc int max = _connection.getMaxBinaryMessageSize(); if (max>0 && (bufferLen+length)>max) { - _connection.close(WebSocketConnectionD11.CLOSE_LARGE,"Message size > "+_connection.getMaxBinaryMessageSize()); + _connection.close(WebSocketConnectionD12.CLOSE_LARGE,"Message size > "+_connection.getMaxBinaryMessageSize()); _opcode=-1; if (_aggregate!=null) _aggregate.clear(); @@ -780,7 +780,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc private void textMessageTooLarge() { - _connection.close(WebSocketConnectionD11.CLOSE_LARGE,"Text message size > "+_connection.getMaxTextMessageSize()+" chars"); + _connection.close(WebSocketConnectionD12.CLOSE_LARGE,"Text message size > "+_connection.getMaxTextMessageSize()+" chars"); _opcode=-1; _utf8.reset(); @@ -795,7 +795,7 @@ public class WebSocketConnectionD11 extends AbstractConnection implements WebSoc public String toString() { - return WebSocketConnectionD11.this.toString()+"FH"; + return WebSocketConnectionD12.this.toString()+"FH"; } } diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java index 336098885e8..7832291d4bf 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java @@ -179,8 +179,9 @@ public class WebSocketFactory case 9: case 10: case 11: - extensions= initExtensions(extensions_requested,8-WebSocketConnectionD11.OP_EXT_DATA, 16-WebSocketConnectionD11.OP_EXT_CTRL,3); - connection = new WebSocketConnectionD11(websocket, endp, _buffers, http.getTimeStamp(), _maxIdleTime, protocol,extensions,draft); + case 12: + extensions= initExtensions(extensions_requested,8-WebSocketConnectionD12.OP_EXT_DATA, 16-WebSocketConnectionD12.OP_EXT_CTRL,3); + connection = new WebSocketConnectionD12(websocket, endp, _buffers, http.getTimeStamp(), _maxIdleTime, protocol,extensions,draft); break; default: Log.warn("Unsupported Websocket version: "+draft); diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12.java similarity index 96% rename from jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11.java rename to jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12.java index 18f54ed2318..52b2fe471d7 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12.java @@ -28,7 +28,7 @@ import org.eclipse.jetty.io.EofException; * threads will call the addMessage methods while other * threads are flushing the generator. */ -public class WebSocketGeneratorD11 implements WebSocketGenerator +public class WebSocketGeneratorD12 implements WebSocketGenerator { final private WebSocketBuffers _buffers; final private EndPoint _endp; @@ -93,14 +93,14 @@ public class WebSocketGeneratorD11 implements WebSocketGenerator } - public WebSocketGeneratorD11(WebSocketBuffers buffers, EndPoint endp) + public WebSocketGeneratorD12(WebSocketBuffers buffers, EndPoint endp) { _buffers=buffers; _endp=endp; _maskGen=null; } - public WebSocketGeneratorD11(WebSocketBuffers buffers, EndPoint endp, MaskGen maskGen) + public WebSocketGeneratorD12(WebSocketBuffers buffers, EndPoint endp, MaskGen maskGen) { _buffers=buffers; _endp=endp; @@ -121,14 +121,14 @@ public class WebSocketGeneratorD11 implements WebSocketGenerator if (_buffer==null) _buffer=mask?_buffers.getBuffer():_buffers.getDirectBuffer(); - boolean last=WebSocketConnectionD11.isLastFrame(flags); + boolean last=WebSocketConnectionD12.isLastFrame(flags); byte orig=opcode; int space=mask?14:10; do { - opcode = _opsent?WebSocketConnectionD11.OP_CONTINUATION:opcode; + opcode = _opsent?WebSocketConnectionD12.OP_CONTINUATION:opcode; opcode=(byte)(((0xf&flags)<<4)+(0xf&opcode)); _opsent=true; diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD11.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD12.java similarity index 95% rename from jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD11.java rename to jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD12.java index a7343d47b83..cfd7e59ff46 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD11.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketParserD12.java @@ -27,7 +27,7 @@ import org.eclipse.jetty.util.log.Log; * Parser the WebSocket protocol. * */ -public class WebSocketParserD11 implements WebSocketParser +public class WebSocketParserD12 implements WebSocketParser { public enum State { @@ -70,7 +70,7 @@ public class WebSocketParserD11 implements WebSocketParser * @param endp * @param handler */ - public WebSocketParserD11(WebSocketBuffers buffers, EndPoint endp, FrameHandler handler, boolean shouldBeMasked) + public WebSocketParserD12(WebSocketBuffers buffers, EndPoint endp, FrameHandler handler, boolean shouldBeMasked) { _buffers=buffers; _endp=endp; @@ -156,9 +156,9 @@ public class WebSocketParserD11 implements WebSocketParser // System.err.printf("%s %s %s >>\n",TypeUtil.toHexString(_flags),TypeUtil.toHexString(_opcode),data.length()); events++; _bytesNeeded-=data.length(); - _handler.onFrame((byte)(_flags&(0xff^WebSocketConnectionD11.FLAG_FIN)), _opcode, data); + _handler.onFrame((byte)(_flags&(0xff^WebSocketConnectionD12.FLAG_FIN)), _opcode, data); - _opcode=WebSocketConnectionD11.OP_CONTINUATION; + _opcode=WebSocketConnectionD12.OP_CONTINUATION; } if (_buffer.space() == 0) @@ -201,11 +201,11 @@ public class WebSocketParserD11 implements WebSocketParser _opcode=(byte)(b&0xf); _flags=(byte)(0xf&(b>>4)); - if (WebSocketConnectionD11.isControlFrame(_opcode)&&!WebSocketConnectionD11.isLastFrame(_flags)) + if (WebSocketConnectionD12.isControlFrame(_opcode)&&!WebSocketConnectionD12.isLastFrame(_flags)) { events++; Log.warn("Fragmented Control from "+_endp); - _handler.close(WebSocketConnectionD11.CLOSE_PROTOCOL,"Fragmented control"); + _handler.close(WebSocketConnectionD12.CLOSE_PROTOCOL,"Fragmented control"); _skip=true; } @@ -246,7 +246,7 @@ public class WebSocketParserD11 implements WebSocketParser if (_length>_buffer.capacity() && !_fakeFragments) { events++; - _handler.close(WebSocketConnectionD11.CLOSE_LARGE,"frame size "+_length+">"+_buffer.capacity()); + _handler.close(WebSocketConnectionD12.CLOSE_LARGE,"frame size "+_length+">"+_buffer.capacity()); _skip=true; } @@ -265,7 +265,7 @@ public class WebSocketParserD11 implements WebSocketParser if (_length>=_buffer.capacity()) { events++; - _handler.close(WebSocketConnectionD11.CLOSE_LARGE,"frame size "+_length+">"+_buffer.capacity()); + _handler.close(WebSocketConnectionD12.CLOSE_LARGE,"frame size "+_length+">"+_buffer.capacity()); _skip=true; } @@ -308,7 +308,7 @@ public class WebSocketParserD11 implements WebSocketParser _buffer.skip(_bytesNeeded); _state=State.START; events++; - _handler.close(WebSocketConnectionD11.CLOSE_PROTOCOL,"bad mask"); + _handler.close(WebSocketConnectionD12.CLOSE_PROTOCOL,"bad mask"); } else { @@ -362,7 +362,7 @@ public class WebSocketParserD11 implements WebSocketParser public String toString() { Buffer buffer=_buffer; - return WebSocketParserD11.class.getSimpleName()+"@"+ Integer.toHexString(hashCode())+"|"+_state+"|"+(buffer==null?"<>":buffer.toDetailString()); + return WebSocketParserD12.class.getSimpleName()+"@"+ Integer.toHexString(hashCode())+"|"+_state+"|"+(buffer==null?"<>":buffer.toDetailString()); } } diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java index adffc7e74fe..aec12debe2a 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java @@ -110,7 +110,7 @@ public class WebSocketClientTest } Assert.assertFalse(open.get()); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_NOCLOSE,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_NOCLOSE,close.get()); Assert.assertTrue(error instanceof ConnectException); } @@ -151,7 +151,7 @@ public class WebSocketClientTest } Assert.assertFalse(open.get()); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_NOCLOSE,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_NOCLOSE,close.get()); Assert.assertTrue(error instanceof TimeoutException); } @@ -191,7 +191,7 @@ public class WebSocketClientTest } Assert.assertFalse(open.get()); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_NOCLOSE,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_NOCLOSE,close.get()); Assert.assertTrue(error instanceof TimeoutException); } @@ -233,7 +233,7 @@ public class WebSocketClientTest } Assert.assertFalse(open.get()); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_PROTOCOL,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_PROTOCOL,close.get()); Assert.assertTrue(error instanceof IOException); Assert.assertTrue(error.getMessage().indexOf("404 NOT FOUND")>0); @@ -277,7 +277,7 @@ public class WebSocketClientTest error=e.getCause(); } Assert.assertFalse(open.get()); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_PROTOCOL,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_PROTOCOL,close.get()); Assert.assertTrue(error instanceof IOException); Assert.assertTrue(error.getMessage().indexOf("Bad Sec-WebSocket-Accept")>=0); } @@ -316,7 +316,7 @@ public class WebSocketClientTest socket.close(); _latch.await(10,TimeUnit.SECONDS); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_NOCLOSE,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_NOCLOSE,close.get()); } @@ -355,7 +355,7 @@ public class WebSocketClientTest long start=System.currentTimeMillis(); _latch.await(10,TimeUnit.SECONDS); Assert.assertTrue(System.currentTimeMillis()-start<5000); - Assert.assertEquals(WebSocketConnectionD11.CLOSE_NORMAL,close.get()); + Assert.assertEquals(WebSocketConnectionD12.CLOSE_NORMAL,close.get()); } @@ -482,7 +482,7 @@ public class WebSocketClientTest } connection.getOutputStream().write(( "HTTP/1.1 101 Upgrade\r\n" + - "Sec-WebSocket-Accept: "+ WebSocketConnectionD11.hashKey(key) +"\r\n" + + "Sec-WebSocket-Accept: "+ WebSocketConnectionD12.hashKey(key) +"\r\n" + "\r\n").getBytes()); } } diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11Test.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12Test.java similarity index 92% rename from jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11Test.java rename to jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12Test.java index de673831219..d968a4ea2ec 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD11Test.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorD12Test.java @@ -11,7 +11,7 @@ import org.junit.Test; /** * @version $Revision$ $Date$ */ -public class WebSocketGeneratorD11Test +public class WebSocketGeneratorD12Test { private ByteArrayBuffer _out; private WebSocketGenerator _generator; @@ -20,7 +20,7 @@ public class WebSocketGeneratorD11Test byte[] _mask = new byte[4]; int _m; - public WebSocketGeneratorD11.MaskGen _maskGen = new WebSocketGeneratorD11.FixedMaskGen( + public WebSocketGeneratorD12.MaskGen _maskGen = new WebSocketGeneratorD12.FixedMaskGen( new byte[]{(byte)0x00,(byte)0x00,(byte)0x0f,(byte)0xff}); @Before @@ -42,7 +42,7 @@ public class WebSocketGeneratorD11Test @Test public void testOneString() throws Exception { - _generator = new WebSocketGeneratorD11(_buffers, _endPoint,null); + _generator = new WebSocketGeneratorD12(_buffers, _endPoint,null); byte[] data = "Hell\uFF4F W\uFF4Frld".getBytes(StringUtil.__UTF8); _generator.addFrame((byte)0x8,(byte)0x04,data,0,data.length); @@ -69,7 +69,7 @@ public class WebSocketGeneratorD11Test @Test public void testOneBuffer() throws Exception { - _generator = new WebSocketGeneratorD11(_buffers, _endPoint,null); + _generator = new WebSocketGeneratorD12(_buffers, _endPoint,null); String string = "Hell\uFF4F W\uFF4Frld"; byte[] bytes=string.getBytes(StringUtil.__UTF8); @@ -97,7 +97,7 @@ public class WebSocketGeneratorD11Test @Test public void testOneLongBuffer() throws Exception { - _generator = new WebSocketGeneratorD11(_buffers, _endPoint,null); + _generator = new WebSocketGeneratorD12(_buffers, _endPoint,null); byte[] b=new byte[150]; for (int i=0;i "+message); diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD11Test.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD12Test.java similarity index 96% rename from jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD11Test.java rename to jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD12Test.java index 9f0f164f638..e199ed1d834 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD11Test.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD12Test.java @@ -33,7 +33,7 @@ import org.junit.Test; /** * @version $Revision$ $Date$ */ -public class WebSocketMessageD11Test +public class WebSocketMessageD12Test { private static Server _server; private static Connector _connector; @@ -74,7 +74,7 @@ public class WebSocketMessageD11Test @Test public void testHash() { - assertEquals("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",WebSocketConnectionD11.hashKey("dGhlIHNhbXBsZSBub25jZQ==")); + assertEquals("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",WebSocketConnectionD12.hashKey("dGhlIHNhbXBsZSBub25jZQ==")); } @Test @@ -115,7 +115,7 @@ public class WebSocketMessageD11Test String data=message.toString(); _serverWebSocket.connection.sendMessage(data); - assertEquals(WebSocketConnectionD11.OP_TEXT,input.read()); + assertEquals(WebSocketConnectionD12.OP_TEXT,input.read()); assertEquals(0x7e,input.read()); assertEquals(0x1f,input.read()); assertEquals(0xf6,input.read()); @@ -321,7 +321,7 @@ public class WebSocketMessageD11Test output.write(buf,0,l+3); output.flush(); - assertEquals(0x40+WebSocketConnectionD11.OP_TEXT,input.read()); + assertEquals(0x40+WebSocketConnectionD12.OP_TEXT,input.read()); assertEquals(0x20+3,input.read()); assertEquals(0x7e,input.read()); assertEquals(0x02,input.read()); @@ -489,7 +489,7 @@ public class WebSocketMessageD11Test output.write(bytes[i]^0xff); output.flush(); - assertEquals(0x80|WebSocketConnectionD11.OP_CLOSE,input.read()); + assertEquals(0x80|WebSocketConnectionD12.OP_CLOSE,input.read()); assertEquals(30,input.read()); int code=(0xff&input.read())*0x100+(0xff&input.read()); assertEquals(1004,code); @@ -540,7 +540,7 @@ public class WebSocketMessageD11Test - assertEquals(0x80|WebSocketConnectionD11.OP_CLOSE,input.read()); + assertEquals(0x80|WebSocketConnectionD12.OP_CLOSE,input.read()); assertEquals(30,input.read()); int code=(0xff&input.read())*0x100+(0xff&input.read()); assertEquals(1004,code); @@ -576,7 +576,7 @@ public class WebSocketMessageD11Test assertNotNull(_serverWebSocket.connection); _serverWebSocket.getConnection().setMaxBinaryMessageSize(1024); - output.write(WebSocketConnectionD11.OP_BINARY); + output.write(WebSocketConnectionD12.OP_BINARY); output.write(0x8a); output.write(0xff); output.write(0xff); @@ -597,7 +597,7 @@ public class WebSocketMessageD11Test output.write(bytes[i]^0xff); output.flush(); - assertEquals(0x80+WebSocketConnectionD11.OP_BINARY,input.read()); + assertEquals(0x80+WebSocketConnectionD12.OP_BINARY,input.read()); assertEquals(20,input.read()); lookFor("01234567890123456789",input); } @@ -654,7 +654,7 @@ public class WebSocketMessageD11Test output.flush(); - assertEquals(0x80|WebSocketConnectionD11.OP_CLOSE,input.read()); + assertEquals(0x80|WebSocketConnectionD12.OP_CLOSE,input.read()); assertEquals(19,input.read()); int code=(0xff&input.read())*0x100+(0xff&input.read()); assertEquals(1004,code); @@ -703,7 +703,7 @@ public class WebSocketMessageD11Test output.write(bytes[i]^0xff); output.flush(); - assertEquals(0x80|WebSocketConnectionD11.OP_CLOSE,input.read()); + assertEquals(0x80|WebSocketConnectionD12.OP_CLOSE,input.read()); assertEquals(19,input.read()); int code=(0xff&input.read())*0x100+(0xff&input.read()); assertEquals(1004,code); @@ -829,14 +829,14 @@ public class WebSocketMessageD11Test final AtomicReference received = new AtomicReference(); ByteArrayEndPoint endp = new ByteArrayEndPoint(new byte[0],4096); - WebSocketGeneratorD11 gen = new WebSocketGeneratorD11(new WebSocketBuffers(8096),endp,null); + WebSocketGeneratorD12 gen = new WebSocketGeneratorD12(new WebSocketBuffers(8096),endp,null); byte[] data = message.getBytes(StringUtil.__UTF8); gen.addFrame((byte)0x8,(byte)0x4,data,0,data.length); endp = new ByteArrayEndPoint(endp.getOut().asArray(),4096); - WebSocketParserD11 parser = new WebSocketParserD11(new WebSocketBuffers(8096),endp,new WebSocketParser.FrameHandler() + WebSocketParserD12 parser = new WebSocketParserD12(new WebSocketBuffers(8096),endp,new WebSocketParser.FrameHandler() { public void onFrame(byte flags, byte opcode, Buffer buffer) { @@ -861,15 +861,15 @@ public class WebSocketMessageD11Test final AtomicReference received = new AtomicReference(); ByteArrayEndPoint endp = new ByteArrayEndPoint(new byte[0],4096); - WebSocketGeneratorD11.MaskGen maskGen = new WebSocketGeneratorD11.RandomMaskGen(); + WebSocketGeneratorD12.MaskGen maskGen = new WebSocketGeneratorD12.RandomMaskGen(); - WebSocketGeneratorD11 gen = new WebSocketGeneratorD11(new WebSocketBuffers(8096),endp,maskGen); + WebSocketGeneratorD12 gen = new WebSocketGeneratorD12(new WebSocketBuffers(8096),endp,maskGen); byte[] data = message.getBytes(StringUtil.__UTF8); gen.addFrame((byte)0x8,(byte)0x1,data,0,data.length); endp = new ByteArrayEndPoint(endp.getOut().asArray(),4096); - WebSocketParserD11 parser = new WebSocketParserD11(new WebSocketBuffers(8096),endp,new WebSocketParser.FrameHandler() + WebSocketParserD12 parser = new WebSocketParserD12(new WebSocketBuffers(8096),endp,new WebSocketParser.FrameHandler() { public void onFrame(byte flags, byte opcode, Buffer buffer) { @@ -992,9 +992,9 @@ public class WebSocketMessageD11Test { switch(opcode) { - case WebSocketConnectionD11.OP_CLOSE: - case WebSocketConnectionD11.OP_PING: - case WebSocketConnectionD11.OP_PONG: + case WebSocketConnectionD12.OP_CLOSE: + case WebSocketConnectionD12.OP_PING: + case WebSocketConnectionD12.OP_PONG: break; default: diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD11Test.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD12Test.java similarity index 96% rename from jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD11Test.java rename to jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD12Test.java index 73acec9c6e5..fe621e3e6e7 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD11Test.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD12Test.java @@ -20,11 +20,11 @@ import org.junit.Test; /** * @version $Revision$ $Date$ */ -public class WebSocketParserD11Test +public class WebSocketParserD12Test { private MaskedByteArrayBuffer _in; private Handler _handler; - private WebSocketParserD11 _parser; + private WebSocketParserD12 _parser; private byte[] _mask = new byte[] {(byte)0x00,(byte)0xF0,(byte)0x0F,(byte)0xFF}; private int _m; @@ -87,7 +87,7 @@ public class WebSocketParserD11Test ByteArrayEndPoint endPoint = new ByteArrayEndPoint(); endPoint.setNonBlocking(true); _handler = new Handler(); - _parser=new WebSocketParserD11(buffers, endPoint,_handler,true); + _parser=new WebSocketParserD12(buffers, endPoint,_handler,true); _parser.setFakeFragments(false); _in = new MaskedByteArrayBuffer(); @@ -192,7 +192,7 @@ public class WebSocketParserD11Test { WebSocketBuffers buffers = new WebSocketBuffers(0x20000); ByteArrayEndPoint endPoint = new ByteArrayEndPoint(); - WebSocketParserD11 parser=new WebSocketParserD11(buffers, endPoint,_handler,false); + WebSocketParserD12 parser=new WebSocketParserD12(buffers, endPoint,_handler,false); ByteArrayBuffer in = new ByteArrayBuffer(0x20000); endPoint.setIn(in); @@ -269,7 +269,7 @@ public class WebSocketParserD11Test assertTrue(progress>0); - assertEquals(WebSocketConnectionD11.CLOSE_LARGE,_handler._code); + assertEquals(WebSocketConnectionD12.CLOSE_LARGE,_handler._code); for (int i=0;i<2048;i++) _in.put((byte)'a'); progress =_parser.parseNext(); @@ -313,7 +313,7 @@ public class WebSocketParserD11Test assertTrue(progress>0); assertEquals(2,_handler._frames); - assertEquals(WebSocketConnectionD11.OP_CONTINUATION,_handler._opcode); + assertEquals(WebSocketConnectionD12.OP_CONTINUATION,_handler._opcode); } private class Handler implements WebSocketParser.FrameHandler