andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename WebSocketServerHandshakeHandler to WebSocketServerProtocolHnadshakeHandler and also make it public. See #587

Browse Source
This commit is contained in:
norman 2012-09-10 07:15:59 +02:00
parent 4353aa6794
commit 6e39192462
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
View File

@ -54,8 +54,8 @@ public class WebSocketServerProtocolHandler extends ChannelInboundMessageHandler
@Override @Override
public void afterAdd(ChannelHandlerContext ctx) { public void afterAdd(ChannelHandlerContext ctx) {
// Add the WebSocketHandshakeHandler before this one. // Add the WebSocketHandshakeHandler before this one.
ctx.pipeline().addBefore(ctx.name(), WebSocketServerHandshakeHandler.class.getName(), ctx.pipeline().addBefore(ctx.name(), WebSocketServerProtocolHandshakeHandler.class.getName(),
new WebSocketServerHandshakeHandler(websocketPath, subprotocols, allowExtensions)); new WebSocketServerProtocolHandshakeHandler(websocketPath, subprotocols, allowExtensions));
} }
@Override @Override

6
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakeHandler.java → codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
View File

@ -35,15 +35,15 @@ import io.netty.logging.InternalLoggerFactory;
/** /**
* Handles the HTTP handshake (the HTTP Upgrade request) * Handles the HTTP handshake (the HTTP Upgrade request)
*/ */
class WebSocketServerHandshakeHandler extends ChannelInboundMessageHandlerAdapter<HttpRequest> { public class WebSocketServerProtocolHandshakeHandler extends ChannelInboundMessageHandlerAdapter<HttpRequest> {
private static final InternalLogger logger = private static final InternalLogger logger =
InternalLoggerFactory.getInstance(WebSocketServerHandshakeHandler.class); InternalLoggerFactory.getInstance(WebSocketServerProtocolHandshakeHandler.class);
private final String websocketPath; private final String websocketPath;
private final String subprotocols; private final String subprotocols;
private final boolean allowExtensions; private final boolean allowExtensions;
public WebSocketServerHandshakeHandler(String websocketPath, String subprotocols, boolean allowExtensions) { public WebSocketServerProtocolHandshakeHandler(String websocketPath, String subprotocols, boolean allowExtensions) {
this.websocketPath = websocketPath; this.websocketPath = websocketPath;
this.subprotocols = subprotocols; this.subprotocols = subprotocols;
this.allowExtensions = allowExtensions; this.allowExtensions = allowExtensions;

2
codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
View File

@ -44,7 +44,7 @@ public class WebSocketServerProtocolHandlerTest {
@Test @Test
public void testHttpUpgradeRequest() throws Exception { public void testHttpUpgradeRequest() throws Exception {
EmbeddedMessageChannel ch = createChannel(new MockOutboundHandler()); EmbeddedMessageChannel ch = createChannel(new MockOutboundHandler());
ChannelHandlerContext handshakerCtx = ch.pipeline().context(WebSocketServerHandshakeHandler.class); ChannelHandlerContext handshakerCtx = ch.pipeline().context(WebSocketServerProtocolHandshakeHandler.class);
writeUpgradeRequest(ch); writeUpgradeRequest(ch);