Merge pull request AsyncHttpClient#1 from AsyncHttpClient/master

updating to latest

Author: maxpower-artvandelay

README.md

@@ -1,6 +1,8 @@
 Async Http Client
 -----------------
 
+[Javadoc](http://www.javadoc.io/doc/com.ning/async-http-client/)
+
 Getting started [HTML](https://asynchttpclient.github.io/async-http-client/), 
                 with [WebSockets](http://jfarcand.wordpress.com/2011/12/21/writing-websocket-clients-using-asynchttpclient/)
 
@@ -10,7 +12,7 @@ Async Http Client library purpose is to allow Java applications to easily execut
 <dependency>
   <groupId>com.ning</groupId>
   <artifactId>async-http-client</artifactId>
-  <version>1.9.11</version>
+  <version>1.9.15</version>
 </dependency>
 ```
 
@@ -20,7 +22,7 @@ You can also download the artifact
 
 [Maven Search](http://search.maven.org)
 
-Then in your code you can simply do [Javadoc](https://asynchttpclient.github.io/async-http-client/apidocs/reference/packages.html)
+Then in your code you can simply do
 
 ```java
 import com.ning.http.client.*;

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

@@ -72,9 +72,6 @@ public void onThrowable(Throwable t) {
 
     /**
      * Invoked once the HTTP response processing is finished.
-     * <p/>
-     * <p/>
-     * Gets always invoked as last callback method.
      *
      * @param response The {@link Response}
      * @return T Value that will be returned by the associated {@link java.util.concurrent.Future}

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

@@ -100,6 +100,8 @@ public class AsyncHttpClientConfig {
     protected int ioThreadMultiplier;
     protected String[] enabledProtocols;
     protected String[] enabledCipherSuites;
+    protected Integer sslSessionCacheSize;
+    protected Integer sslSessionTimeout;
     protected AsyncHttpProviderConfig<?, ?> providerConfig;
 
     // AHC 2 specific
@@ -139,6 +141,8 @@ private AsyncHttpClientConfig(int connectTimeout,//
             int ioThreadMultiplier, //
             String[] enabledProtocols,//
             String[] enabledCipherSuites,//
+            Integer sslSessionCacheSize,//
+            Integer sslSessionTimeout,//
             AsyncHttpProviderConfig<?, ?> providerConfig,//
             boolean spdyEnabled, //
             int spdyInitialWindowSize, //
@@ -173,6 +177,8 @@ private AsyncHttpClientConfig(int connectTimeout,//
         this.ioThreadMultiplier = ioThreadMultiplier;
         this.enabledProtocols = enabledProtocols;
         this.enabledCipherSuites = enabledCipherSuites;
+        this.sslSessionCacheSize = sslSessionCacheSize;
+        this.sslSessionTimeout = sslSessionTimeout;
         this.providerConfig = providerConfig;
         this.spdyEnabled = spdyEnabled;
         this.spdyInitialWindowSize = spdyInitialWindowSize;
@@ -505,6 +511,20 @@ public String[] getEnabledCipherSuites() {
         return enabledCipherSuites;
     }
 
+    /**
+     * since 1.9.13
+     */
+    public Integer getSslSessionCacheSize() {
+        return sslSessionCacheSize;
+    }
+
+    /**
+     * since 1.9.13
+     */
+    public Integer getSslSessionTimeout() {
+        return sslSessionTimeout;
+    }
+
     /**
      * Builder for an {@link AsyncHttpClient}
      */
@@ -540,6 +560,8 @@ public static class Builder {
         private int ioThreadMultiplier = defaultIoThreadMultiplier();
         private String[] enabledProtocols;
         private String[] enabledCipherSuites;
+        private Integer sslSessionCacheSize = defaultSslSessionCacheSize();
+        private Integer sslSessionTimeout = defaultSslSessionTimeout();
         private AsyncHttpProviderConfig<?, ?> providerConfig;
 
         // AHC 2
@@ -992,6 +1014,16 @@ public Builder setEnabledCipherSuites(String[] enabledCipherSuites) {
             return this;
         }
 
+        public Builder setSslSessionCacheSize(Integer sslSessionCacheSize) {
+            this.sslSessionCacheSize = sslSessionCacheSize;
+            return this;
+        }
+        
+        public Builder setSslSessionTimeout(Integer sslSessionTimeout) {
+            this.sslSessionTimeout = sslSessionTimeout;
+            return this;
+        }
+
         /**
          * Create a config builder with values taken from the given prototype configuration.
          *
@@ -1032,6 +1064,8 @@ public Builder(AsyncHttpClientConfig prototype) {
             acceptAnyCertificate = prototype.acceptAnyCertificate;
             enabledProtocols = prototype.enabledProtocols;
             enabledCipherSuites = prototype.enabledCipherSuites;
+            sslSessionCacheSize = prototype.sslSessionCacheSize;
+            sslSessionTimeout = prototype.sslSessionTimeout;
 
             spdyEnabled = prototype.isSpdyEnabled();
             spdyInitialWindowSize = prototype.getSpdyInitialWindowSize();
@@ -1083,6 +1117,8 @@ public AsyncHttpClientConfig build() {
                     ioThreadMultiplier, //
                     enabledProtocols, //
                     enabledCipherSuites, //
+                    sslSessionCacheSize, //
+                    sslSessionTimeout, //
                     providerConfig, //
                     spdyEnabled, //
                     spdyInitialWindowSize, //

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

@@ -64,6 +64,8 @@ void configureDefaults() {
         disableUrlEncodingForBoundRequests = defaultDisableUrlEncodingForBoundRequests();
         strict302Handling = defaultStrict302Handling();
         acceptAnyCertificate = defaultAcceptAnyCertificate();
+        sslSessionCacheSize = defaultSslSessionCacheSize();
+        sslSessionTimeout = defaultSslSessionTimeout();
 
         if (defaultUseProxySelector()) {
             proxyServerSelector = ProxyUtils.getJdkDefaultProxyServerSelector();
@@ -223,4 +225,14 @@ public AsyncHttpClientConfigBean setAcceptAnyCertificate(boolean acceptAnyCertif
         this.acceptAnyCertificate = acceptAnyCertificate;
         return this;
     }
+
+    public AsyncHttpClientConfigBean setSslSessionCacheSize(Integer sslSessionCacheSize) {
+        this.sslSessionCacheSize = sslSessionCacheSize;
+        return this;
+    }
+
+    public AsyncHttpClientConfigBean setSslSessionTimeout(Integer sslSessionTimeout) {
+        this.sslSessionTimeout = sslSessionTimeout;
+        return this;
+    }
 }

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

@@ -120,4 +120,12 @@ public static int defaultSpdyMaxConcurrentStreams() {
     public static boolean defaultAcceptAnyCertificate() {
         return AsyncPropertiesHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT + "acceptAnyCertificate");
     }
+
+    public static Integer defaultSslSessionCacheSize() {
+        return Integer.getInteger(ASYNC_CLIENT + "sslSessionCacheSize");
+    }
+
+    public static Integer defaultSslSessionTimeout() {
+        return Integer.getInteger(ASYNC_CLIENT + "sslSessionTimeout");
+    }
 }

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

@@ -44,10 +44,7 @@ public DefaultSSLEngineFactory(AsyncHttpClientConfig config) {
 
         @Override
         public SSLEngine newSSLEngine(String peerHost, int peerPort) throws GeneralSecurityException {
-            SSLContext sslContext = config.getSSLContext();
-
-            if (sslContext == null)
-                sslContext = SslUtils.getInstance().getSSLContext(config.isAcceptAnyCertificate());
+            SSLContext sslContext = SslUtils.getInstance().getSSLContext(config);
 
             SSLEngine sslEngine = sslContext.createSSLEngine(peerHost, peerPort);
             if (!config.isAcceptAnyCertificate()) {

api/src/main/java/org/asynchttpclient/util/SslUtils.java

@@ -15,15 +15,17 @@
  */
 package org.asynchttpclient.util;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.asynchttpclient.AsyncHttpClientConfig;
+
 /**
  * This class is a copy of http://github.com/sonatype/wagon-ning/raw/master/src/main/java/org/apache/maven/wagon/providers/http/SslUtils.java
  */
@@ -64,7 +66,16 @@ public static SslUtils getInstance() {
         return SingletonHolder.instance;
     }
 
-    public SSLContext getSSLContext(boolean acceptAnyCertificate) throws GeneralSecurityException {
-        return acceptAnyCertificate? looseTrustManagerSSLContext: SSLContext.getDefault();
+    public SSLContext getSSLContext(AsyncHttpClientConfig config) throws GeneralSecurityException {
+        SSLContext sslContext = config.getSSLContext();
+
+        if (sslContext == null) {
+            sslContext = config.isAcceptAnyCertificate() ? looseTrustManagerSSLContext : SSLContext.getDefault();
+            if (config.getSslSessionCacheSize() != null)
+                sslContext.getClientSessionContext().setSessionCacheSize(config.getSslSessionCacheSize());
+            if (config.getSslSessionTimeout() != null)
+                sslContext.getClientSessionContext().setSessionTimeout(config.getSslSessionTimeout());
+        }
+        return sslContext;
     }
 }

api/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java

@@ -91,11 +91,11 @@ public final WebSocket onCompleted() throws Exception {
             for (WebSocketListener listener : listeners) {
                 listener.onError(e);
             }
-            return null;
+            throw e;
         }
 
         if (webSocket == null) {
-            throw new IllegalStateException("WebSocket is null");
+            throw new NullPointerException("webSocket");
         }
         return webSocket;
     }

api/src/test/java/org/asynchttpclient/ws/CloseCodeReasonMessageTest.java

@@ -27,6 +27,7 @@
 import org.testng.annotations.Test;
 
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class CloseCodeReasonMessageTest extends AbstractBasicTest {
@@ -100,6 +101,34 @@ public void onError(Throwable t) {
         }
     }
 
+    @Test(timeOut = 60000, expectedExceptions = { ExecutionException.class })
+    public void getWebSocketThrowsException() throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        try (AsyncHttpClient client = getAsyncHttpClient(null)) {
+            client.prepareGet("http://apache.org").execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketTextListener() {
+
+                @Override
+                public void onMessage(String message) {
+                }
+
+                @Override
+                public void onOpen(WebSocket websocket) {
+                }
+
+                @Override
+                public void onClose(WebSocket websocket) {
+                }
+
+                @Override
+                public void onError(Throwable t) {
+                    latch.countDown();
+                }
+            }).build()).get();
+        }
+        
+        latch.await();
+    }
+
     @Test(timeOut = 60000)
     public void wrongStatusCode() throws Throwable {
         try (AsyncHttpClient c = getAsyncHttpClient(null)) {
@@ -125,7 +154,7 @@ public void onError(Throwable t) {
                     throwable.set(t);
                     latch.countDown();
                 }
-            }).build()).get();
+            }).build());
 
             latch.await();
             assertNotNull(throwable.get());
