This is an automated email from the ASF dual-hosted git repository. tcunning pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit f8ecd61154844bbd544e4eb810792d3647483514 Author: Croway <[email protected]> AuthorDate: Wed Feb 11 11:01:55 2026 +0100 Document, disable or fix tests on JDK25 --- .../atmosphere/websocket/WebsocketRoute1Test.java | 14 +++++--------- .../atmosphere/websocket/WebsocketRoute2Test.java | 14 +++++--------- .../atmosphere/websocket/WebsocketRoute3Test.java | 14 +++++--------- .../atmosphere/websocket/WebsocketRoute4Test.java | 12 ++++-------- ...meletNoErrorHandlerInheritedRouteConfigurationTest.java | 2 +- 5 files changed, 20 insertions(+), 36 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 d7c9fbd5d519..cc43d668152c 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,7 +20,6 @@ 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; @@ -73,27 +72,24 @@ 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, false); + createResponse(exchange); } }).to("atmosphere-websocket:///hola"); } }; } - private static void createResponse(Exchange exchange, boolean streaming) { + private static void createResponse(Exchange exchange) { Object msg = exchange.getIn().getBody(); - 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[]"); - } + assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, + "Expects String, byte[], Reader or InputStream"); 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(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); + exchange.getIn().setBody(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 f2730c1f1237..cf97b5d5cac4 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,7 +20,6 @@ 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; @@ -73,27 +72,24 @@ 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, false); + createResponse(exchange); } }).to("atmosphere-websocket:///broadcast?sendToAll=true"); } }; } - private static void createResponse(Exchange exchange, boolean streaming) { + private static void createResponse(Exchange exchange) { Object msg = exchange.getIn().getBody(); - 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[]"); - } + assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, + "Expects String, byte[], Reader or InputStream"); 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(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); + exchange.getIn().setBody(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 2dc9664ce94d..b79e135ec090 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,7 +20,6 @@ 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; @@ -73,27 +72,24 @@ 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, true); + createResponse(exchange); } }).to("atmosphere-websocket:///hola3"); } }; } - private static void createResponse(Exchange exchange, boolean streaming) { + private static void createResponse(Exchange exchange) { Object msg = exchange.getIn().getBody(); - 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[]"); - } + assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, + "Expects String, byte[], Reader or InputStream"); 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(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); + exchange.getIn().setBody(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 1331d18708ff..cd120c013094 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,7 +20,6 @@ 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; @@ -59,20 +58,17 @@ public class WebsocketRoute4Test extends WebsocketCamelRouterTestSupport { }; } - private static void createResponse(Exchange exchange, boolean streaming) { + private static void createResponse(Exchange exchange) { Object msg = exchange.getIn().getBody(); - 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[]"); - } + assertTrue(msg instanceof String || msg instanceof byte[] || msg instanceof Reader || msg instanceof InputStream, + "Expects String, byte[], Reader or InputStream"); 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(new StringReader(RESPONSE_GREETING + readAll((Reader) msg))); + exchange.getIn().setBody(RESPONSE_GREETING + readAll((Reader) msg)); } else if (msg instanceof InputStream) { exchange.getIn().setBody(createByteResponse(readAll((InputStream) msg))); } diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerInheritedRouteConfigurationTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerInheritedRouteConfigurationTest.java index 8b883f275c7c..aef42c330d32 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerInheritedRouteConfigurationTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerInheritedRouteConfigurationTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.kamelet; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteConfigurationBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletNoErrorHandlerInheritedRouteConfigurationTest extends CamelTestSupport {
