Polish spring-websocket

- Removed unused imports
- Organized imports
- Deleted unused fields
- Deleted unused local variables
- Deleted unused private static classes

Author: sbrannen

spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java

@@ -21,7 +21,6 @@
 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.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.

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;

spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java

@@ -18,7 +18,6 @@
 
 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;

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java

@@ -32,12 +32,12 @@
 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<WebSocketExtension> extensions;
-
 
 	public AbstractHttpSockJsSession(String id, SockJsServiceConfig config,
 			WebSocketHandler wsHandler, Map<String, Object> handshakeAttributes) {

spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java

@@ -16,20 +16,21 @@
 
 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;
 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 static class WebSocketToStandardExtensionAdapter implements Extension {
 
 		public WebSocketToStandardExtensionAdapter(final WebSocketExtension ext) {
 			this.name = ext.getName();
-			List<Parameter> params = new ArrayList<Parameter>();
 			for (final String paramName : ext.getParameters().keySet()) {
 				this.parameters.add(new Parameter() {
 					@Override

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.
 	 */

spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java

@@ -30,7 +30,6 @@
 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;

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}

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 TestServerWebSocketHandler serverHandler() {
 		}
 	}
 
-	private static class TestClientWebSocketHandler extends TextWebSocketHandlerAdapter {
-
-		private final TextMessage[] messagesToSend;
-
-		private final int expected;
-
-		private final List<TextMessage> actual = new CopyOnWriteArrayList<TextMessage>();
-
-		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<WebSocketExtension> extensions= new ArrayList<WebSocketExtension>();
-
-
-		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<WebSocketExtension> getSupportedExtensions(ServerHttpRequest request) {
-			return this.extensions;
-		}
-
-		@Override
-		public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
-				String selectedProtocol, List<WebSocketExtension> selectedExtensions,
-				WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
-
-			this.delegate.upgrade(request, response, selectedProtocol, selectedExtensions, wsHandler, attributes);
-		}
 	}
 
 }

spring-websocket/src/test/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClientTests.java

@@ -30,7 +30,6 @@
 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;