Integrate Grizzly 2.3.2-SNAPSHOT in preparation for spdy support within the Grizzly provider.

Author: rlubke

providers/grizzly/pom.xml

@@ -17,15 +17,15 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-websockets</artifactId>
-            <version>2.3-rc6</version>
+            <version>2.3.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-                   <groupId>com.ning</groupId>
-                   <artifactId>async-http-client-api</artifactId>
-                   <version>${project.version}</version>
-                   <scope>test</scope>
-                   <classifier>tests</classifier>
-               </dependency>
+            <groupId>com.ning</groupId>
+            <artifactId>async-http-client-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
     </dependencies>
 
     <repositories>

providers/grizzly/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -105,13 +105,13 @@
 import org.glassfish.grizzly.utils.Futures;
 import org.glassfish.grizzly.utils.IdleTimeoutFilter;
 import org.glassfish.grizzly.websockets.DataFrame;
-import org.glassfish.grizzly.websockets.DefaultWebSocket;
 import org.glassfish.grizzly.websockets.HandShake;
 import org.glassfish.grizzly.websockets.HandshakeException;
 import org.glassfish.grizzly.websockets.ProtocolHandler;
+import org.glassfish.grizzly.websockets.SimpleWebSocket;
 import org.glassfish.grizzly.websockets.Version;
-import org.glassfish.grizzly.websockets.WebSocketEngine;
-import org.glassfish.grizzly.websockets.WebSocketFilter;
+import org.glassfish.grizzly.websockets.WebSocketClientFilter;
+import org.glassfish.grizzly.websockets.WebSocketHolder;
 import org.glassfish.grizzly.websockets.draft06.ClosingFrame;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -413,7 +413,7 @@ public void onTimeout(Connection connection) {
         } else {
             doDefaultTransportConfig();
         }
-        fcb.add(new WebSocketFilter());
+        fcb.add(new WebSocketClientFilter());
         clientTransport.getAsyncQueueIO().getWriter().setMaxPendingBytesPerConnection(-1);
         clientTransport.setProcessor(fcb.build());
 
@@ -1337,13 +1337,13 @@ protected void onHttpHeadersParsed(HttpHeader httpHeader,
 
                     final GrizzlyWebSocketAdapter webSocketAdapter = createWebSocketAdapter(context);
                     context.webSocket = webSocketAdapter;
-                    DefaultWebSocket ws = webSocketAdapter.gWebSocket;
+                    SimpleWebSocket ws = webSocketAdapter.gWebSocket;
                     if (context.currentState == AsyncHandler.STATE.UPGRADE) {
                         httpHeader.setChunked(false);
                         ws.onConnect();
-                        WebSocketEngine.getEngine().setWebSocketHolder(ctx.getConnection(),
-                                context.protocolHandler,
-                                ws);
+                        WebSocketHolder.set(ctx.getConnection(),
+                                            context.protocolHandler,
+                                            ws);
                         ((WebSocketUpgradeHandler) context.handler).onSuccess(context.webSocket);
                         final int wsTimeout = context.provider.clientConfig.getWebSocketIdleTimeoutInMs();
                         IdleTimeoutFilter.setCustomTimeout(ctx.getConnection(),
@@ -1437,7 +1437,7 @@ protected boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext c
         // ----------------------------------------------------- Private Methods
 
         private static GrizzlyWebSocketAdapter createWebSocketAdapter(final HttpTransactionContext context) {
-            DefaultWebSocket ws = new DefaultWebSocket(context.protocolHandler);
+            SimpleWebSocket ws = new SimpleWebSocket(context.protocolHandler);
             AsyncHttpProviderConfig config = context.provider.clientConfig.getAsyncHttpProviderConfig();
             boolean bufferFragments = true;
             if (config instanceof GrizzlyAsyncHttpProviderConfig) {
@@ -1652,7 +1652,7 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                     req.getHeaders().remove(Header.ProxyAuthenticate.toString());
                     req.getHeaders().remove(Header.ProxyAuthorization.toString());
 
-                    String msg = null;
+                    String msg;
                     try {
 
                         if(isNTLMFirstHandShake(proxy_auth))
@@ -1696,7 +1696,7 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
 
                         newContext.invocationStatus = tempInvocationStatus;
 
-                        String challengeHeader = null;
+                        String challengeHeader;
                         String server = proxyServer.getHost();
 
                         challengeHeader = GSSSPNEGOWrapper.generateToken(server);
@@ -2816,13 +2816,13 @@ public void getBytes(byte[] bytes) {
 
     private static final class GrizzlyWebSocketAdapter implements WebSocket {
 
-        private final DefaultWebSocket gWebSocket;
+        private final SimpleWebSocket gWebSocket;
         private final boolean bufferFragments;
 
         // -------------------------------------------------------- Constructors
 
 
-        GrizzlyWebSocketAdapter(final DefaultWebSocket gWebSocket,
+        GrizzlyWebSocketAdapter(final SimpleWebSocket gWebSocket,
                                 final boolean bufferFragements) {
             this.gWebSocket = gWebSocket;
             this.bufferFragments = bufferFragements;