Merge ahc-1.7.x to master.

* ahc-1.7.x:
  Fix javadoc warnings.
  Integrate Grizzly 2.2.10.
  Fix for the Grizzly side of #101 : [websocket] onError must not be called when status code is != 101.
  Fix for #111 - [websocket] Both Netty and Grizzly issues with URI without port.
  Incremental fix for #101 [websocket] onError must not be called when status code is != 101. Fix Netty side
  Fix for #111 https://github.com/sonatype/async-http-client/issues/111
  Fix errror with clirr
  Port #102 tests
  Port fix for #102 [websocket] Support redirect
  Bump to the latest Netty release

Author: rlubke

pom.xml

@@ -448,8 +448,9 @@
                         <exclude>**/Request$EntityWriter</exclude>
                         <exclude>**/RequestBuilderBase</exclude>
                         <exclude>**/Response</exclude>
-                        <exclude>**/Response$</exclude>
+                        <exclude>**/Response$*</exclude>
                         <exclude>**/FilterContext</exclude>
+                        <exclude>**/FilterContext$*</exclude>
                         <exclude>**/NettyResponseFuture</exclude>
                         <exclude>**/**ResponseBodyPart</exclude>
                         <exclude>**/**WebSocket</exclude>

src/main/java/com/ning/http/client/AsyncHandler.java

@@ -55,7 +55,7 @@ public static enum STATE {
          */
         CONTINUE,
         /**
-         * Upgrade the protocol. When specified, the AsyncHttpProvider will try to invoke the {@link UpgradeHandler#onReady}
+         * Upgrade the protocol.
          */
         UPGRADE
     }

src/main/java/com/ning/http/client/UpgradeHandler.java

@@ -13,7 +13,7 @@
 package com.ning.http.client;
 
 /**
- * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link WebSocket}
+ * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link com.ning.http.client.websocket.WebSocket}
  * as type.
  *
  * @param <T>

src/main/java/com/ning/http/client/filter/FilterContext.java

@@ -73,7 +73,6 @@ public HttpResponseStatus getResponseStatus() {
 
     /**
      * Return the response {@link HttpResponseHeaders}
-     * @return
      */
     public HttpResponseHeaders getResponseHeaders() {
         return b.headers;

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

@@ -521,9 +521,9 @@ static int getPort(final URI uri, final int p) {
         int port = p;
         if (port == -1) {
             final String protocol = uri.getScheme().toLowerCase();
-            if ("http".equals(protocol)) {
+            if ("http".equals(protocol) || "ws".equals(protocol)) {
                 port = 80;
-            } else if ("https".equals(protocol)) {
+            } else if ("https".equals(protocol) || "wss".equals(protocol)) {
                 port = 443;
             } else {
                 throw new IllegalArgumentException("Unknown protocol: " + protocol);
@@ -1283,39 +1283,46 @@ protected void onHttpHeadersParsed(HttpHeader httpHeader,
                     return;
                 }
             }
-
-            if (context.currentState != AsyncHandler.STATE.ABORT) {
-                boolean upgrade = context.currentState == AsyncHandler.STATE.UPGRADE;
+            if (context.isWSRequest) {
                 try {
-                    context.currentState = handler.onHeadersReceived(
-                            responseHeaders);
-                } catch (Exception e) {
-                    httpHeader.setSkipRemainder(true);
-                    context.abort(e);
-                    return;
-                }
-                if (upgrade) {
-                    try {
+                    context.protocolHandler.setConnection(ctx.getConnection());
+                    DefaultWebSocket ws = new DefaultWebSocket(context.protocolHandler);
+                    context.webSocket = new GrizzlyWebSocketAdapter(ws);
+                    if (context.currentState == AsyncHandler.STATE.UPGRADE) {
                         httpHeader.setChunked(false);
-                        context.protocolHandler.setConnection(ctx.getConnection());
-                        DefaultWebSocket ws = new DefaultWebSocket(context.protocolHandler);
                         ws.onConnect();
-                        context.webSocket = new GrizzlyWebSocketAdapter(ws);
                         WebSocketEngine.getEngine().setWebSocketHolder(ctx.getConnection(),
                                 context.protocolHandler,
                                 ws);
                         ((WebSocketUpgradeHandler) context.handler).onSuccess(context.webSocket);
                         final int wsTimeout = context.provider.clientConfig.getWebSocketIdleTimeoutInMs();
                         IdleTimeoutFilter.setCustomTimeout(ctx.getConnection(),
-                                                           ((wsTimeout <= 0)
-                                                                   ? IdleTimeoutFilter.FOREVER
-                                                                   : wsTimeout),
-                                                           TimeUnit.MILLISECONDS);
+                                ((wsTimeout <= 0)
+                                        ? IdleTimeoutFilter.FOREVER
+                                        : wsTimeout),
+                                TimeUnit.MILLISECONDS);
                         context.result(handler.onCompleted());
+                    } else {
+                        httpHeader.setSkipRemainder(true);
+                        ((WebSocketUpgradeHandler) context.handler).
+                                onClose(context.webSocket,
+                                        1002,
+                                        "WebSocket protocol error: unexpected HTTP response status during handshake.");
+                        context.result(null);
+                    }
+                } catch (Exception e) {
+                    httpHeader.setSkipRemainder(true);
+                    context.abort(e);
+                }
+            } else {
+                if (context.currentState != AsyncHandler.STATE.ABORT) {
+                    try {
+                        context.currentState = handler.onHeadersReceived(
+                                responseHeaders);
                     } catch (Exception e) {
                         httpHeader.setSkipRemainder(true);
                         context.abort(e);
-                    } 
+                    }
                 }
             }
 

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -549,6 +549,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
                                          ChannelBuffer buffer) throws IOException {
 
         String host = AsyncHttpProviderUtils.getHost(uri);
+        boolean webSocket = isWebSocket(uri);
 
         if (request.getVirtualHost() != null) {
             host = request.getVirtualHost();
@@ -569,11 +570,12 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
             }
             nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, m, path.toString());
         }
-        boolean webSocket = isWebSocket(uri);
+
         if (webSocket) {
             nettyRequest.addHeader(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET);
             nettyRequest.addHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE);
-            nettyRequest.addHeader("Origin", "http://" + uri.getHost() + ":" + uri.getPort());
+            nettyRequest.addHeader("Origin", "http://" + uri.getHost() + ":"
+                    + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()));
             nettyRequest.addHeader(WEBSOCKET_KEY, WebSocketUtil.getKey());
             nettyRequest.addHeader("Sec-WebSocket-Version", "13");
         }
