Add additional handler extension callbacks

Implements AsyncHttpClient#732 for 1.9.x.

Author: barnardb

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

@@ -59,4 +59,14 @@ public interface AsyncHandlerExtensions {
      * Notify the callback every time a request is being retried.
      */
     void onRetry();
+
+    /**
+     * Notify the callback after DNS resolution has completed.
+     */
+    void onDnsResolved();
+
+    /**
+     * Notify the callback when the SSL handshake performed to establish an HTTPS connection has been completed.
+     */
+    void onSslHandshakeCompleted();
 }

src/main/java/com/ning/http/client/providers/netty/request/NettyConnectListener.java

@@ -22,6 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.AsyncHandlerExtensions;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.providers.netty.channel.ChannelManager;
@@ -71,7 +72,7 @@ private void abortChannelPreemption(String poolKey) {
         if (channelPreempted)
             channelManager.abortChannelPreemption(poolKey);
     }
-    
+
     private void writeRequest(Channel channel, String poolKey) {
 
         LOGGER.debug("Request using non cached Channel '{}':\n{}\n", channel, future.getNettyRequest().getHttpRequest());
@@ -108,6 +109,10 @@ public void operationComplete(ChannelFuture handshakeFuture) throws Exception {
                             LOGGER.debug("onFutureSuccess: session = {}, id = {}, isValid = {}, host = {}", session.toString(),
                                     Base64.encode(session.getId()), session.isValid(), host);
                         if (hostnameVerifier.verify(host, session)) {
+                            final AsyncHandler<T> asyncHandler = future.getAsyncHandler();
+                            if (asyncHandler instanceof AsyncHandlerExtensions)
+                                AsyncHandlerExtensions.class.cast(asyncHandler).onSslHandshakeCompleted();
+
                             writeRequest(channel, poolKey);
                         } else {
                             abortChannelPreemption(poolKey);

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java

@@ -250,7 +250,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
         HttpMethod method = future.getNettyRequest().getHttpRequest().getMethod();
         requestFactory.addAuthorizationHeader(headers, requestFactory.firstRequestOnlyAuthorizationHeader(request, uri, proxy, realm));
         requestFactory.setProxyAuthorizationHeader(headers, requestFactory.firstRequestOnlyProxyAuthorizationHeader(request, proxy, method));
-        
+
         // Do not throw an exception when we need an extra connection for a
         // redirect
         // FIXME why? This violate the max connection per host handling, right?
@@ -276,7 +276,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
             if (asyncHandler instanceof AsyncHandlerExtensions)
                 AsyncHandlerExtensions.class.cast(asyncHandler).onOpenConnection();
 
-            ChannelFuture channelFuture = connect(request, uri, proxy, useProxy, bootstrap);
+            ChannelFuture channelFuture = connect(request, uri, proxy, useProxy, bootstrap, asyncHandler);
             channelFuture.addListener(new NettyConnectListener<T>(config, future, this, channelManager, channelPreempted, poolKey));
 
         } catch (Throwable t) {
@@ -308,17 +308,17 @@ private <T> NettyResponseFuture<T> newNettyResponseFuture(Uri uri, Request reque
     }
 
     public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
-        
+
         NettyRequest nettyRequest = future.getNettyRequest();
         HttpRequest httpRequest = nettyRequest.getHttpRequest();
         AsyncHandler<T> handler = future.getAsyncHandler();
-        
+
         // if the channel is dead because it was pooled and the remote
         // server decided to close it,
         // we just let it go and the channelInactive do its work
         if (!Channels.isChannelValid(channel))
             return;
-        
+
         try {
             if (handler instanceof TransferCompletionHandler)
                 configureTransferAdapter(handler, httpRequest);
@@ -362,9 +362,12 @@ else if (!useProxy || avoidProxy(proxy, uri.getHost()))
             return new InetSocketAddress(proxy.getHost(), proxy.getPort());
     }
 
-    private ChannelFuture connect(Request request, Uri uri, ProxyServer proxy, boolean useProxy, ClientBootstrap bootstrap) {
+    private ChannelFuture connect(Request request, Uri uri, ProxyServer proxy, boolean useProxy, ClientBootstrap bootstrap, AsyncHandler<?> asyncHandler) {
         InetSocketAddress remoteAddress = remoteAddress(request, uri, proxy, useProxy);
 
+        if (asyncHandler instanceof AsyncHandlerExtensions)
+            AsyncHandlerExtensions.class.cast(asyncHandler).onDnsResolved();
+
         if (request.getLocalAddress() != null)
             return bootstrap.connect(remoteAddress, new InetSocketAddress(request.getLocalAddress(), 0));
         else
@@ -484,7 +487,7 @@ private boolean validateWebSocketRequest(Request request, AsyncHandler<?> asyncH
     }
 
     public Channel pollAndVerifyCachedChannel(Uri uri, ProxyServer proxy, ConnectionPoolPartitioning connectionPoolPartitioning, AsyncHandler<?> asyncHandler) {
- 
+
         if (asyncHandler instanceof AsyncHandlerExtensions)
             AsyncHandlerExtensions.class.cast(asyncHandler).onPoolConnection();
 

src/test/java/com/ning/http/client/async/EventCollectingHandler.java

@@ -86,4 +86,14 @@ public void onSendRequest(Object request) {
     public void onRetry() {
         firedEvents.add("Retry");
     }
+
+    @Override
+    public void onDnsResolved() {
+        firedEvents.add("DnsResolved");
+    }
+
+    @Override
+    public void onSslHandshakeCompleted() {
+        firedEvents.add("SslHandshakeCompleted");
+    }
 }

src/test/java/com/ning/http/client/async/netty/NettyAsyncProviderBasicTest.java

@@ -63,6 +63,7 @@ public void testNewConnectionEventsFired() throws InterruptedException, TimeoutE
             List<String> expectedEvents = Arrays.asList(
                     "PoolConnection",
                     "OpenConnection",
+                    "DnsResolved",
                     "ConnectionOpen",
                     "SendRequest",
                     "HeaderWriteCompleted",

src/test/java/com/ning/http/client/async/netty/NettyBasicHttpsTest.java

@@ -42,6 +42,8 @@ public void testNormalEventsFired() throws InterruptedException, TimeoutExceptio
             List<String> expectedEvents = Arrays.asList(
                     "PoolConnection",
                     "OpenConnection",
+                    "DnsResolved",
+                    "SslHandshakeCompleted",
                     "ConnectionOpen",
                     "SendRequest",
                     "HeaderWriteCompleted",