[
https://issues.apache.org/jira/browse/CAMEL-12247?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16357990#comment-16357990
]
ASF GitHub Bot commented on CAMEL-12247:
----------------------------------------
oscerd closed pull request #2214: [CAMEL-12247] camel-undertow not compatible
with ahc-version 2.3.0
URL: https://github.com/apache/camel/pull/2214
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java
index b2d5a89a7b5..7a235a1ac64 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java
@@ -28,8 +28,7 @@
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketByteListener;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,11 +68,11 @@ public void connect() throws InterruptedException,
ExecutionException, IOExcepti
}
public void sendTextMessage(String message) {
- websocket.sendMessage(message);
+ websocket.sendTextFrame(message);
}
public void sendBytesMessage(byte[] message) {
- websocket.sendMessage(message);
+ websocket.sendBinaryFrame(message);
}
public boolean await(int secs) throws InterruptedException {
@@ -116,11 +115,11 @@ public void reset(int count) {
}
public void close() throws IOException {
- websocket.close();
+ websocket.sendCloseFrame();
client.close();
}
- private class TestWebSocketListener implements WebSocketTextListener,
WebSocketByteListener {
+ private class TestWebSocketListener implements WebSocketListener {
@Override
public void onOpen(WebSocket websocket) {
@@ -128,8 +127,8 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
- LOG.info("[ws] closed");
+ public void onClose(WebSocket websocket, int code, String reason) {
+ LOG.info("[ws] closed, code " + code + " reason " + reason);
}
@Override
@@ -138,15 +137,14 @@ public void onError(Throwable t) {
}
@Override
- public void onMessage(byte[] message) {
+ public void onBinaryFrame(byte[] message, boolean finalFragment, int
rsv) {
received.add(message);
LOG.info("[ws] received bytes --> " + Arrays.toString(message));
latch.countDown();
}
-
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean finalFragment, int
rsv) {
received.add(message);
LOG.info("[ws] received --> " + message);
latch.countDown();
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
index b1df0a47d01..94a96d0a081 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
@@ -40,7 +40,7 @@
import org.apache.camel.converter.IOConverter;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.DefaultWebSocketListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Assert;
@@ -56,13 +56,21 @@ public void wsClientSingleText() throws Exception {
AsyncHttpClient c = new DefaultAsyncHttpClient();
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/app1")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
System.out.println("got message " + message);
}
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
+
@Override
public void onError(Throwable t) {
t.printStackTrace();
@@ -73,12 +81,12 @@ public void onError(Throwable t) {
MockEndpoint result = getMockEndpoint("mock:result1");
result.expectedBodiesReceived("Test");
- websocket.sendMessage("Test");
+ websocket.sendTextFrame("Test");
result.await(60, TimeUnit.SECONDS);
result.assertIsSatisfied();
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
@@ -87,13 +95,21 @@ public void wsClientSingleTextStreaming() throws Exception {
AsyncHttpClient c = new DefaultAsyncHttpClient();
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/app2")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
System.out.println("got message " + message);
}
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
+
@Override
public void onError(Throwable t) {
t.printStackTrace();
@@ -104,7 +120,7 @@ public void onError(Throwable t) {
MockEndpoint result = getMockEndpoint("mock:result2");
result.expectedMessageCount(1);
- websocket.sendMessage("Test");
+ websocket.sendTextFrame("Test");
result.await(60, TimeUnit.SECONDS);
List<Exchange> exchanges = result.getReceivedExchanges();
@@ -114,7 +130,7 @@ public void onError(Throwable t) {
Reader r = (Reader) body;
Assert.assertEquals("Test", IOConverter.toString(r));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
@@ -123,7 +139,15 @@ public void wsClientSingleBytes() throws Exception {
AsyncHttpClient c = new DefaultAsyncHttpClient();
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/app1")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
+
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
@Override
public void onError(Throwable t) {
@@ -131,7 +155,7 @@ public void onError(Throwable t) {
}
@Override
- public void onMessage(byte[] message) {
+ public void onBinaryFrame(byte[] message, boolean
finalFragment, int rsv) {
System.out.println("got byte[] message");
}
}).build()).get();
@@ -140,11 +164,11 @@ public void onMessage(byte[] message) {
final byte[] testmessage = "Test".getBytes("utf-8");
result.expectedBodiesReceived(testmessage);
- websocket.sendMessage(testmessage);
+ websocket.sendBinaryFrame(testmessage);
result.assertIsSatisfied();
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
@@ -153,13 +177,21 @@ public void wsClientSingleBytesStreaming() throws
Exception {
AsyncHttpClient c = new DefaultAsyncHttpClient();
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/app2")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(byte[] message) {
+ public void onBinaryFrame(byte[] message, boolean
finalFragment, int rsv) {
System.out.println("got message " + message);
}
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
+
@Override
public void onError(Throwable t) {
t.printStackTrace();
@@ -171,7 +203,7 @@ public void onError(Throwable t) {
result.expectedMessageCount(1);
final byte[] testmessage = "Test".getBytes("utf-8");
- websocket.sendMessage(testmessage);
+ websocket.sendBinaryFrame(testmessage);
result.await(60, TimeUnit.SECONDS);
List<Exchange> exchanges = result.getReceivedExchanges();
@@ -181,7 +213,7 @@ public void onError(Throwable t) {
InputStream in = (InputStream) body;
Assert.assertArrayEquals(testmessage, IOConverter.toBytes(in));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
@@ -190,13 +222,21 @@ public void wsClientMultipleText() throws Exception {
AsyncHttpClient c1 = new DefaultAsyncHttpClient();
WebSocket websocket1 = c1.prepareGet("ws://localhost:" + getPort() +
"/app1")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
System.out.println("got message " + message);
}
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
+
@Override
public void onError(Throwable t) {
t.printStackTrace();
@@ -206,13 +246,21 @@ public void onError(Throwable t) {
AsyncHttpClient c2 = new DefaultAsyncHttpClient();
WebSocket websocket2 = c2.prepareGet("ws://localhost:" + getPort() +
"/app1")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
DefaultWebSocketListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
System.out.println("got message " + message);
}
+ @Override
+ public void onOpen(WebSocket webSocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket webSocket, int code, String
reason) {
+ }
+
@Override
public void onError(Throwable t) {
t.printStackTrace();
@@ -223,8 +271,8 @@ public void onError(Throwable t) {
MockEndpoint result = getMockEndpoint("mock:result1");
result.expectedMessageCount(2);
- websocket1.sendMessage("Test1");
- websocket2.sendMessage("Test2");
+ websocket1.sendTextFrame("Test1");
+ websocket2.sendTextFrame("Test2");
result.await(60, TimeUnit.SECONDS);
result.assertIsSatisfied();
@@ -234,8 +282,8 @@ public void onError(Throwable t) {
actual.add(exchanges.get(1).getIn().getBody(String.class));
Assert.assertEquals(new HashSet<String>(Arrays.asList("Test1",
"Test2")), actual);
- websocket1.close();
- websocket2.close();
+ websocket1.sendCloseFrame();
+ websocket2.sendCloseFrame();
c1.close();
c2.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
index 3f45f827fc0..e625c9b2bbc 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
@@ -29,7 +29,7 @@
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Test;
@@ -69,9 +69,9 @@ private void doTestWSHttpCall() throws Exception {
AsyncHttpClient c = new DefaultAsyncHttpClient();
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/shop")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
WebSocketTextListener() {
- @Override
- public void onMessage(String message) {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
+ @Override
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -82,7 +82,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code, String
reason) {
}
@Override
@@ -101,7 +101,7 @@ public void onError(Throwable t) {
assertTrue(r instanceof String);
assertEquals("Beer on stock at Apache Mall", r);
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
index f089813f6ba..e33896191bc 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
@@ -4,6 +4,7 @@
* this work for additional information regarding copyright ownership.
* The ASF 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
@@ -30,7 +31,7 @@
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Test;
@@ -47,10 +48,10 @@ public void testWSHttpCall() throws Exception {
final List<Object> received = Collections.synchronizedList(new
ArrayList<Object>());
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/shop")
- .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new
WebSocketTextListener() {
+ .execute(new
WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -61,7 +62,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code, String
reason) {
}
@Override
@@ -80,7 +81,7 @@ public void onError(Throwable t) {
assertTrue(r instanceof String);
assertEquals("Beer on stock at Apache Mall", r);
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
index cf091c89dd3..475fbd341e0 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
@@ -26,7 +26,7 @@
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Test;
@@ -42,9 +42,9 @@ public void testWSHttpCallEcho() throws Exception {
final AsyncHttpClient c = new DefaultAsyncHttpClient();
final WebSocket websocket = c.prepareGet("ws://localhost:" +
getPort() + "/bar").execute(
new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketTextListener() {
+ .addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -55,7 +55,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code,
String reason) {
}
@Override
@@ -64,13 +64,13 @@ public void onError(Throwable t) {
}
}).build()).get();
- websocket.sendMessage("Beer");
+ websocket.sendTextFrame("Beer");
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertEquals(1, received.size());
assertEquals("The bar has Beer", received.get(0));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
@@ -82,9 +82,9 @@ public void onError(Throwable t) {
final AsyncHttpClient c = new DefaultAsyncHttpClient();
final WebSocket websocket = c.prepareGet("ws://localhost:" +
getPort() + "/pub").execute(
new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketTextListener() {
+ .addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message,
boolean finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -96,7 +96,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int
code, String reason) {
}
@Override
@@ -105,13 +105,13 @@ public void onError(Throwable t) {
}
}).build()).get();
- websocket.sendMessage("wine");
+ websocket.sendTextFrame("wine");
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertEquals(1, received.size());
assertEquals("The pub has wine", received.get(0));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
index 3b67a8a878e..0235ad2b69c 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
@@ -26,7 +26,7 @@
import org.apache.camel.component.undertow.UndertowConstants;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Test;
@@ -44,9 +44,9 @@ public void testWSHttpCallEcho() throws Exception {
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/bar").execute(
new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketTextListener() {
+ .addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -57,7 +57,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code,
String reason) {
}
@Override
@@ -66,7 +66,7 @@ public void onError(Throwable t) {
}
}).build()).get();
- websocket.sendMessage("Beer");
+ websocket.sendTextFrame("Beer");
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertEquals(2, received.size());
@@ -75,7 +75,7 @@ public void onError(Throwable t) {
assertTrue(received.contains("The bar has Beer"));
assertTrue(received.contains("Broadcasting to Bar"));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
index f6e1ed0a226..d1a3b29a3ae 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
@@ -25,7 +25,7 @@
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.Test;
@@ -43,9 +43,9 @@ public void testWSHttpCallEcho() throws Exception {
WebSocket websocket = c.prepareGet("ws://localhost:" + getPort() +
"/bar").execute(
new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketTextListener() {
+ .addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -56,7 +56,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code,
String reason) {
}
@Override
@@ -65,7 +65,7 @@ public void onError(Throwable t) {
}
}).build()).get();
- websocket.sendMessage("Beer");
+ websocket.sendTextFrame("Beer");
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertEquals(2, received.size());
@@ -74,7 +74,7 @@ public void onError(Throwable t) {
assertTrue(received.contains("The bar has Beer"));
assertTrue(received.contains("Broadcasting to Bar"));
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
index bd4152d6b15..413ae5ff631 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
@@ -44,7 +44,7 @@
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -105,7 +105,7 @@ protected AsyncHttpClient createAsyncHttpSSLClient() throws
IOException, General
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.build();
builder.setSslContext(sslContext);
- builder.setAcceptAnyCertificate(true);
+ builder.setUseInsecureTrustManager(true);
config = builder.build();
c = new DefaultAsyncHttpClient(config);
@@ -120,9 +120,9 @@ public void testWSHttpCall() throws Exception {
AsyncHttpClient c = createAsyncHttpSSLClient();
WebSocket websocket = c.prepareGet("wss://localhost:" + getPort() +
"/test").execute(
new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketTextListener() {
+ .addWebSocketListener(new WebSocketListener() {
@Override
- public void onMessage(String message) {
+ public void onTextFrame(String message, boolean
finalFragment, int rsv) {
received.add(message);
log.info("received --> " + message);
latch.countDown();
@@ -133,7 +133,7 @@ public void onOpen(WebSocket websocket) {
}
@Override
- public void onClose(WebSocket websocket) {
+ public void onClose(WebSocket websocket, int code,
String reason) {
}
@Override
@@ -144,7 +144,7 @@ public void onError(Throwable t) {
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS
client");
- websocket.sendMessage("Hello from WS client");
+ websocket.sendTextFrame("Hello from WS client");
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
@@ -154,7 +154,7 @@ public void onError(Throwable t) {
assertEquals(">> Welcome on board!", received.get(i));
}
- websocket.close();
+ websocket.sendCloseFrame();
c.close();
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> camel-undertow not compatible with ahc-version 2.3.0
> ----------------------------------------------------
>
> Key: CAMEL-12247
> URL: https://issues.apache.org/jira/browse/CAMEL-12247
> Project: Camel
> Issue Type: Bug
> Reporter: Tom Cunningham
> Assignee: Andrea Cosentino
> Priority: Major
>
> camel-undertow isn't compatible with the new ahc-version (2.3.0) configured
> here
> [https://github.com/apache/camel/commit/684ef5786838e051cece2f510d9dafabdc310d02]
> Getting a lot of compile errors trying to build it - multiple classes
> WebSocketByteListener, WebSocketTextListener have been removed, the
> WebSocketListener interface has different methods, etc
> [ERROR] Failed to execute goal
> org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
> (default-testCompile) on project camel-undertow: Compilation failure:
> Compilation failure:
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java:[31,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketByteListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java:[32,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java:[123,51]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: class TestClient
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/TestClient.java:[123,74]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketByteListener
> [ERROR] location: class TestClient
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java:[29,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java:[43,29]
> error: cannot find symbol
> [ERROR] symbol: class DefaultWebSocketListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java:[32,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java:[47,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java:[29,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java:[28,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR]
> /home/jenkins/camel/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java:[33,29]
> error: cannot find symbol
> [ERROR] symbol: class WebSocketTextListener
> [ERROR] location: package org.asynchttpclient.ws
> [ERROR] -> [Help 1]
> org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute
> goal org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
> (default-testCompile) on project camel-undertow: Compilation failure
> at
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
> at
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
> at
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
> at
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:116)
> at
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:80)
> at
> org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
> at
> org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:307)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:193)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:106)
> at org.apache.maven.cli.MavenCli.execute(MavenCli.java:863)
> at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:199)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:498)
> at
> org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
> at
> org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
> at
> org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
> at
> org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
> Caused by: org.apache.maven.plugin.compiler.CompilationFailureException:
> Compilation failure
> at
> org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:1029)
> at
> org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:170)
> at
> org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:134)
> at
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:207)
> ... 20 more
> [ERROR]
> [ERROR] Re-run Maven using the -X switch to enable full debug logging.
> [ERROR]
> [ERROR] For more information about the errors and possible solutions, please
> read the following articles:
> [ERROR] [Help 1]
> [http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException]
> [ERROR]
> [ERROR] After correcting the problems, you can resume the build with the
> command
> [ERROR] mvn <goals> -rf :camel-undertow
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
