From 75e61cc98315949660ab10c0024a3a105992f8f8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 29 Oct 2013 19:39:41 +0100 Subject: [PATCH] Polish spring-websocket - Removed unused imports - Organized imports - Deleted unused fields - Deleted unused local variables - Deleted unused private static classes --- .../adapter/StandardWebSocketSession.java | 4 +- .../client/AbstractWebSocketClient.java | 1 - .../web/socket/client/WebSocketClient.java | 1 - .../session/AbstractHttpSockJsSession.java | 4 +- .../socket/support/WebSocketExtension.java | 16 ++-- .../socket/support/WebSocketHttpHeaders.java | 12 +-- .../AbstractWebSocketIntegrationTests.java | 1 - .../web/socket/WebSocketExtensionTests.java | 6 +- .../web/socket/WebSocketIntegrationTests.java | 83 +------------------ .../StandardWebSocketClientTests.java | 1 - .../jetty/JettyWebSocketClientTests.java | 1 - .../support/WebSocketHttpHeadersTests.java | 11 ++- 12 files changed, 28 insertions(+), 113 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java index d01d33b9fd..9479a25dc8 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,9 +35,8 @@ import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PingMessage; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.support.WebSocketExtension; import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.support.WebSocketHttpHeaders; +import org.springframework.web.socket.support.WebSocketExtension; /** * A {@link WebSocketSession} for use with the standard WebSocket for Java API. diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java index 5c01e61cf0..cba6217748 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java @@ -17,7 +17,6 @@ package org.springframework.web.socket.client; import java.net.URI; -import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java index ad6dfa6ce6..e7ee361b5f 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java @@ -18,7 +18,6 @@ package org.springframework.web.socket.client; import java.net.URI; -import org.springframework.http.HttpHeaders; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java index 7373dc0522..cd24ec4e16 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java @@ -32,12 +32,12 @@ import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.util.Assert; import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.support.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.sockjs.SockJsException; import org.springframework.web.socket.sockjs.SockJsTransportFailureException; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame.FrameFormat; +import org.springframework.web.socket.support.WebSocketExtension; /** * An abstract base class for use with HTTP transport based SockJS sessions. @@ -69,8 +69,6 @@ public abstract class AbstractHttpSockJsSession extends AbstractSockJsSession { private String acceptedProtocol; - private List extensions; - public AbstractHttpSockJsSession(String id, SockJsServiceConfig config, WebSocketHandler wsHandler, Map handshakeAttributes) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java index 6a474313fe..805038661a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java @@ -16,13 +16,6 @@ package org.springframework.web.socket.support; -import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; -import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; -import org.springframework.util.LinkedCaseInsensitiveMap; -import org.springframework.util.StringUtils; - -import javax.websocket.Extension; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -30,6 +23,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import javax.websocket.Extension; + +import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedCaseInsensitiveMap; +import org.springframework.util.StringUtils; + /** * Represents a WebSocket extension as defined in the RFC 6455. * WebSocket extensions add protocol features to the WebSocket protocol. The extensions @@ -200,7 +201,6 @@ public class WebSocketExtension { public WebSocketToStandardExtensionAdapter(final WebSocketExtension ext) { this.name = ext.getName(); - List params = new ArrayList(); for (final String paramName : ext.getParameters().keySet()) { this.parameters.add(new Parameter() { @Override diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java index c6a8e5a11e..993afda11f 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java @@ -16,12 +16,16 @@ package org.springframework.web.socket.support; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; -import java.io.Serializable; -import java.util.*; - /** * An {@link org.springframework.http.HttpHeaders} variant that adds support for * the HTTP headers defined by the WebSocket specification RFC 6455. @@ -44,8 +48,6 @@ public class WebSocketHttpHeaders extends HttpHeaders { private final HttpHeaders headers; - - /** * Create a new instance. */ diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index 0845e83018..0c79a2eb6e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -30,7 +30,6 @@ import org.springframework.util.concurrent.ListenableFuture; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.socket.client.WebSocketClient; import org.springframework.web.socket.server.DefaultHandshakeHandler; -import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.server.support.JettyRequestUpgradeStrategy; import org.springframework.web.socket.server.support.TomcatRequestUpgradeStrategy; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java index f760ee110f..f6d3306920 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java @@ -16,15 +16,13 @@ package org.springframework.web.socket; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import java.util.List; import org.hamcrest.Matchers; import org.junit.Test; import org.springframework.web.socket.support.WebSocketExtension; -import java.util.ArrayList; -import java.util.List; +import static org.junit.Assert.*; /** * Test fixture for {@link org.springframework.web.socket.support.WebSocketExtension} diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java index 3a2c5057d6..be11394d2b 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java @@ -17,36 +17,26 @@ package org.springframework.web.socket; +import java.net.URI; +import java.util.Arrays; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.WebSocketHandlerAdapter; import org.springframework.web.socket.client.endpoint.StandardWebSocketClient; import org.springframework.web.socket.client.jetty.JettyWebSocketClient; import org.springframework.web.socket.server.DefaultHandshakeHandler; -import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.server.config.EnableWebSocket; import org.springframework.web.socket.server.config.WebSocketConfigurer; import org.springframework.web.socket.server.config.WebSocketHandlerRegistry; -import org.springframework.web.socket.support.WebSocketExtension; import org.springframework.web.socket.support.WebSocketHttpHeaders; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CountDownLatch; - -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; /** * Client and server-side WebSocket integration tests. @@ -102,72 +92,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTest } } - private static class TestClientWebSocketHandler extends TextWebSocketHandlerAdapter { - - private final TextMessage[] messagesToSend; - - private final int expected; - - private final List actual = new CopyOnWriteArrayList(); - - private final CountDownLatch latch; - - - public TestClientWebSocketHandler(int expectedNumberOfMessages, TextMessage... messagesToSend) { - this.messagesToSend = messagesToSend; - this.expected = expectedNumberOfMessages; - this.latch = new CountDownLatch(this.expected); - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - for (TextMessage message : this.messagesToSend) { - session.sendMessage(message); - } - } - - @Override - protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { - this.actual.add(message); - this.latch.countDown(); - } - } - private static class TestServerWebSocketHandler extends TextWebSocketHandlerAdapter { - - } - - private static class TestRequestUpgradeStrategy implements RequestUpgradeStrategy { - - private final RequestUpgradeStrategy delegate; - - private List extensions= new ArrayList(); - - - private TestRequestUpgradeStrategy(RequestUpgradeStrategy delegate, String... supportedExtensions) { - this.delegate = delegate; - for (String name : supportedExtensions) { - this.extensions.add(new WebSocketExtension(name)); - } - } - - @Override - public String[] getSupportedVersions() { - return this.delegate.getSupportedVersions(); - } - - @Override - public List getSupportedExtensions(ServerHttpRequest request) { - return this.extensions; - } - - @Override - public void upgrade(ServerHttpRequest request, ServerHttpResponse response, - String selectedProtocol, List selectedExtensions, - WebSocketHandler wsHandler, Map attributes) throws HandshakeFailureException { - - this.delegate.upgrade(request, response, selectedProtocol, selectedExtensions, wsHandler, attributes); - } } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java index 5b2919ed56..30b2a80bf1 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java @@ -30,7 +30,6 @@ import javax.websocket.WebSocketContainer; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.springframework.http.HttpHeaders; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.adapter.WebSocketHandlerAdapter; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java index 14d0b770ea..3e850ba213 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java @@ -28,7 +28,6 @@ import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; import org.springframework.util.SocketUtils; import org.springframework.web.socket.WebSocketHandler; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java index 7cca712977..f0b59b084d 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java @@ -16,15 +16,14 @@ package org.springframework.web.socket.support; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; -import org.springframework.http.HttpHeaders; - import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertThat; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; /** * Unit tests for WebSocketHttpHeaders.