API break - changes signature of SocketIOServlet.doSocketIOConnect

Author: Mathieu Carbou

core/src/main/java/com/glines/socketio/server/SocketIOServlet.java

@@ -117,8 +117,8 @@ private void serve(HttpServletRequest request, HttpServletResponse response) thr
   		transport.handle(request, response, new Transport.InboundFactory() {
 
 			@Override
-			public SocketIOInbound getInbound(HttpServletRequest request, String[] protocols) {
-				return SocketIOServlet.this.doSocketIOConnect(request, protocols);
+			public SocketIOInbound getInbound(HttpServletRequest request) {
+				return SocketIOServlet.this.doSocketIOConnect(request);
 			}
 
   		}, sessionManager);
@@ -136,5 +136,5 @@ public void destroy() {
      * Returns an instance of SocketIOInbound or null if the connection is to be denied.
      * The value of cookies and protocols may be null.
      */
-	protected abstract SocketIOInbound doSocketIOConnect(HttpServletRequest request, String[] protocols);
+	protected abstract SocketIOInbound doSocketIOConnect(HttpServletRequest request);
 }

core/src/main/java/com/glines/socketio/server/Transport.java

@@ -30,7 +30,7 @@
 
 public interface Transport {
 	interface InboundFactory {
-		SocketIOInbound getInbound(HttpServletRequest request, String[] protocols);
+		SocketIOInbound getInbound(HttpServletRequest request);
 	}
 
 	/**

core/src/main/java/com/glines/socketio/server/transport/WebSocketTransport.java

@@ -241,8 +241,7 @@ public void handle(HttpServletRequest request,
 	        	origin = host;
 	        }
 
-	        SocketIOInbound inbound = inboundFactory.getInbound(request,
-	        		protocol == null ? null : protocol.split(" "));
+	        SocketIOInbound inbound = inboundFactory.getInbound(request);
 	        if (inbound == null) {
 	        	if (hixie) {
                     response.setHeader("Connection","close");

core/src/main/java/com/glines/socketio/server/transport/XHRTransport.java

@@ -375,7 +375,7 @@ protected SocketIOSession connect(HttpServletRequest request,
 			HttpServletResponse response, Transport.InboundFactory inboundFactory,
 			com.glines.socketio.server.SocketIOSession.Factory sessionFactory)
 			throws IOException {
-		SocketIOInbound inbound = inboundFactory.getInbound(request, null);
+		SocketIOInbound inbound = inboundFactory.getInbound(request);
 		if (inbound != null) {
  			SocketIOSession session = sessionFactory.createSession(inbound);
 			XHRSessionHelper handler =  createHelper(session);

samples/broadcast/src/main/java/com/glines/socketio/sample/broadcast/BroadcastSocketServlet.java

@@ -74,7 +74,7 @@ private void broadcast(int messageType, String message) {
 		}
 
 	@Override
-	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request, String[] protocols) {
+	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request) {
 		return new BroadcastConnection();
 	}
 

samples/chat-gwt/src/main/java/com/glines/socketio/sample/gwtchat/GWTChatSocketServlet.java

@@ -117,7 +117,7 @@ private void broadcast(int messageType, String message) {
 		}
 
 	@Override
-	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request, String[] protocols) {
+	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request) {
 		return new GWTChatConnection();
 	}
 

samples/chat/src/main/java/com/glines/socketio/sample/chat/ChatSocketServlet.java

@@ -151,7 +151,7 @@ private void broadcast(int messageType, String message) {
 		}
 
 	@Override
-	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request, String[] protocols) {
+	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request) {
 		return new ChatConnection();
 	}
 

samples/echo/src/main/java/com/glines/socketio/sample/echo/EchoSocketServlet.java

@@ -58,7 +58,7 @@ public void onMessage(int messageType, String message) {
 	}
 
 	@Override
-	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request, String[] protocols) {
+	protected SocketIOInbound doSocketIOConnect(HttpServletRequest request) {
 		return new EchoConnection();
 	}