Polish ServletServerHttpRequest query param handling

The method returning query parameters now returns only query string
parameters as opposed to any Servlet request parameter.

This commit also adds a ReadOnlyMultiValueMap.

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsService.java

@@ -33,6 +33,16 @@ import org.springframework.web.socket.WebSocketHandler;
 public interface SockJsService {
 
 
+	/**
+	 * Process a SockJS request.
+	 *
+	 * @param request the current request
+	 * @param response the current response
+	 * @param handler the handler to process messages with
+	 *
+	 * @throws IOException raised if writing the to response of the current request fails
+	 * @throws SockJsProcessingException
+	 */
 	void handleRequest(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler handler)
 			throws IOException, SockJsProcessingException;
 

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

@@ -34,6 +34,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
@@ -283,8 +284,8 @@ public abstract class AbstractSockJsService implements SockJsService {
 		try {
 			request.getHeaders();
 		}
-		catch (IllegalArgumentException ex) {
-			// Ignore invalid Content-Type (TODO)
+		catch (InvalidMediaTypeException ex) {
+			logger.warn("Invalid media type ignored: " + ex.getMediaType());
 		}
 
 		try {

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java

@@ -164,6 +164,7 @@ public class AbstractSockJsServiceTests extends AbstractHttpRequestTests {
 		this.servletRequest.addHeader("Access-Control-Request-Headers", "Last-Modified");
 
 		handleRequest("OPTIONS", "/a/info", HttpStatus.NO_CONTENT);
+		this.response.flush();
 
 		assertEquals("*", this.servletResponse.getHeader("Access-Control-Allow-Origin"));
 		assertEquals("true", this.servletResponse.getHeader("Access-Control-Allow-Credentials"));
@@ -214,6 +215,15 @@ public class AbstractSockJsServiceTests extends AbstractHttpRequestTests {
 		assertEquals(httpStatus.value(), this.servletResponse.getStatus());
 	}
 
+	@Test
+	public void handleEmptyContentType() throws Exception {
+
+		servletRequest.setContentType("");
+		handleRequest("GET", "/a/info", HttpStatus.OK);
+
+		assertEquals("Invalid/empty content should have been ignored", 200, this.servletResponse.getStatus());
+	}
+
 
 	private static class TestSockJsService extends AbstractSockJsService {
 
@@ -228,16 +238,15 @@ public class AbstractSockJsServiceTests extends AbstractHttpRequestTests {
 		}
 
 		@Override
-		protected void handleRawWebSocketRequest(ServerHttpRequest request,
-				ServerHttpResponse response, WebSocketHandler handler) throws IOException {
+		protected void handleRawWebSocketRequest(ServerHttpRequest req, ServerHttpResponse res,
+				WebSocketHandler handler) throws IOException {
 
 			this.handler = handler;
 		}
 
 		@Override
-		protected void handleTransportRequest(ServerHttpRequest request, ServerHttpResponse response,
-				WebSocketHandler handler, String sessionId, String transport)
-						throws IOException, SockJsProcessingException {
+		protected void handleTransportRequest(ServerHttpRequest req, ServerHttpResponse res, WebSocketHandler handler,
+				String sessionId, String transport) throws IOException, SockJsProcessingException {
 
 			this.sessionId = sessionId;
 			this.transport = transport;

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java

@@ -130,6 +130,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
 		setRequest("POST", sessionUrlPrefix + "xhr");
 		this.service.setDummySessionCookieEnabled(true);
 		this.service.handleRequest(this.request, this.response, this.wsHandler);
+		this.response.flush();
 
 		assertEquals(200, this.servletResponse.getStatus());
 		assertEquals("JSESSIONID=dummy;path=/", this.servletResponse.getHeader("Set-Cookie"));

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java

@@ -25,12 +25,6 @@ import org.springframework.web.socket.AbstractHttpRequestTests;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.sockjs.support.frame.SockJsFrame;
 import org.springframework.web.socket.sockjs.support.frame.SockJsFrame.FrameFormat;
-import org.springframework.web.socket.sockjs.transport.handler.AbstractHttpSendingTransportHandler;
-import org.springframework.web.socket.sockjs.transport.handler.EventSourceTransportHandler;
-import org.springframework.web.socket.sockjs.transport.handler.HtmlFileTransportHandler;
-import org.springframework.web.socket.sockjs.transport.handler.JsonpPollingTransportHandler;
-import org.springframework.web.socket.sockjs.transport.handler.XhrPollingTransportHandler;
-import org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler;
 import org.springframework.web.socket.sockjs.transport.session.AbstractSockJsSession;
 import org.springframework.web.socket.sockjs.transport.session.PollingSockJsSession;
 import org.springframework.web.socket.sockjs.transport.session.StreamingSockJsSession;
@@ -106,6 +100,7 @@ public class HttpSendingTransportHandlerTests  extends AbstractHttpRequestTests
 		assertEquals("\"callback\" parameter required", this.servletResponse.getContentAsString());
 
 		resetRequestAndResponse();
+		this.servletRequest.setQueryString("c=callback");
 		this.servletRequest.addParameter("c", "callback");
 		transportHandler.handleRequest(this.request, this.response, this.webSocketHandler, session);
 
@@ -141,6 +136,7 @@ public class HttpSendingTransportHandlerTests  extends AbstractHttpRequestTests
 		assertEquals("\"callback\" parameter required", this.servletResponse.getContentAsString());
 
 		resetRequestAndResponse();
+		this.servletRequest.setQueryString("c=callback");
 		this.servletRequest.addParameter("c", "callback");
 		transportHandler.handleRequest(this.request, this.response, this.webSocketHandler, session);
 
@@ -166,6 +162,7 @@ public class HttpSendingTransportHandlerTests  extends AbstractHttpRequestTests
 	@Test
 	public void frameFormats() throws Exception {
 
+		this.servletRequest.setQueryString("c=callback");
 		this.servletRequest.addParameter("c", "callback");
 
 		SockJsFrame frame = SockJsFrame.openFrame();