Initial Netty 4.1.0-RC1-SNAPSHOT import

Author: slandelle

client/pom.xml

@@ -28,7 +28,11 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
-			<version>4.0.33.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.asynchttpclient</groupId>
+			<artifactId>netty-resolver-dns</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.reactivestreams</groupId>

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

@@ -15,6 +15,7 @@
 
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.resolver.NameResolver;
 
 import java.io.File;
 import java.io.InputStream;
@@ -31,7 +32,6 @@
 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 {
@@ -60,7 +60,7 @@ public class DefaultRequest implements Request {
     private final long rangeOffset;
     private final Charset charset;
     private final ChannelPoolPartitioning channelPoolPartitioning;
-    private final NameResolver nameResolver;
+    private final NameResolver<InetAddress> nameResolver;
     // lazily loaded
     private List<Param> queryParams;
 
@@ -88,7 +88,7 @@ public DefaultRequest(String method,//
             long rangeOffset,//
             Charset charset,//
             ChannelPoolPartitioning channelPoolPartitioning,//
-            NameResolver nameResolver) {
+            NameResolver<InetAddress> nameResolver) {
         this.method = method;
         this.uri = uri;
         this.address = address;
@@ -242,7 +242,7 @@ public ChannelPoolPartitioning getChannelPoolPartitioning() {
     }
 
     @Override
-    public NameResolver getNameResolver() {
+    public NameResolver<InetAddress> getNameResolver() {
         return nameResolver;
     }
 

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

@@ -17,6 +17,7 @@
 package org.asynchttpclient;
 
 import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.resolver.NameResolver;
 
 import java.io.File;
 import java.io.InputStream;
@@ -30,7 +31,6 @@
 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;
 
 /**
@@ -204,5 +204,5 @@ public interface Request {
 
     ChannelPoolPartitioning getChannelPoolPartitioning();
 
-    NameResolver getNameResolver();
+    NameResolver<InetAddress> getNameResolver();
 }

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

@@ -19,6 +19,9 @@
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.resolver.DefaultNameResolver;
+import io.netty.resolver.NameResolver;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 
 import java.io.File;
 import java.io.InputStream;
@@ -37,8 +40,6 @@
 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;
@@ -51,6 +52,8 @@
  * @param <T> the builder type
  */
 public abstract class RequestBuilderBase<T extends RequestBuilderBase<T>> {
+    
+    public static NameResolver<InetAddress> DEFAULT_NAME_RESOLVER = new DefaultNameResolver(ImmediateEventExecutor.INSTANCE);
 
     private final static Logger LOGGER = LoggerFactory.getLogger(RequestBuilderBase.class);
 
@@ -86,7 +89,7 @@ public abstract class RequestBuilderBase<T extends RequestBuilderBase<T>> {
     protected long rangeOffset;
     protected Charset charset;
     protected ChannelPoolPartitioning channelPoolPartitioning = ChannelPoolPartitioning.PerHostChannelPoolPartitioning.INSTANCE;
-    protected NameResolver nameResolver = JdkNameResolver.INSTANCE;
+    protected NameResolver<InetAddress> nameResolver = DEFAULT_NAME_RESOLVER;
 
     protected RequestBuilderBase(String method, boolean disableUrlEncoding) {
         this(method, disableUrlEncoding, true);
@@ -426,7 +429,7 @@ public T setChannelPoolPartitioning(ChannelPoolPartitioning channelPoolPartition
         return asDerivedType();
     }
 
-    public T setNameResolver(NameResolver nameResolver) {
+    public T setNameResolver(NameResolver<InetAddress> nameResolver) {
         this.nameResolver = nameResolver;
         return asDerivedType();
     }

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -459,8 +459,8 @@ private void validateWebSocketRequest(Request request, AsyncHandler<?> asyncHand
         if (asyncHandler instanceof WebSocketUpgradeHandler) {
             if (!isWs)
                 throw new IllegalArgumentException("WebSocketUpgradeHandler but scheme isn't ws or wss: " + uri.getScheme());
-            else if (!request.getMethod().equals(GET))
-                throw new IllegalArgumentException("WebSocketUpgradeHandler but method isn't GET: " + request.getMethod());
+            else if (!request.getMethod().equals(GET) && !request.getMethod().equals(CONNECT))
+                throw new IllegalArgumentException("WebSocketUpgradeHandler but method isn't GET or CONNECT: " + request.getMethod());
         } else if (isWs) {
             throw new IllegalArgumentException("No WebSocketUpgradeHandler but scheme is " + uri.getScheme());
         }

client/src/main/java/org/asynchttpclient/resolver/JdkNameResolver.java

@@ -18,7 +18,9 @@
 import io.netty.util.concurrent.ImmediateEventExecutor;
 import io.netty.util.concurrent.Promise;
 
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,12 +38,11 @@ public enum RequestHostnameResolver {
     public Future<List<InetSocketAddress>> resolve(Request request, ProxyServer proxy, AsyncHandler<?> asyncHandler) {
 
         Uri uri = request.getUri();
+        final Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
 
         if (request.getAddress() != null) {
             List<InetSocketAddress> resolved = Collections.singletonList(new InetSocketAddress(request.getAddress(), uri.getExplicitPort()));
-            Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
             return promise.setSuccess(resolved);
-
         }
 
         // don't notify on explicit address
@@ -60,30 +61,31 @@ public Future<List<InetSocketAddress>> resolve(Request request, ProxyServer prox
         if (asyncHandlerExtensions != null)
             asyncHandlerExtensions.onHostnameResolutionAttempt(name);
 
-        final Future<List<InetSocketAddress>> whenResolved = request.getNameResolver().resolve(name, port);
+        final Future<List<InetAddress>> whenResolved = request.getNameResolver().resolveAll(name);
 
-        if (asyncHandlerExtensions == null)
-            return whenResolved;
+            whenResolved.addListener(new SimpleFutureListener<List<InetAddress>>() {
 
-        else {
-            Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
-            
-            whenResolved.addListener(new SimpleFutureListener<List<InetSocketAddress>>() {
-                
                 @Override
-                protected void onSuccess(List<InetSocketAddress> addresses) throws Exception {
-                    asyncHandlerExtensions.onHostnameResolutionSuccess(name, addresses);
-                    promise.setSuccess(addresses);
+                protected void onSuccess(List<InetAddress> value) throws Exception {
+                    ArrayList<InetSocketAddress> socketAddresses = new ArrayList<>(value.size());
+                    for (InetAddress a : value) {
+                        socketAddresses.add(new InetSocketAddress(a, port));
+                    }
+                    if (asyncHandlerExtensions != null) {
+                        asyncHandlerExtensions.onHostnameResolutionSuccess(name, socketAddresses);
+                    }
+                    promise.trySuccess(socketAddresses);
                 }
-                
+
                 @Override
                 protected void onFailure(Throwable t) throws Exception {
-                    asyncHandlerExtensions.onHostnameResolutionFailure(name, t);
-                    promise.setFailure(t);
+                    if (asyncHandlerExtensions != null) {
+                        asyncHandlerExtensions.onHostnameResolutionFailure(name, t);
+                    }
+                    promise.tryFailure(t);
                 }
             });
-            
+
             return promise;
-        }
     }
 }

client/src/main/java/org/asynchttpclient/resolver/NameResolver.java

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2014 The Netty Project
+  ~
+  ~ The Netty Project 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.asynchttpclient</groupId>
+    <artifactId>netty-bp</artifactId>
+    <version>2.0.0-RC7-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>netty-codec-dns</artifactId>
+
+  <name>Netty/Codec/DNS</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+  </dependencies>
+</project>
+