/*
 * Copyright 2002-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.web.socket.server.support;

import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.web.HttpRequestHandler;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.DefaultHandshakeHandler;
import org.springframework.web.socket.server.HandshakeHandler;
import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
import org.springframework.web.socket.support.LoggingWebSocketHandlerDecorator;

/**
 * A {@link HttpRequestHandler} for processing WebSocket handshake requests.
 *
 * <p>This is the main class to use when configuring a server WebSocket at a specific URL.
 * It is a very thin wrapper around a {@link HandshakeHandler} and a
 * {@link WebSocketHandler} instance also adapting the {@link HttpServletRequest} and
 * {@link HttpServletResponse} to {@link ServerHttpRequest} and {@link ServerHttpResponse}
 * respectively.
 *
 * <p>The {@link #decorateWebSocketHandler(WebSocketHandler)} method decorates the given
 * WebSocketHandler with a logging and exception handling decorators. This method can
 * be overridden to change that.
 *
 * @author Rossen Stoyanchev
 * @since 4.0
 */
public class WebSocketHttpRequestHandler implements HttpRequestHandler {

	private final HandshakeHandler handshakeHandler;

	private final WebSocketHandler webSocketHandler;


	public WebSocketHttpRequestHandler(WebSocketHandler webSocketHandler) {
		this(webSocketHandler, new DefaultHandshakeHandler());
	}

	public WebSocketHttpRequestHandler(	WebSocketHandler webSocketHandler, HandshakeHandler handshakeHandler) {
		Assert.notNull(webSocketHandler, "webSocketHandler must not be null");
		Assert.notNull(handshakeHandler, "handshakeHandler must not be null");
		this.webSocketHandler = decorateWebSocketHandler(webSocketHandler);
		this.handshakeHandler = new DefaultHandshakeHandler();
	}


	/**
	 * Decorate the WebSocketHandler provided to the class constructor.
	 *
	 * <p>By default {@link ExceptionWebSocketHandlerDecorator} and
	 * {@link LoggingWebSocketHandlerDecorator} are applied are added.
	 */
	protected WebSocketHandler decorateWebSocketHandler(WebSocketHandler handler) {
		handler = new ExceptionWebSocketHandlerDecorator(handler);
		return new LoggingWebSocketHandlerDecorator(handler);
	}

	@Override
	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
			throws ServletException, IOException {

		ServerHttpRequest httpRequest = new ServletServerHttpRequest(request);
		ServerHttpResponse httpResponse = new ServletServerHttpResponse(response);

		try {
			this.handshakeHandler.doHandshake(httpRequest, httpResponse, this.webSocketHandler);
			httpResponse.flush();
		}
		catch (IOException ex) {
			throw ex;
		}
	}

}

@@ -2880,28 +2880,17 @@
 ndler = 
-new DefaultH
+h
 andshake
@@ -2896,18 +2896,16 @@
 eHandler
-()
 ;%0A%09%7D%0A%0A%0A%09

Fix minor issue in WebSocketHttpRequestHandler