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 05b50436a726 CAMEL-25262: camel-stax - fix xtokenize NPE when used
without properties (#27316)
05b50436a726 is described below
commit 05b50436a726339130745a830e8384af617f8fff
Author: Chakravarthy Batna
<[email protected]>
AuthorDate: Sun Oct 4 12:35:13 2026 +0530
CAMEL-25262: camel-stax - fix xtokenize NPE when used without properties
(#27316)
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
---
.../language/xtokenizer/XMLTokenizeLanguage.java | 2 +-
.../XMLTokenizeLanguageNoPropertiesTest.java | 77 ++++++++++++++++++++++
.../java/org/apache/camel/dsl/yaml/SplitTest.java | 28 ++++++++
3 files changed, 106 insertions(+), 1 deletion(-)
diff --git
a/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
index 7a4128191096..b8322dbcaf59 100644
---
a/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
+++
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
@@ -55,7 +55,7 @@ public class XMLTokenizeLanguage extends
SingleInputTypedLanguageSupport {
XMLTokenExpressionIterator xml = new
XMLTokenExpressionIterator(source, expression, mode);
xml.setGroup(property(int.class, properties, 3, 1));
- Object obj = properties[4];
+ Object obj = property(Object.class, properties, 4, null);
if (obj != null) {
Namespaces ns;
if (obj instanceof Namespaces namespaces) {
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageNoPropertiesTest.java
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageNoPropertiesTest.java
new file mode 100644
index 000000000000..5673c54adbc7
--- /dev/null
+++
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageNoPropertiesTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.language.xtokenizer;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.DefaultExchange;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The xtokenize language used without any options, as with the generic
language expression.
+ */
+public class XMLTokenizeLanguageNoPropertiesTest extends CamelTestSupport {
+
+ private static final String BODY
+ = "<?xml version='1.0' encoding='UTF-8'?><parent><child
id='a'>A</child><child id='b'>B</child></parent>";
+
+ @Test
+ public void testSplitWithLanguageExpression() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("<child id='a'>A</child>", "<child
id='b'>B</child>");
+
+ template.sendBody("direct:start", BODY);
+
+ MockEndpoint.assertIsSatisfied(context);
+ }
+
+ @Test
+ public void testCreateExpressionWithoutProperties() throws Exception {
+ Expression expression =
context.resolveLanguage("xtokenize").createExpression("//child");
+ expression.init(context);
+
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getMessage().setBody(BODY);
+
+ List<String> tokens = new ArrayList<>();
+ Iterator<?> it = expression.evaluate(exchange, Iterator.class);
+ while (it.hasNext()) {
+ tokens.add(context.getTypeConverter().convertTo(String.class,
it.next()));
+ }
+
+ assertThat(tokens).containsExactly("<child id='a'>A</child>", "<child
id='b'>B</child>");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start").split().language("xtokenize",
"//child").to("mock:result");
+ }
+ };
+ }
+}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/SplitTest.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/SplitTest.java
index ea4bf3025940..f257b384c38d 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/SplitTest.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/SplitTest.java
@@ -104,6 +104,34 @@ class SplitTest extends YamlTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+ @Test
+ void splitXtokenizeWithLanguage() throws Exception {
+ loadRoutes("""
+ - from:
+ uri: "direct:route"
+ steps:
+ - split:
+ language:
+ language: xtokenize
+ expression: /orders/order
+ steps:
+ - to: "mock:split"
+ - to: "mock:route"
+ """);
+
+ withMock("mock:split", mock -> {
+ mock.expectedMessageCount(3);
+ mock.expectedBodiesReceived(
+ "<order>Camel in Action</order>",
+ "<order>ActiveMQ in Action</order>",
+ "<order>DSL in Action</order>");
+ });
+
+ withTemplate(t ->
t.to("direct:route").withBody(createXmlBody()).send());
+
+ MockEndpoint.assertIsSatisfied(context);
+ }
+
private String createXmlBody() {
return "<?xml version=\"1.0\"?>\n"
+ "<orders>\n"
