This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 19f7841a531e CAMEL-24106: camel-xslt - source option silently ignored
when body is InputStream
19f7841a531e is described below
commit 19f7841a531ebbd5a202d2b74a8ee552fbebddb5
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jul 16 14:34:48 2026 +0200
CAMEL-24106: camel-xslt - source option silently ignored when body is
InputStream
XmlSourceHandlerFactoryImpl.getSource checked isInputStreamNeeded against
the message body before evaluating the configured source expression. When
the body was an InputStream or StreamCache, source=header/variable/property
silently transformed the body instead of the configured source.
Fix: evaluate the source expression first when configured, and only apply
the isInputStreamNeeded optimization when no source expression is present.
Aligns with JsonSourceHandlerFactoryImpl in camel-xj which already handles
this correctly.
Closes #24772
Co-Authored-By: Claude Opus 4.6 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---
.../saxon/XsltSaxonSourceInputStreamBodyTest.java | 148 +++++++++++++++++++++
.../xslt/XmlSourceHandlerFactoryImpl.java | 6 +-
2 files changed, 153 insertions(+), 1 deletion(-)
diff --git
a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonSourceInputStreamBodyTest.java
b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonSourceInputStreamBodyTest.java
new file mode 100644
index 000000000000..33b6c53eff84
--- /dev/null
+++
b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonSourceInputStreamBodyTest.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.xslt.saxon;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests that the XSLT source option is respected when the message body is an
InputStream or StreamCache, ensuring the
+ * configured source expression is evaluated instead of silently transforming
the body.
+ */
+public class XsltSaxonSourceInputStreamBodyTest extends CamelTestSupport {
+
+ private static final String HEADER_XML =
"<mail><subject>FromHeader</subject><body>header body</body></mail>";
+ private static final String BODY_XML =
"<mail><subject>FromBody</subject><body>message body</body></mail>";
+
+ @Test
+ public void testSourceHeaderWithInputStreamBody() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:sourceHeader");
+ mock.expectedMessageCount(1);
+
+ template.send("direct:sourceHeader", exchange -> {
+ exchange.getIn().setHeader("xmlSource", HEADER_XML);
+ exchange.getIn().setBody(new
ByteArrayInputStream(BODY_XML.getBytes(StandardCharsets.UTF_8)));
+ });
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ String xml =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertNotNull(xml, "The transformed XML should not be null");
+ assertTrue(xml.contains("<subject>FromHeader</subject>"), "Should
transform header source, not body. Got: " + xml);
+ }
+
+ @Test
+ public void testSourceVariableWithInputStreamBody() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:sourceVariable");
+ mock.expectedMessageCount(1);
+
+ template.send("direct:sourceVariable", exchange -> {
+ exchange.setVariable("xmlSource", HEADER_XML);
+ exchange.getIn().setBody(new
ByteArrayInputStream(BODY_XML.getBytes(StandardCharsets.UTF_8)));
+ });
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ String xml =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertNotNull(xml, "The transformed XML should not be null");
+ assertTrue(xml.contains("<subject>FromHeader</subject>"), "Should
transform variable source, not body. Got: " + xml);
+ }
+
+ @Test
+ public void testSourcePropertyWithInputStreamBody() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:sourceProperty");
+ mock.expectedMessageCount(1);
+
+ template.send("direct:sourceProperty", exchange -> {
+ exchange.setProperty("xmlSource", HEADER_XML);
+ exchange.getIn().setBody(new
ByteArrayInputStream(BODY_XML.getBytes(StandardCharsets.UTF_8)));
+ });
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ String xml =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertNotNull(xml, "The transformed XML should not be null");
+ assertTrue(xml.contains("<subject>FromHeader</subject>"), "Should
transform property source, not body. Got: " + xml);
+ }
+
+ @Test
+ public void testSourceHeaderWithStreamCacheBody() throws Exception {
+ context.setStreamCaching(true);
+
+ MockEndpoint mock = getMockEndpoint("mock:sourceHeader");
+ mock.expectedMessageCount(1);
+
+ template.send("direct:sourceHeader", exchange -> {
+ exchange.getIn().setHeader("xmlSource", HEADER_XML);
+ exchange.getIn().setBody(new
ByteArrayInputStream(BODY_XML.getBytes(StandardCharsets.UTF_8)));
+ });
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ String xml =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertNotNull(xml, "The transformed XML should not be null");
+ assertTrue(xml.contains("<subject>FromHeader</subject>"),
+ "Should transform header source, not stream-cached body. Got:
" + xml);
+ }
+
+ @Test
+ public void testSourceVariableWithStreamCacheBody() throws Exception {
+ context.setStreamCaching(true);
+
+ MockEndpoint mock = getMockEndpoint("mock:sourceVariable");
+ mock.expectedMessageCount(1);
+
+ template.send("direct:sourceVariable", exchange -> {
+ exchange.setVariable("xmlSource", HEADER_XML);
+ exchange.getIn().setBody(new
ByteArrayInputStream(BODY_XML.getBytes(StandardCharsets.UTF_8)));
+ });
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ String xml =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertNotNull(xml, "The transformed XML should not be null");
+ assertTrue(xml.contains("<subject>FromHeader</subject>"),
+ "Should transform variable source, not stream-cached body.
Got: " + xml);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:sourceHeader")
+
.to("xslt-saxon:xslt/transform.xsl?source=header:xmlSource")
+ .to("mock:sourceHeader");
+
+ from("direct:sourceVariable")
+
.to("xslt-saxon:classpath:xslt/transform.xsl?source=variable:xmlSource")
+ .to("mock:sourceVariable");
+
+ from("direct:sourceProperty")
+
.to("xslt-saxon:classpath:xslt/transform.xsl?source=property:xmlSource")
+ .to("mock:sourceProperty");
+ }
+ };
+ }
+}
diff --git
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XmlSourceHandlerFactoryImpl.java
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XmlSourceHandlerFactoryImpl.java
index 59c2ba73d742..6e254d57f25a 100644
---
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XmlSourceHandlerFactoryImpl.java
+++
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XmlSourceHandlerFactoryImpl.java
@@ -58,12 +58,16 @@ public class XmlSourceHandlerFactoryImpl implements
SourceHandlerFactory {
@Override
public Source getSource(Exchange exchange, Expression source) throws
Exception {
+ if (source != null) {
+ Object body = source.evaluate(exchange, Object.class);
+ return getSource(exchange, body);
+ }
// only convert to input stream if really needed
if (isInputStreamNeeded(exchange)) {
InputStream is = exchange.getIn().getBody(InputStream.class);
return getSource(exchange, is);
} else {
- Object body = source != null ? source.evaluate(exchange,
Object.class) : exchange.getMessage().getBody();
+ Object body = exchange.getMessage().getBody();
return getSource(exchange, body);
}
}