@@ -2339,7 +2341,13 @@ public void handle(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
                 s = new ResponseStatus(future.getURI(), response, NettyAsyncHttpProvider.this);
                 final boolean statusReceived = h.onStatusReceived(s) == STATE.UPGRADE;
 
-                if (!validStatus || !validUpgrade || !validConnection || !statusReceived) {
+                if (!statusReceived) {
+                    h.onClose(new NettyWebSocket(ctx.getChannel()), 1002, "Bad response status " + response.getStatus().getCode());
+                    future.done(null);
+                    return;
+                }
+
+                if (!validStatus || !validUpgrade || !validConnection) {
                     throw new IOException("Invalid handshake response");
                 }
 

src/main/java/com/ning/http/client/websocket/WebSocket.java

@@ -41,7 +41,7 @@ public interface WebSocket {
      * @param offset   starting offset.
      * @param len      length.
      * @param last     flag indicating whether or not this is the last fragment.
-     * @return
+     * @return this.
      */
     WebSocket stream(byte[] fragment, int offset, int len, boolean last);
 

src/main/java/com/ning/http/client/websocket/WebSocketCloseCodeReasonListener.java

@@ -14,7 +14,7 @@
 
 /**
  * Extend the normal close listener with one that support the WebSocket's code and reason.
- * @See http://tools.ietf.org/html/rfc6455#section-5.5.1
+ * @see "http://tools.ietf.org/html/rfc6455#section-5.5.1"
  */
 public interface WebSocketCloseCodeReasonListener {
 

src/main/java/com/ning/http/client/websocket/WebSocketUpgradeHandler.java

@@ -67,7 +67,7 @@ public final STATE onStatusReceived(HttpResponseStatus responseStatus) throws Ex
         if (responseStatus.getStatusCode() == 101) {
             return STATE.UPGRADE;
         } else {
-            throw new IllegalStateException("Invalid upgrade protocol, status should be 101 but was " + responseStatus.getStatusCode());
+            return STATE.ABORT;
         }
     }
 
@@ -116,6 +116,21 @@ public final void onFailure(Throwable t) {
         }
     }
 
+    public final void onClose(WebSocket webSocket, int status, String reasonPhrase) {
+        // Connect failure
+        if (this.webSocket == null) this.webSocket = webSocket;
+
+        for (WebSocketListener w : l) {
+            if (webSocket != null) {
+                webSocket.addWebSocketListener(w);
+            }
+            w.onClose(webSocket);
+            if (WebSocketCloseCodeReasonListener.class.isAssignableFrom(w.getClass())) {
+                WebSocketCloseCodeReasonListener.class.cast(w).onClose(webSocket, status, reasonPhrase);
+            }
+        }
+    }
+
     /**
      * Build a {@link WebSocketUpgradeHandler}
      */

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -291,7 +291,7 @@ public final static URI getRedirectUri(URI uri, String location) {
     public final static int getPort(URI uri) {
         int port = uri.getPort();
         if (port == -1)
-            port = uri.getScheme().equals("http") ? 80 : 443;
+            port = uri.getScheme().equals("http") || uri.getScheme().equals("ws") ? 80 : 443;
         return port;
     }