From 373f07b1ffa6e274d49d766467ae25ca10768c50 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 18 Mar 2014 22:30:32 +0100
Subject: [PATCH] Polishing

---
 .../AbstractStandardUpgradeStrategy.java      | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
index 35c072fcd2..7f1115d463 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
@@ -48,8 +48,8 @@ import org.springframework.web.socket.server.HandshakeFailureException;
 import org.springframework.web.socket.server.RequestUpgradeStrategy;
 
 /**
- * A base class for {@link RequestUpgradeStrategy} implementations that build on the
- * standard WebSocket API for Java.
+ * A base class for {@link RequestUpgradeStrategy} implementations that build
+ * on the standard WebSocket API for Java (JSR-356).
  *
  * @author Rossen Stoyanchev
  * @since 4.0
@@ -61,15 +61,6 @@ public abstract class AbstractStandardUpgradeStrategy implements RequestUpgradeS
 	private volatile List<WebSocketExtension> extensions;
 
 
-	@Override
-	public List<WebSocketExtension> getSupportedExtensions(ServerHttpRequest request) {
-		if(this.extensions == null) {
-			HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
-			this.extensions = getInstalledExtensions(getContainer(servletRequest));
-		}
-		return this.extensions;
-	}
-
 	protected ServerContainer getContainer(HttpServletRequest request) {
 		ServletContext servletContext = request.getServletContext();
 		String attrName = "javax.websocket.server.ServerContainer";
@@ -79,12 +70,9 @@ public abstract class AbstractStandardUpgradeStrategy implements RequestUpgradeS
 		return container;
 	}
 
-	protected List<WebSocketExtension> getInstalledExtensions(WebSocketContainer container) {
-		List<WebSocketExtension> result = new ArrayList<WebSocketExtension>();
-		for (Extension ext : container.getInstalledExtensions()) {
-			result.add(new StandardToWebSocketExtensionAdapter(ext));
-		}
-		return result;
+	protected final HttpServletRequest getHttpServletRequest(ServerHttpRequest request) {
+		Assert.isTrue(request instanceof ServletServerHttpRequest);
+		return ((ServletServerHttpRequest) request).getServletRequest();
 	}
 
 	protected final HttpServletResponse getHttpServletResponse(ServerHttpResponse response) {
@@ -92,18 +80,31 @@ public abstract class AbstractStandardUpgradeStrategy implements RequestUpgradeS
 		return ((ServletServerHttpResponse) response).getServletResponse();
 	}
 
-	protected final HttpServletRequest getHttpServletRequest(ServerHttpRequest request) {
-		Assert.isTrue(request instanceof ServletServerHttpRequest);
-		return ((ServletServerHttpRequest) request).getServletRequest();
+
+	@Override
+	public List<WebSocketExtension> getSupportedExtensions(ServerHttpRequest request) {
+		if (this.extensions == null) {
+			HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
+			this.extensions = getInstalledExtensions(getContainer(servletRequest));
+		}
+		return this.extensions;
+	}
+
+	protected List<WebSocketExtension> getInstalledExtensions(WebSocketContainer container) {
+		List<WebSocketExtension> result = new ArrayList<WebSocketExtension>();
+		for (Extension ext : container.getInstalledExtensions()) {
+			result.add(new StandardToWebSocketExtensionAdapter(ext));
+		}
+		return result;
 	}
 
+
 	@Override
 	public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
 			String selectedProtocol, List<WebSocketExtension> selectedExtensions, Principal user,
 			WebSocketHandler wsHandler, Map<String, Object> attrs) throws HandshakeFailureException {
 
 		HttpHeaders headers = request.getHeaders();
-
 		InetSocketAddress localAddr = request.getLocalAddress();
 		InetSocketAddress remoteAddr = request.getRemoteAddress();