Repository: camel Updated Branches: refs/heads/master f0484bf55 -> 3b2b6e20a
CAMEL-10040 camel-ahc - Upgrade AHC client to 2.x - Aligned camel-websocket too Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b2b6e20 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b2b6e20 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b2b6e20 Branch: refs/heads/master Commit: 3b2b6e20a9d89fe251aef69865e6c2d85ba8a0c4 Parents: ade9b49 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Jun 28 17:33:16 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Jun 28 19:22:26 2016 +0200 ---------------------------------------------------------------------- .../ws/springboot/WsComponentConfiguration.java | 3 +-- components/camel-websocket/pom.xml | 2 +- .../WebsocketClientCamelRouteTest.java | 11 ++++---- .../WebsocketComponentRouteExampleTest.java | 11 ++++---- .../websocket/WebsocketConsumerRouteTest.java | 14 +++++----- .../WebsocketProducerRouteExampleTest.java | 17 ++++++------ .../WebsocketProducerRouteRestartTest.java | 11 ++++---- .../websocket/WebsocketRouteExampleTest.java | 11 ++++---- ...ebsocketSSLContextInUriRouteExampleTest.java | 26 +++++++++++------- .../websocket/WebsocketSSLRouteExampleTest.java | 27 ++++++++++++------- .../WebsocketTwoRoutesExampleTest.java | 13 ++++----- ...dividualAndBroadcastEndpointExampleTest.java | 11 ++++---- ...ocketTwoRoutesToSameEndpointExampleTest.java | 10 +++---- .../src/test/resources/jsse/localhost.ks | Bin 1265 -> 2247 bytes 14 files changed, 96 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java index 503c374..7c57d08 100644 --- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java +++ b/components/camel-ahc-ws/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; /** http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 3ebd172..c79ac51 100644 --- 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> http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java index c98f893..d101fe7 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java @@ -21,13 +21,14 @@ import java.util.List; 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 class WebsocketClientCamelRouteTest extends CamelTestSupport { @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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java index 211856f..910c305 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java @@ -21,13 +21,14 @@ import java.util.List; 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 class WebsocketComponentRouteExampleTest extends CamelTestSupport { @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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java index 97ff276..eabf8ca 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java +++ b/components/camel-websocket/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 class WebsocketConsumerRouteTest extends CamelTestSupport { @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 class WebsocketConsumerRouteTest extends CamelTestSupport { @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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java index 513e71b..5f8026a 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java @@ -22,16 +22,17 @@ import java.util.List; 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 class WebsocketProducerRouteExampleTest extends CamelTestSupport { @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 class WebsocketProducerRouteExampleTest extends CamelTestSupport { @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) { http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java index e28ca29..24fc925 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java @@ -21,15 +21,16 @@ import java.util.List; 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 class WebsocketProducerRouteRestartTest extends CamelTestSupport { } 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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java index d4b655c..177b818 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java @@ -21,13 +21,14 @@ import java.util.List; 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 class WebsocketRouteExampleTest extends CamelTestSupport { @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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java index 9ed1fe4..7e87226 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java @@ -25,11 +25,10 @@ import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.ning.http.client.AsyncHttpClient; -import com.ning.http.client.AsyncHttpClientConfig; -import com.ning.http.client.ws.WebSocket; -import com.ning.http.client.ws.WebSocketTextListener; -import com.ning.http.client.ws.WebSocketUpgradeHandler; +import javax.net.ssl.SSLContext; + +import io.netty.handler.ssl.ClientAuth; +import io.netty.handler.ssl.JdkSslContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; @@ -40,6 +39,13 @@ import org.apache.camel.util.jsse.KeyStoreParameters; 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 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport { AsyncHttpClient c; AsyncHttpClientConfig config; - AsyncHttpClientConfig.Builder builder = - new AsyncHttpClientConfig.Builder(); + DefaultAsyncHttpClientConfig.Builder 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; } http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java index 5845914..768b448 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java @@ -25,11 +25,11 @@ import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.ning.http.client.AsyncHttpClient; -import com.ning.http.client.AsyncHttpClientConfig; -import com.ning.http.client.ws.WebSocket; -import com.ning.http.client.ws.WebSocketTextListener; -import com.ning.http.client.ws.WebSocketUpgradeHandler; +import javax.net.ssl.SSLContext; + +import io.netty.handler.ssl.ClientAuth; +import io.netty.handler.ssl.JdkSslContext; + 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.KeyStoreParameters; 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 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport { AsyncHttpClient c; AsyncHttpClientConfig config; - AsyncHttpClientConfig.Builder builder = - new AsyncHttpClientConfig.Builder(); + DefaultAsyncHttpClientConfig.Builder 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; } http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java index 9a8c0cd..fe01d21 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java @@ -21,13 +21,14 @@ import java.util.List; 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 class WebsocketTwoRoutesExampleTest extends CamelTestSupport { 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 class WebsocketTwoRoutesExampleTest extends CamelTestSupport { received.clear(); latch = new CountDownLatch(1); - c = new AsyncHttpClient(); + c = new DefaultAsyncHttpClient(); websocket = c.prepareGet("ws://localhost:" + port + "/pub").execute( new WebSocketUpgradeHandler.Builder() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java index 0b09f8a..9e4232e 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java @@ -21,13 +21,14 @@ import java.util.List; 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 class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest exte 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() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java index 677eb53..d486e53 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java @@ -21,13 +21,13 @@ import java.util.List; 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.DefaultAsyncHttpClient; +import org.asynchttpclient.ws.WebSocket; +import org.asynchttpclient.ws.WebSocketTextListener; +import org.asynchttpclient.ws.WebSocketUpgradeHandler; import org.junit.Test; public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSupport { @@ -49,7 +49,7 @@ public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSuppor received.clear(); latch = new CountDownLatch(2); - AsyncHttpClient c = new AsyncHttpClient(); + DefaultAsyncHttpClient c = new DefaultAsyncHttpClient(); WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute( new WebSocketUpgradeHandler.Builder() http://git-wip-us.apache.org/repos/asf/camel/blob/3b2b6e20/components/camel-websocket/src/test/resources/jsse/localhost.ks ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/resources/jsse/localhost.ks b/components/camel-websocket/src/test/resources/jsse/localhost.ks index f285418..34db928 100644 Binary files a/components/camel-websocket/src/test/resources/jsse/localhost.ks and b/components/camel-websocket/src/test/resources/jsse/localhost.ks differ
