NameResolver API should be non blocking, close AsyncHttpClient#1034

Author: slandelle

client/src/main/java/org/asynchttpclient/DefaultRequest.java

@@ -26,12 +26,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.asynchttpclient.channel.NameResolver;
 import org.asynchttpclient.channel.pool.ConnectionPoolPartitioning;
 import org.asynchttpclient.cookie.Cookie;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.request.body.generator.BodyGenerator;
 import org.asynchttpclient.request.body.multipart.Part;
+import org.asynchttpclient.resolver.NameResolver;
 import org.asynchttpclient.uri.Uri;
 
 public class DefaultRequest implements Request {

client/src/main/java/org/asynchttpclient/Request.java

@@ -26,12 +26,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.asynchttpclient.channel.NameResolver;
 import org.asynchttpclient.channel.pool.ConnectionPoolPartitioning;
 import org.asynchttpclient.cookie.Cookie;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.request.body.generator.BodyGenerator;
 import org.asynchttpclient.request.body.multipart.Part;
+import org.asynchttpclient.resolver.NameResolver;
 import org.asynchttpclient.uri.Uri;
 
 /**

client/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -31,13 +31,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.asynchttpclient.channel.NameResolver;
 import org.asynchttpclient.channel.pool.ConnectionPoolPartitioning;
 import org.asynchttpclient.cookie.Cookie;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.request.body.generator.BodyGenerator;
 import org.asynchttpclient.request.body.generator.ReactiveStreamsBodyGenerator;
 import org.asynchttpclient.request.body.multipart.Part;
+import org.asynchttpclient.resolver.JdkNameResolver;
+import org.asynchttpclient.resolver.NameResolver;
 import org.asynchttpclient.uri.Uri;
 import org.asynchttpclient.util.UriEncoder;
 import org.reactivestreams.Publisher;
@@ -85,7 +86,7 @@ public abstract class RequestBuilderBase<T extends RequestBuilderBase<T>> {
     protected long rangeOffset;
     protected Charset charset;
     protected ConnectionPoolPartitioning connectionPoolPartitioning = ConnectionPoolPartitioning.PerHostConnectionPoolPartitioning.INSTANCE;
-    protected NameResolver nameResolver = NameResolver.JdkNameResolver.INSTANCE;
+    protected NameResolver nameResolver = JdkNameResolver.INSTANCE;
 
     protected RequestBuilderBase(String method, boolean disableUrlEncoding) {
         this.method = method;

client/src/main/java/org/asynchttpclient/handler/AsyncHandlerExtensions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -14,57 +14,100 @@
 
 import io.netty.channel.Channel;
 
-import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.List;
 
 import org.asynchttpclient.AsyncHandler;
-import org.asynchttpclient.channel.NameResolution;
 import org.asynchttpclient.netty.request.NettyRequest;
 
 /**
  * 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.
  * 
  */
 public interface AsyncHandlerExtensions {
 
+    // ////////// DNS /////////////////
+
     /**
-     * Notify the callback when trying to open a new connection.
+     * Notify the callback before DNS resolution
+     * 
+     * @param name the name to be resolved
      */
-    void onConnectionOpen();
+    void onDnsResolution(String name);
 
     /**
-     * Notify the callback after DNS resolution has completed.
+     * Notify the callback after DNS resolution was successful.
      * 
+     * @param name the name to be resolved
      * @param addresses the resolved addresses
      */
-    void onDnsResolved(NameResolution[] addresses);
+    void onDnsResolutionSuccess(String name, List<InetSocketAddress> addresses);
+
+    /**
+     * Notify the callback after DNS resolution failed.
+     * 
+     * @param name the name to be resolved
+     * @param cause the failure cause
+     */
+    void onDnsResolutionFailure(String name, Throwable cause);
+
+    // ////////////// TCP CONNECT ////////
+
+    /**
+     * Notify the callback when trying to open a new connection.
+     * 
+     * Might be called several times if the name was resolved to multiple addresses and we failed to connect to the first(s) one(s).
+     * 
+     * @param address the address we try to connect to
+     */
+    void onTcpConnect(InetSocketAddress address);
 
     /**
      * Notify the callback after a successful connect
      * 
+     * @param address the address we try to connect to
      * @param connection the connection
-     * @param address the connected addresses
      */
-    void onConnectionSuccess(Channel connection, InetAddress address);
-    
+    void onTcpConnectSuccess(InetSocketAddress remoteAddress, Channel connection);
+
     /**
      * Notify the callback after a failed connect.
-     * Might be called several times, or be followed by onConnectionSuccess
-     * when the name was resolved to multiple addresses.
      * 
-     * @param address the tentative addresses
+     * Might be called several times, or be followed by onTcpConnectSuccess when the name was resolved to multiple addresses.
+     * 
+     * @param address the address we try to connect to
+     * @param cause the cause of the failure
      */
-    void onConnectionFailure(InetAddress address);
+    void onTcpConnectFailure(InetSocketAddress remoteAddress, Throwable cause);
+
+    // ////////////// TLS ///////////////
+
+    /**
+     * Notify the callback before TLS handshake
+     */
+    void onTlsHandshake();
+
+    /**
+     * Notify the callback after the TLS was successful
+     */
+    void onTlsHandshakeSuccess();
+
+    /**
+     * Notify the callback after the TLS failed
+     * 
+     * @param cause the cause of the failure
+     */
+    void onTlsHandshakeFailure(Throwable cause);
+
+    // /////////// POOLING /////////////
 
     /**
      * Notify the callback when trying to fetch a connection from the pool.
      */
     void onConnectionPool();
 
     /**
-     * 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.
      * 
      * @param connection the connection
      */
@@ -77,10 +120,11 @@ public interface AsyncHandlerExtensions {
      */
     void onConnectionOffer(Channel connection);
 
+    // //////////// SENDING //////////////
+
     /**
-     * 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 channel. 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
      */
@@ -90,10 +134,4 @@ public interface AsyncHandlerExtensions {
      * Notify the callback every time a request is being retried.
      */
     void onRetry();
-
-    /**
-     * Notify the callback when the SSL handshake performed to establish an
-     * HTTPS connection has been completed.
-     */
-    void onSslHandshakeCompleted();
 }

client/src/main/java/org/asynchttpclient/channel/NameResolution.java renamed to client/src/main/java/org/asynchttpclient/handler/AsyncHandlerExtensionsUtils.java

@@ -10,23 +10,16 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.channel;
+package org.asynchttpclient.handler;
 
-import java.net.InetAddress;
+import org.asynchttpclient.AsyncHandler;
 
-public class NameResolution {
+public final class AsyncHandlerExtensionsUtils {
 
-    public static final long UNKNOWN_EXPIRATION = 0;
-    
-    public final InetAddress address;
-    public final long expiration;
-    
-    public NameResolution(InetAddress address) {
-        this(address, UNKNOWN_EXPIRATION);
-       }
-    
-    public NameResolution(InetAddress address, long expiration) {
-     this.address = address;
-     this.expiration = expiration;
+    public static AsyncHandlerExtensions toAsyncHandlerExtensions(AsyncHandler<?> asyncHandler) {
+        return asyncHandler instanceof AsyncHandlerExtensions ? (AsyncHandlerExtensions) asyncHandler : null;
+    }
+
+    private AsyncHandlerExtensionsUtils() {
     }
 }

client/src/main/java/org/asynchttpclient/handler/ExtendedAsyncHandler.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.handler;
+
+import io.netty.channel.Channel;
+
+import java.net.InetSocketAddress;
+import java.util.List;
+
+import org.asynchttpclient.AsyncHandler;
+import org.asynchttpclient.netty.request.NettyRequest;
+
+public abstract class ExtendedAsyncHandler<T> implements AsyncHandler<T>, AsyncHandlerExtensions {
+
+    @Override
+    public void onDnsResolution(String name) {
+    }
+
+    @Override
+    public void onDnsResolutionSuccess(String name, List<InetSocketAddress> addresses) {
+    }
+
+    @Override
+    public void onDnsResolutionFailure(String name, Throwable cause) {
+    }
+
+    @Override
+    public void onTcpConnect(InetSocketAddress address) {
+    }
+
+    @Override
+    public void onTcpConnectSuccess(InetSocketAddress remoteAddress, Channel connection) {
+    }
+
+    @Override
+    public void onTcpConnectFailure(InetSocketAddress remoteAddress, Throwable cause) {
+    }
+
+    @Override
+    public void onTlsHandshake() {
+    }
+
+    @Override
+    public void onTlsHandshakeSuccess() {
+    }
+
+    @Override
+    public void onTlsHandshakeFailure(Throwable cause) {
+    }
+
+    @Override
+    public void onConnectionPool() {
+    }
+
+    @Override
+    public void onConnectionPooled(Channel connection) {
+    }
+
+    @Override
+    public void onConnectionOffer(Channel connection) {
+    }
+
+    @Override
+    public void onRequestSend(NettyRequest request) {
+    }
+
+    @Override
+    public void onRetry() {
+    }
+}

client/src/main/java/org/asynchttpclient/handler/MaxRedirectException.java

@@ -1,18 +1,15 @@
 /*
- * Copyright 2010 Ning, Inc.
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
  *
- * Ning licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 package org.asynchttpclient.handler;
 

client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -14,6 +14,7 @@
 package org.asynchttpclient.netty;
 
 import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.MiscUtils.getCause;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.HttpHeaders;
 
@@ -212,8 +213,7 @@ public final void done() {
         } catch (ExecutionException t) {
             return;
         } catch (RuntimeException t) {
-            Throwable exception = t.getCause() != null ? t.getCause() : t;
-            exEx.compareAndSet(null, new ExecutionException(exception));
+            exEx.compareAndSet(null, new ExecutionException(getCause(t)));
 
         } finally {
             latch.countDown();
@@ -267,7 +267,7 @@ public void execute(Runnable command) {
 
         return completable;
     }
-    
+
     // INTERNAL
 
     public Uri getUri() {
@@ -296,7 +296,7 @@ public void cancelTimeouts() {
     public final Request getTargetRequest() {
         return targetRequest;
     }
-    
+
     public final Request getCurrentRequest() {
         return currentRequest;
     }
@@ -433,14 +433,13 @@ public void setCurrentRequest(Request currentRequest) {
     }
 
     /**
-     * Return true if the {@link Future} can be recovered. There is some scenario where a connection can be closed by an
-     * unexpected IOException, and in some situation we can recover from that exception.
+     * Return true if the {@link Future} can be recovered. There is some scenario where a connection can be closed by an unexpected IOException, and in some situation we can
+     * recover from that exception.
      * 
      * @return true if that {@link Future} cannot be recovered.
      */
     public boolean canBeReplayed() {
-        return !isDone() && canRetry()
-                && !(Channels.isChannelValid(channel) && !getUri().getScheme().equalsIgnoreCase("https")) && !inAuth.get() && !inProxyAuth.get();
+        return !isDone() && canRetry() && !(Channels.isChannelValid(channel) && !getUri().getScheme().equalsIgnoreCase("https")) && !inAuth.get() && !inProxyAuth.get();
     }
 
     public long getStart() {