Replaced deprecated 'sendUnsupportedWebSocketVersionResponse()' with 'sendUnsupportedVersionResponse()'

veebs · Norman Maurer · commit a389d69ba856 · 2014-01-13T06:33:25.000+01:00
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
@@ -60,7 +60,7 @@ public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exce
                 getWebSocketLocation(ctx.pipeline(), req, websocketPath), subprotocols, allowExtensions);
         final WebSocketServerHandshaker handshaker = wsFactory.newHandshaker(req);
         if (handshaker == null) {
-            WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());
+            WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         } else {
             final ChannelFuture handshakeFuture = handshaker.handshake(ctx.channel(), req);
             handshakeFuture.addListener(new ChannelFutureListener() {
diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java
@@ -101,7 +101,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req) t
                 getWebSocketLocation(req), null, false);
         handshaker = wsFactory.newHandshaker(req);
         if (handshaker == null) {
-            WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());
+            WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         } else {
             handshaker.handshake(ctx.channel(), req);
         }
diff --git a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
@@ -98,7 +98,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req) t
                 getWebSocketLocation(req), null, false);
         handshaker = wsFactory.newHandshaker(req);
         if (handshaker == null) {
-            WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());
+            WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         } else {
             handshaker.handshake(ctx.channel(), req);
         }
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java b/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
@@ -87,7 +87,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req)
                 getWebSocketLocation(req), null, false, Integer.MAX_VALUE);
         handshaker = wsFactory.newHandshaker(req);
         if (handshaker == null) {
-            WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());
+            WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         } else {
             handshaker.handshake(ctx.channel(), req);
         }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req) t`
`101`	`101`	`getWebSocketLocation(req), null, false);`
`102`	`102`	`handshaker = wsFactory.newHandshaker(req);`
`103`	`103`	`if (handshaker == null) {`
`104`		`- WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());`
	`104`	`+ WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());`
`105`	`105`	`} else {`
`106`	`106`	`handshaker.handshake(ctx.channel(), req);`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req) t`
`98`	`98`	`getWebSocketLocation(req), null, false);`
`99`	`99`	`handshaker = wsFactory.newHandshaker(req);`
`100`	`100`	`if (handshaker == null) {`
`101`		`- WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());`
	`101`	`+ WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());`
`102`	`102`	`} else {`
`103`	`103`	`handshaker.handshake(ctx.channel(), req);`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest req)`
`87`	`87`	`getWebSocketLocation(req), null, false, Integer.MAX_VALUE);`
`88`	`88`	`handshaker = wsFactory.newHandshaker(req);`
`89`	`89`	`if (handshaker == null) {`
`90`		`- WebSocketServerHandshakerFactory.sendUnsupportedWebSocketVersionResponse(ctx.channel());`
	`90`	`+ WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());`
`91`	`91`	`} else {`
`92`	`92`	`handshaker.handshake(ctx.channel(), req);`
`93`	`93`	`}`