CAMEL-10040 camel-ahc - Upgrade AHC client to 2.x - Aligned camel-web…

…socket too
apache · Jun 28, 2016 · 3b2b6e2 · 3b2b6e2
1 parent ade9b49
commit 3b2b6e2
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 71 deletions.
diff --git a/.../src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java b/.../src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.ahc.ws.springboot;
 
-
 import org.apache.camel.component.ahc.AhcBinding;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.util.jsse.SSLContextParameters;
@@ -43,7 +42,7 @@ public class WsComponentConfiguration {
     private AhcBinding binding;
     /**
      * To configure the AsyncHttpClient to use a custom
-     * org.asynchttpclient.AsyncHttpClientConfig instance.
+     * com.ning.http.client.AsyncHttpClientConfig instance.
      */
     private AsyncHttpClientConfig clientConfig;
     /**

diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
@@ -103,7 +103,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.ning</groupId>
+            <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
             <version>${ahc-version}</version>
           <scope>test</scope>

diff --git a/...ket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java b/...ket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
@@ -21,13 +21,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,7 +48,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/test").execute(
             new WebSocketUpgradeHandler.Builder()

diff --git a/...rc/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java b/...rc/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -21,13 +21,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,7 +48,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/echo").execute(
             new WebSocketUpgradeHandler.Builder()

diff --git a/...socket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/...socket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
@@ -16,14 +16,16 @@
  */
 package org.apache.camel.component.websocket;
 
-import com.ning.http.client.AsyncHttpClient;
+
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -40,7 +42,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
             new WebSocketUpgradeHandler.Builder()
@@ -72,7 +74,7 @@ public void onError(Throwable t) {
 
     @Test
     public void testWSBytesHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
             new WebSocketUpgradeHandler.Builder()

diff --git a/...src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/...src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -22,16 +22,17 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketByteListener;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.DefaultWebSocketListener;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -55,7 +56,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
             new WebSocketUpgradeHandler.Builder()
@@ -98,11 +99,11 @@ public void onError(Throwable t) {
 
     @Test
     public void testWSBytesHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
             new WebSocketUpgradeHandler.Builder()
-                .addWebSocketListener(new WebSocketByteListener() {
+                .addWebSocketListener(new DefaultWebSocketListener() {
 
                     @Override
                     public void onMessage(byte[] message) {

diff --git a/...src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/...src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
@@ -21,15 +21,16 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -75,7 +76,7 @@ public void testWSRemoveAddRoute() throws Exception {
     }
 
     private void doTestWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
             new WebSocketUpgradeHandler.Builder()

diff --git a/...bsocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java b/...bsocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
@@ -21,13 +21,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -46,7 +47,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testWSHttpCall() throws Exception {
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
             new WebSocketUpgradeHandler.Builder()

diff --git a/...t/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/...t/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -25,11 +25,10 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
+import javax.net.ssl.SSLContext;
-import com.ning.http.client.AsyncHttpClientConfig;
+
-import com.ning.http.client.ws.WebSocket;
+import io.netty.handler.ssl.ClientAuth;
-import com.ning.http.client.ws.WebSocketTextListener;
+import io.netty.handler.ssl.JdkSslContext;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
@@ -40,6 +39,13 @@
 import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.camel.util.jsse.SSLContextServerParameters;
 import org.apache.camel.util.jsse.TrustManagersParameters;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClientConfig;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -103,13 +109,15 @@ protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, General
         AsyncHttpClient c;
         AsyncHttpClientConfig config;
 
-        AsyncHttpClientConfig.Builder builder =
+        DefaultAsyncHttpClientConfig.Builder builder =
-                new AsyncHttpClientConfig.Builder();
+                new DefaultAsyncHttpClientConfig.Builder();
 
-        builder.setSSLContext(new SSLContextParameters().createSSLContext(context));
+        SSLContext sslContext = new SSLContextParameters().createSSLContext(context());
+        JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
+        builder.setSslContext(ssl);
         builder.setAcceptAnyCertificate(true);
         config = builder.build();
-        c = new AsyncHttpClient(config);
+        c = new DefaultAsyncHttpClient(config);
 
         return c;
     }

diff --git a/...cket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/...cket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
@@ -25,11 +25,11 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
+import javax.net.ssl.SSLContext;
-import com.ning.http.client.AsyncHttpClientConfig;
+
-import com.ning.http.client.ws.WebSocket;
+import io.netty.handler.ssl.ClientAuth;
-import com.ning.http.client.ws.WebSocketTextListener;
+import io.netty.handler.ssl.JdkSslContext;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -38,6 +38,13 @@
 import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.camel.util.jsse.SSLContextServerParameters;
 import org.apache.camel.util.jsse.TrustManagersParameters;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClientConfig;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -71,13 +78,15 @@ protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, General
         AsyncHttpClient c;
         AsyncHttpClientConfig config;
 
-        AsyncHttpClientConfig.Builder builder =
+        DefaultAsyncHttpClientConfig.Builder builder =
-                new AsyncHttpClientConfig.Builder();
+                new DefaultAsyncHttpClientConfig.Builder();
 
-        builder.setSSLContext(new SSLContextParameters().createSSLContext(context));
+        SSLContext sslContext = new SSLContextParameters().createSSLContext(context());
+        JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
+        builder.setSslContext(ssl);
         builder.setAcceptAnyCertificate(true);
         config = builder.build();
-        c = new AsyncHttpClient(config);
+        c = new DefaultAsyncHttpClient(config);
 
         return c;
     }

diff --git a/...ket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java b/...ket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
@@ -21,13 +21,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Test;
 
 public class WebsocketTwoRoutesExampleTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public void testWSHttpCallEcho() throws Exception {
         received.clear();
         latch = new CountDownLatch(1);
 
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute(
             new WebSocketUpgradeHandler.Builder()
@@ -88,7 +89,7 @@ public void onError(Throwable t) {
         received.clear();
         latch = new CountDownLatch(1);
 
-        c = new AsyncHttpClient();
+        c = new DefaultAsyncHttpClient();
 
         websocket = c.prepareGet("ws://localhost:" + port + "/pub").execute(
                 new WebSocketUpgradeHandler.Builder()

diff --git a/...l/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java b/...l/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
@@ -21,13 +21,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.junit.Test;
 
 public class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public void testWSHttpCallEcho() throws Exception {
         received.clear();
         latch = new CountDownLatch(2);
 
-        AsyncHttpClient c = new AsyncHttpClient();
+        AsyncHttpClient c = new DefaultAsyncHttpClient();
 
         WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute(
                 new WebSocketUpgradeHandler.Builder()