Move setting a SSLEngineFactory into Netty specific conf as Grizzly doesn't use it

Author: Stephane Landelle

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

@@ -25,7 +25,6 @@
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -94,7 +93,6 @@ public class AsyncHttpClientConfig {
     protected ExecutorService applicationThreadPool;
     protected ProxyServerSelector proxyServerSelector;
     protected SSLContext sslContext;
-    protected SSLEngineFactory sslEngineFactory;
     protected AsyncHttpProviderConfig<?, ?> providerConfig;
     protected Realm realm;
     protected List<RequestFilter> requestFilters;
@@ -169,7 +167,6 @@ private AsyncHttpClientConfig(int maxTotalConnections, //
         this.userAgent = userAgent;
         this.allowPoolingConnection = keepAlive;
         this.sslContext = sslContext;
-        this.sslEngineFactory = sslEngineFactory;
         this.providerConfig = providerConfig;
         this.realm = realm;
         this.requestFilters = requestFilters;
@@ -332,28 +329,6 @@ public SSLContext getSSLContext() {
         return sslContext;
     }
 
-    /**
-     * Return an instance of {@link SSLEngineFactory} used for SSL connection.
-     *
-     * @return an instance of {@link SSLEngineFactory} used for SSL connection.
-     */
-    public SSLEngineFactory getSSLEngineFactory() {
-        if (sslEngineFactory == null) {
-            return new SSLEngineFactory() {
-                public SSLEngine newSSLEngine() {
-                    if (sslContext != null) {
-                        SSLEngine sslEngine = sslContext.createSSLEngine();
-                        sslEngine.setUseClientMode(true);
-                        return sslEngine;
-                    } else {
-                        return null;
-                    }
-                }
-            };
-        }
-        return sslEngineFactory;
-    }
-
     /**
      * Return the {@link AsyncHttpProviderConfig}
      *
@@ -1122,7 +1097,6 @@ public Builder(AsyncHttpClientConfig prototype) {
             realm = prototype.getRealm();
             requestTimeoutInMs = prototype.getRequestTimeoutInMs();
             sslContext = prototype.getSSLContext();
-            sslEngineFactory = prototype.getSSLEngineFactory();
             userAgent = prototype.getUserAgent();
             redirectEnabled = prototype.isRedirectEnabled();
             compressionEnabled = prototype.isCompressionEnabled();

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

@@ -175,11 +175,6 @@ public AsyncHttpClientConfigBean setSslContext(SSLContext sslContext) {
         return this;
     }
 
-    public AsyncHttpClientConfigBean setSslEngineFactory(SSLEngineFactory sslEngineFactory) {
-        this.sslEngineFactory = sslEngineFactory;
-        return this;
-    }
-
     public AsyncHttpClientConfigBean setProviderConfig(AsyncHttpProviderConfig<?, ?> providerConfig) {
         this.providerConfig = providerConfig;
         return this;

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

@@ -16,7 +16,6 @@
 package org.asynchttpclient.util;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
@@ -33,20 +32,7 @@ public static SslUtils getInstance() {
         return SingletonHolder.instance;
     }
 
-    public SSLEngine getSSLEngine() throws GeneralSecurityException, IOException {
-        SSLEngine engine = null;
-
-        SSLContext context = getSSLContext();
-        if (context != null) {
-            engine = context.createSSLEngine();
-            engine.setUseClientMode(true);
-        }
-
-        return engine;
-    }
-
     public SSLContext getSSLContext() throws GeneralSecurityException, IOException {
         return SSLContext.getDefault();
     }
-
 }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProviderConfig.java

@@ -17,6 +17,7 @@
 package org.asynchttpclient.providers.netty;
 
 import org.asynchttpclient.AsyncHttpProviderConfig;
+import org.asynchttpclient.SSLEngineFactory;
 import org.asynchttpclient.providers.netty.channel.ChannelPool;
 import org.asynchttpclient.providers.netty.response.EagerResponseBodyPart;
 import org.asynchttpclient.providers.netty.response.LazyResponseBodyPart;
@@ -93,6 +94,8 @@ public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<Str
 
     private long handshakeTimeoutInMillis;
 
+    private SSLEngineFactory sslEngineFactory;
+
     public NettyAsyncHttpProviderConfig() {
         properties.put(REUSE_ADDRESS, Boolean.FALSE);
     }
@@ -250,6 +253,14 @@ public long getHandshakeTimeoutInMillis() {
     public void setHandshakeTimeoutInMillis(long handshakeTimeoutInMillis) {
         this.handshakeTimeoutInMillis = handshakeTimeoutInMillis;
     }
+    
+    public SSLEngineFactory getSslEngineFactory() {
+        return sslEngineFactory;
+    }
+
+    public void setSslEngineFactory(SSLEngineFactory sslEngineFactory) {
+        this.sslEngineFactory = sslEngineFactory;
+    }
 
     public static interface AdditionalChannelInitializer {
 

providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/Channels.java

@@ -58,6 +58,7 @@
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
 import java.io.IOException;
@@ -202,11 +203,20 @@ private Timer newNettyTimer() {
     }
 
     private SSLEngine createSSLEngine() throws IOException, GeneralSecurityException {
-        SSLEngine sslEngine = config.getSSLEngineFactory().newSSLEngine();
-        if (sslEngine == null) {
-            sslEngine = SslUtils.getInstance().getSSLEngine();
+        
+        if (nettyProviderConfig.getSslEngineFactory() != null) {
+            return nettyProviderConfig.getSslEngineFactory().newSSLEngine();
+        
+        } else {
+            SSLContext sslContext = config.getSSLContext();
+            if (sslContext == null) {
+                sslContext = SslUtils.getInstance().getSSLContext();
+            }
+            
+            SSLEngine sslEngine = sslContext.createSSLEngine();
+            sslEngine.setUseClientMode(true);
+            return sslEngine;
         }
-        return sslEngine;
     }
 
     public void configureProcessor(NettyRequestSender requestSender, AtomicBoolean closed) {