@@ -158,7 +187,7 @@ public void onError(Throwable t) {
                     throwable.set(t);
                     latch.countDown();
                 }
-            }).build()).get();
+            }).build());
 
             latch.await();
             assertNotNull(throwable.get());

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/channel/ChannelManager.java

@@ -397,7 +397,6 @@ private HttpClientCodec newHttpClientCodec() {
     public SslHandler createSslHandler(String peerHost, int peerPort) throws GeneralSecurityException, IOException {
         SSLEngine sslEngine = sslEngineFactory.newSSLEngine(peerHost, peerPort);
         SslHandler sslHandler = handshakeTimeout > 0 ? new SslHandler(sslEngine, getDefaultBufferPool(), false, nettyTimer, handshakeTimeout) : new SslHandler(sslEngine);
-        sslHandler.setIssueHandshake(true);
         sslHandler.setCloseOnSSLException(true);
         return sslHandler;
     }

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

@@ -25,6 +25,7 @@
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.handler.ssl.SslHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,10 +61,12 @@ private void abortChannelPreemption(String partition) {
             channelManager.abortChannelPreemption(partition);
     }
 
-    private void writeRequest(Channel channel, String partition) {
+    private void writeRequest(Channel channel) {
 
         LOGGER.debug("Request using non cached Channel '{}':\n{}\n", channel, future.getNettyRequest().getHttpRequest());
 
+        Channels.setAttribute(channel, future);
+        
         if (future.isDone()) {
             abortChannelPreemption(partition);
             return;
@@ -79,8 +82,23 @@ private void writeRequest(Channel channel, String partition) {
     }
 
     private void onFutureSuccess(final Channel channel) throws ConnectException {
-        Channels.setAttribute(channel, future);
-        writeRequest(channel, partition);
+        SslHandler sslHandler = channel.getPipeline().get(SslHandler.class);
+
+        if (sslHandler != null) {
+            sslHandler.handshake().addListener(new ChannelFutureListener() {
+                
+                @Override
+                public void operationComplete(ChannelFuture future) throws Exception {
+                    if (future.isSuccess())
+                        writeRequest(channel);
+                    else
+                        onFutureFailure(channel, future.getCause());
+                }
+            });
+        
+        } else {
+            writeRequest(channel);
+        }
     }
 
     private void onFutureFailure(Channel channel, Throwable cause) {

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/ChannelManager.java

@@ -260,10 +260,10 @@ protected String getTargetContentEncoding(String contentEncoding) throws Excepti
     public final void tryToOfferChannelToPool(Channel channel, boolean keepAlive, String partitionId) {
         if (channel.isActive() && keepAlive && channel.isActive()) {
             LOGGER.debug("Adding key: {} for channel {}", partitionId, channel);
+            Channels.setDiscard(channel);
             channelPool.offer(channel, partitionId);
             if (maxConnectionsPerHostEnabled)
                 channel2KeyPool.putIfAbsent(channel, partitionId);
-            Channels.setDiscard(channel);
         } else {
             // not offered
             closeChannel(channel);