You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2026/05/04 12:16:27 UTC

(camel) branch main updated: CAMEL-23406: camel-yaml-dsl - Add back jacksonXml data format (#22915)

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 a9b2b2859de7 CAMEL-23406: camel-yaml-dsl - Add back jacksonXml data format (#22915)
a9b2b2859de7 is described below

commit a9b2b2859de7adf892816bc391c3e234ac75c813
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon May 4 14:16:11 2026 +0200

    CAMEL-23406: camel-yaml-dsl - Add back jacksonXml data format (#22915)
---
 .../deserializers/ModelDeserializersResolver.java    |  2 ++
 .../dsl/yaml/GenerateYamlDeserializersMojo.java      | 20 ++++----------------
 .../org/apache/camel/dsl/yaml/UnmarshalTest.groovy   | 12 ++++++++++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index 9828438e1aca..6a73d081af48 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -165,6 +165,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
             case "org.apache.camel.model.InterceptSendToEndpointDefinition": return new ModelDeserializers.InterceptSendToEndpointDefinitionDeserializer();
             case "iso8583": return new ModelDeserializers.Iso8583DataFormatDeserializer();
             case "org.apache.camel.model.dataformat.Iso8583DataFormat": return new ModelDeserializers.Iso8583DataFormatDeserializer();
+            case "jacksonXml": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
+            case "org.apache.camel.model.dataformat.JacksonXMLDataFormat": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
             case "java": return new ModelDeserializers.JavaExpressionDeserializer();
             case "org.apache.camel.model.language.JavaExpression": return new ModelDeserializers.JavaExpressionDeserializer();
             case "js": return new ModelDeserializers.JavaScriptExpressionDeserializer();
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index ad6e8b37511e..ff553ff4a0ae 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -344,25 +344,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
                     // add inner classes
                     deserializers.addType(holder.type);
 
-                    // Skip JacksonXMLDataFormat to avoid duplicate case with JacksonXML3DataFormat
-                    // The unified resolver will handle auto-detection between Jackson 2.x and 3.x
-                    boolean skipJacksonXML = "JacksonXMLDataFormatDeserializer".equals(holder.type.name);
-
                     if (holder.attributes.containsKey("node")) {
-                        holder.attributes.get("node").forEach(node -> {
-                            if (!skipJacksonXML || !"jacksonXml".equals(node)) {
-                                constructors.addStatement(
-                                        "case $S: return new ModelDeserializers.$L()", node, holder.type.name);
-                            }
-                        });
+                        holder.attributes.get("node").forEach(node -> constructors.addStatement(
+                                "case $S: return new ModelDeserializers.$L()", node, holder.type.name));
                     }
                     if (holder.attributes.containsKey("type")) {
-                        holder.attributes.get("type").forEach(type -> {
-                            if (!skipJacksonXML) {
-                                constructors.addStatement(
-                                        "case $S: return new ModelDeserializers.$L()", type, holder.type.name);
-                            }
-                        });
+                        holder.attributes.get("type").forEach(type -> constructors.addStatement(
+                                "case $S: return new ModelDeserializers.$L()", type, holder.type.name));
                     }
                 });
 
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalTest.groovy
index a8e38465eebf..631b38ea57fd 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalTest.groovy
@@ -69,11 +69,19 @@ class UnmarshalTest extends YamlTestSupport {
                              data-format-type:
                                json: {}
                           - to: "mock:result"
-                    ''')
+                    '''),
+                        asResource('data-format-xml', '''
+                    - from:
+                        uri: "direct:start"
+                        steps:    
+                          - unmarshal:
+                             jacksonXml: {}
+                          - to: "mock:result"
+                    '''),
             ]
 
             expected << [
-                'gson', 'gson', 'jackson', 'jackson'
+                'gson', 'gson', 'jackson', 'jackson', 'jacksonXml'
             ]
     }