This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3dd39bd3e7e8a39b6822238e598258cc391260d7 Author: Aurélien Pupier <[email protected]> AuthorDate: Fri Mar 6 14:55:40 2026 +0100 Revert atmosphere part of "Document, disable or fix tests on JDK25" This reverts commit f8ecd61154844bbd544e4eb810792d3647483514. New version of atmosphere is now working again with stream API with JDK 25 Note that the previous modifications were making the streaming atmosphere tests passing although it was checking for non streaming. Making it wrongly believe that the streaming feature was working Signed-off-by: Aurélien Pupier <[email protected]> --- .../atmosphere/websocket/WebsocketRoute1Test.java | 14 +++++++++----- .../atmosphere/websocket/WebsocketRoute2Test.java | 14 +++++++++----- .../atmosphere/websocket/WebsocketRoute3Test.java | 14 +++++++++----- .../atmosphere/websocket/WebsocketRoute4Test.java | 12 ++++++++---- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute1Test.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute1Test.java index cc43d668152c..d7c9fbd5d519 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute1Test.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute1Test.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.io.StringReader; import java.util.List; import org.apache.camel.Exchange; @@ -72,24 +73,27 @@ public class WebsocketRoute1Test extends WebsocketCamelRouterTestSupport { // route for a single line from("atmosphere-websocket:///hola").to("log:info").process(new Processor() { public void process(final Exchange exchange) { - createResponse(exchange); + createResponse(exchange, false); } }).to("atmosphere-websocket:///hola"); } }; } - private static void createResponse(Exchange exchange) { + private static void createResponse(Exchange exchange, boolean streaming) { Object msg = exchange.getIn().getBody(); - assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, - "Expects String, byte[], Reader or InputStream"); + if (streaming) { + assertTrue(msg instanceof Reader || msg instanceof InputStream, "Expects Reader or InputStream"); + } else { + assertTrue(msg instanceof String || msg instanceof byte[], "Expects String or byte[]"); + } if (msg instanceof String) { exchange.getIn().setBody(RESPONSE_GREETING + msg); } else if (msg instanceof byte[]) { exchange.getIn().setBody(createByteResponse((byte[]) msg)); } else if (msg instanceof Reader) { - exchange.getIn().setBody(RESPONSE_GREETING + readAll((Reader) msg)); + exchange.getIn().setBody(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); } else if (msg instanceof InputStream) { exchange.getIn().setBody(createByteResponse(readAll((InputStream) msg))); } diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute2Test.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute2Test.java index cf97b5d5cac4..f2730c1f1237 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute2Test.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute2Test.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.io.StringReader; import java.util.List; import org.apache.camel.Exchange; @@ -72,24 +73,27 @@ public class WebsocketRoute2Test extends WebsocketCamelRouterTestSupport { // route for a broadcast line from("atmosphere-websocket:///broadcast").to("log:info").process(new Processor() { public void process(final Exchange exchange) { - createResponse(exchange); + createResponse(exchange, false); } }).to("atmosphere-websocket:///broadcast?sendToAll=true"); } }; } - private static void createResponse(Exchange exchange) { + private static void createResponse(Exchange exchange, boolean streaming) { Object msg = exchange.getIn().getBody(); - assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, - "Expects String, byte[], Reader or InputStream"); + if (streaming) { + assertTrue(msg instanceof Reader || msg instanceof InputStream, "Expects Reader or InputStream"); + } else { + assertTrue(msg instanceof String || msg instanceof byte[], "Expects String or byte[]"); + } if (msg instanceof String) { exchange.getIn().setBody(RESPONSE_GREETING + msg); } else if (msg instanceof byte[]) { exchange.getIn().setBody(createByteResponse((byte[]) msg)); } else if (msg instanceof Reader) { - exchange.getIn().setBody(RESPONSE_GREETING + readAll((Reader) msg)); + exchange.getIn().setBody(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); } else if (msg instanceof InputStream) { exchange.getIn().setBody(createByteResponse(readAll((InputStream) msg))); } diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute3Test.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute3Test.java index b79e135ec090..2dc9664ce94d 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute3Test.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute3Test.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.io.StringReader; import java.util.List; import org.apache.camel.Exchange; @@ -72,24 +73,27 @@ public class WebsocketRoute3Test extends WebsocketCamelRouterTestSupport { // route for a single stream line from("atmosphere-websocket:///hola3?useStreaming=true").to("log:info").process(new Processor() { public void process(final Exchange exchange) { - createResponse(exchange); + createResponse(exchange, true); } }).to("atmosphere-websocket:///hola3"); } }; } - private static void createResponse(Exchange exchange) { + private static void createResponse(Exchange exchange, boolean streaming) { Object msg = exchange.getIn().getBody(); - assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, - "Expects String, byte[], Reader or InputStream"); + if (streaming) { + assertTrue(msg instanceof Reader || msg instanceof InputStream, "Expects Reader or InputStream"); + } else { + assertTrue(msg instanceof String || msg instanceof byte[], "Expects String or byte[]"); + } if (msg instanceof String) { exchange.getIn().setBody(RESPONSE_GREETING + msg); } else if (msg instanceof byte[]) { exchange.getIn().setBody(createByteResponse((byte[]) msg)); } else if (msg instanceof Reader) { - exchange.getIn().setBody(RESPONSE_GREETING + readAll((Reader) msg)); + exchange.getIn().setBody(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); } else if (msg instanceof InputStream) { exchange.getIn().setBody(createByteResponse(readAll((InputStream) msg))); } diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute4Test.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute4Test.java index cd120c013094..1331d18708ff 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute4Test.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRoute4Test.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.io.StringReader; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -58,17 +59,20 @@ public class WebsocketRoute4Test extends WebsocketCamelRouterTestSupport { }; } - private static void createResponse(Exchange exchange) { + private static void createResponse(Exchange exchange, boolean streaming) { Object msg = exchange.getIn().getBody(); - assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, - "Expects String, byte[], Reader or InputStream"); + if (streaming) { + assertTrue(msg instanceof Reader || msg instanceof InputStream, "Expects Reader or InputStream"); + } else { + assertTrue(msg instanceof String || msg instanceof byte[], "Expects String or byte[]"); + } if (msg instanceof String) { exchange.getIn().setBody(RESPONSE_GREETING + msg); } else if (msg instanceof byte[]) { exchange.getIn().setBody(createByteResponse((byte[]) msg)); } else if (msg instanceof Reader) { - exchange.getIn().setBody(RESPONSE_GREETING + readAll((Reader) msg)); + exchange.getIn().setBody(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); } else if (msg instanceof InputStream) { exchange.getIn().setBody(createByteResponse(readAll((InputStream) msg))); }
