From b3cc3055784c783f706a6277c18db299bc316415 Mon Sep 17 00:00:00 2001 From: Dennis Boldt Date: Tue, 21 Feb 2012 03:06:26 +0100 Subject: [PATCH] Organized imports. --- .../http/websocketx/WebSocketClientHandshaker.java | 10 ++-------- .../http/websocketx/WebSocketServerHandshaker.java | 14 ++++---------- .../http/websocketx/autobahn/AutobahnServer.java | 3 --- .../http/websocketx/server/WebSocketServer.java | 11 ++++------- .../websocketx/sslserver/WebSocketSslServer.java | 11 ++++------- .../netty/channel/sctp/NioSctpChannelConfig.java | 1 - .../java/io/netty/channel/sctp/SctpChannel.java | 3 --- .../AbstractSocketClientBootstrapTest.java | 2 -- .../transport/sctp/SctpMultiStreamingEchoTest.java | 2 -- .../transport/sctp/SctpServerBootstrapTest.java | 1 - 10 files changed, 14 insertions(+), 44 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java index 18ad9ec051..246db85bda 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java @@ -16,17 +16,11 @@ package io.netty.handler.codec.http.websocketx; import java.net.URI; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Map; -import io.netty.buffer.ChannelBuffer; -import io.netty.buffer.ChannelBuffers; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; -import io.netty.handler.codec.base64.Base64; import io.netty.handler.codec.http.HttpResponse; -import io.netty.util.CharsetUtil; /** * Base class for web socket client handshake implementations @@ -111,7 +105,7 @@ public abstract class WebSocketClientHandshaker { /** * Begins the opening handshake - * + * * @param channel * Channel */ @@ -119,7 +113,7 @@ public abstract class WebSocketClientHandshaker { /** * Validates and finishes the opening handshake initiated by {@link #handshake}}. - * + * * @param channel * Channel * @param response diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java index 5cbe843429..e22561bc88 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java @@ -15,18 +15,12 @@ */ package io.netty.handler.codec.http.websocketx; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.LinkedHashSet; import java.util.Set; -import io.netty.buffer.ChannelBuffer; -import io.netty.buffer.ChannelBuffers; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; -import io.netty.handler.codec.base64.Base64; import io.netty.handler.codec.http.HttpRequest; -import io.netty.util.CharsetUtil; /** * Base class for server side web socket opening and closing handshakes @@ -41,7 +35,7 @@ public abstract class WebSocketServerHandshaker { /** * Constructor specifying the destination web socket location - * + * * @param version * the protocol version * @param webSocketUrl @@ -92,7 +86,7 @@ public abstract class WebSocketServerHandshaker { /** * Performs the opening handshake - * + * * @param channel * Channel * @param req @@ -102,7 +96,7 @@ public abstract class WebSocketServerHandshaker { /** * Performs the closing handshake - * + * * @param channel * Channel * @param frame @@ -112,7 +106,7 @@ public abstract class WebSocketServerHandshaker { /** * Selects the first matching supported sub protocol - * + * * @param requestedSubprotocols * CSV of protocols to be supported. e.g. "chat, superchat" * @return First matching supported sub protocol. Null if not found. diff --git a/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServer.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServer.java index 2f2f5bab4e..c4a012ca59 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServer.java +++ b/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServer.java @@ -17,9 +17,6 @@ package io.netty.example.http.websocketx.autobahn; import java.net.InetSocketAddress; import java.util.concurrent.Executors; -import java.util.logging.ConsoleHandler; -import java.util.logging.Level; -import java.util.logging.Logger; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java index b2899692dd..d0918c4ec1 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java @@ -17,23 +17,20 @@ package io.netty.example.http.websocketx.server; import java.net.InetSocketAddress; import java.util.concurrent.Executors; -import java.util.logging.ConsoleHandler; -import java.util.logging.Level; -import java.util.logging.Logger; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; /** * A HTTP server which serves Web Socket requests at: - * + * * http://localhost:8080/websocket - * + * * Open your browser at http://localhost:8080/, then the demo page will be loaded and a Web Socket connection will be * made automatically. - * + * * This server illustrates support for the different web socket specification versions and will work with: - * + * *