Bring onSslHandshakeCompleted back to life

Author: slandelle

api/src/main/java/org/asynchttpclient/AsyncHandlerExtensions.java

@@ -16,14 +16,14 @@
 
 /**
  * This interface hosts new low level callback methods on {@link AsyncHandler}.
- * For now, those methods are in a dedicated interface in order not to break the existing API,
- * but could be merged into one of the existing ones in AHC 2.
+ * For now, those methods are in a dedicated interface in order not to break the
+ * existing API, but could be merged into one of the existing ones in AHC 2.
  * 
  * More additional hooks might come, such as:
  * <ul>
- *   <li>onConnectionClosed()</li>
- *   <li>onBytesSent(long numberOfBytes)</li>
- *   <li>onBytesReceived(long numberOfBytes)</li>
+ * <li>onConnectionClosed()</li>
+ * <li>onBytesSent(long numberOfBytes)</li>
+ * <li>onBytesReceived(long numberOfBytes)</li>
  * </ul>
  */
 public interface AsyncHandlerExtensions {
@@ -44,14 +44,15 @@ public interface AsyncHandlerExtensions {
     void onPoolConnection();
 
     /**
-     * Notify the callback when a new connection was successfully fetched from the pool.
+     * Notify the callback when a new connection was successfully fetched from
+     * the pool.
      */
     void onConnectionPooled();
 
     /**
-     * Notify the callback when a request is being written on the wire.
-     * If the original request causes multiple requests to be sent, for example, because of authorization or retry,
-     * it will be notified multiple times.
+     * Notify the callback when a request is being written on the wire. If the
+     * original request causes multiple requests to be sent, for example,
+     * because of authorization or retry, it will be notified multiple times.
      * 
      * @param request the real request object as passed to the provider
      */
@@ -66,4 +67,10 @@ public interface AsyncHandlerExtensions {
      * Notify the callback after DNS resolution has completed.
      */
     void onDnsResolved(InetSocketAddress remoteAddress);
+
+    /**
+     * Notify the callback when the SSL handshake performed to establish an
+     * HTTPS connection has been completed.
+     */
+    void onSslHandshakeCompleted();
 }

api/src/test/java/org/asynchttpclient/async/util/EventCollectingHandler.java

@@ -103,4 +103,9 @@ public void onRetry() {
     public void onDnsResolved(InetSocketAddress remoteAddress) {
         firedEvents.add("DnsResolved");
     }
+
+    @Override
+    public void onSslHandshakeCompleted() {
+        firedEvents.add("SslHandshakeCompleted");
+    }
 }

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyConnectListener.java

@@ -17,6 +17,7 @@
 
 import java.net.ConnectException;
 
+import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHandlerExtensions;
 import org.asynchttpclient.providers.netty.commons.future.StackTraceInspector;
 import org.asynchttpclient.providers.netty3.channel.ChannelManager;
@@ -88,11 +89,16 @@ private void onFutureSuccess(final Channel channel) throws ConnectException {
             sslHandler.handshake().addListener(new ChannelFutureListener() {
 
                 @Override
-                public void operationComplete(ChannelFuture future) throws Exception {
-                    if (future.isSuccess())
+                public void operationComplete(ChannelFuture handshakeFuture) throws Exception {
+                    if (handshakeFuture.isSuccess()) {
+                        final AsyncHandler<T> asyncHandler = future.getAsyncHandler();
+                        if (asyncHandler instanceof AsyncHandlerExtensions)
+                            AsyncHandlerExtensions.class.cast(asyncHandler).onSslHandshakeCompleted();
+
                         writeRequest(channel);
-                    else
-                        onFutureFailure(channel, future.getCause());
+                    } else {
+                        onFutureFailure(channel, handshakeFuture.getCause());
+                    }
                 }
             });
 

providers/netty3/src/test/java/org/asynchttpclient/providers/netty3/NettyBasicHttpsTest.java

@@ -41,6 +41,7 @@ public void testNormalEventsFired() throws InterruptedException, TimeoutExceptio
                     "PoolConnection",
                     "OpenConnection",
                     "DnsResolved",
+                    "SslHandshakeCompleted",
                     "ConnectionOpen",
                     "SendRequest",
                     "HeaderWriteCompleted",

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyConnectListener.java

@@ -23,6 +23,7 @@
 
 import java.net.ConnectException;
 
+import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHandlerExtensions;
 import org.asynchttpclient.providers.netty.commons.future.StackTraceInspector;
 import org.asynchttpclient.providers.netty4.channel.ChannelManager;
@@ -87,12 +88,17 @@ private void onFutureSuccess(final Channel channel) throws ConnectException {
         if (sslHandler != null) {
             sslHandler.handshakeFuture().addListener(new GenericFutureListener<Future<Channel>>() {
                 @Override
-                public void operationComplete(Future<Channel> future) throws Exception {
+                public void operationComplete(Future<Channel> handshakeFuture) throws Exception {
 
-                    if (future.isSuccess())
+                    if (handshakeFuture.isSuccess()) {
+                        final AsyncHandler<T> asyncHandler = future.getAsyncHandler();
+                        if (asyncHandler instanceof AsyncHandlerExtensions)
+                            AsyncHandlerExtensions.class.cast(asyncHandler).onSslHandshakeCompleted();
+
                         writeRequest(channel);
-                    else
-                        onFutureFailure(channel, future.cause());
+                    } else {
+                        onFutureFailure(channel, handshakeFuture.cause());
+                    }
                 }
             });
 

providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyBasicHttpsTest.java

@@ -41,6 +41,7 @@ public void testNormalEventsFired() throws InterruptedException, TimeoutExceptio
                     "PoolConnection",
                     "OpenConnection",
                     "DnsResolved",
+                    "SslHandshakeCompleted",
                     "ConnectionOpen",
                     "SendRequest",
                     "HeaderWriteCompleted",