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 2022/01/16 14:12:36 UTC

[camel] 25/49: CAMEL-17499: soapjaxb dataformat renamed

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch dataformat-rename
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 484764acd2661072538e0850c1373156733ceba0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 16 13:27:28 2022 +0100

    CAMEL-17499: soapjaxb dataformat renamed
---
 .../apache/camel/catalog/dataformats.properties    |  2 +-
 .../dataformats/{soapjaxb.json => soap.json}       | 10 +--
 .../org/apache/camel/catalog/models.properties     |  2 +-
 .../apache/camel/catalog/models/dataFormats.json   |  2 +-
 .../org/apache/camel/catalog/models/marshal.json   |  2 +-
 .../catalog/models/{soapjaxb.json => soap.json}    |  6 +-
 .../org/apache/camel/catalog/models/unmarshal.json |  2 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 12 ++--
 .../org/apache/camel/main/dataformats.properties   |  2 +-
 .../modules/dataformats/examples/json/soap.json    |  1 +
 .../dataformats/examples/json/soapjaxb.json        |  1 -
 docs/components/modules/dataformats/nav.adoc       |  2 +-
 .../modules/dataformats/pages/soap-dataformat.adoc |  1 +
 .../dataformats/pages/soapjaxb-dataformat.adoc     |  1 -
 .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc    |  1 +
 .../dsl/yaml/deserializers/ModelDeserializers.java | 75 +++++++++++-----------
 .../deserializers/ModelDeserializersResolver.java  |  7 +-
 .../src/generated/resources/camel-yaml-dsl.json    | 30 ++++-----
 18 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
index 568617f..e873103 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
@@ -34,7 +34,7 @@ protobuf
 protobuf-jackson
 rss
 secureXML
-soapjaxb
+soap
 syslog
 tarfile
 thrift
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soapjaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
similarity index 88%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soapjaxb.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
index 2c4d438..17d7ca1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soapjaxb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
@@ -1,25 +1,25 @@
 {
   "dataformat": {
     "kind": "dataformat",
-    "name": "soapjaxb",
+    "name": "soap",
     "title": "SOAP",
     "description": "Marshal Java objects to SOAP messages and back.",
     "deprecated": false,
     "firstVersion": "2.3.0",
     "label": "dataformat,transformation,xml",
-    "javaType": "org.apache.camel.dataformat.soap.SoapJaxbDataFormat",
+    "javaType": "org.apache.camel.dataformat.soap.SoapDataFormat",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-soap",
     "version": "3.15.0-SNAPSHOT",
-    "modelName": "soapjaxb",
-    "modelJavaType": "org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+    "modelName": "soap",
+    "modelJavaType": "org.apache.camel.model.dataformat.SoapDataFormat"
   },
   "properties": {
     "contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." },
     "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" },
     "elementNameStrategyRef": { "kind": "attribute", "displayName": "Element Name Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an element strategy to lookup from the registry. An element name strategy is used for two purposes. The first is to find a xml element name for a given object and soap action when marshaling the object into a SOAP message. The second is to fi [...]
-    "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
+    "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "1.1", "1.2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
     "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
     "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index afab392..4ad8fcc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -177,7 +177,7 @@ setExchangePattern
 setHeader
 setProperty
 simple
-soapjaxb
+soap
 sort
 spel
 split
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json
index 5a6bbbe..ba9cc00 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json
@@ -12,6 +12,6 @@
     "output": false
   },
   "properties": {
-    "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog",  [...]
+    "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tar [...]
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
index 99bb71e..019ec36 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
+    "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tarfile", " [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
     "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
   }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soapjaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json
similarity index 90%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soapjaxb.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json
index 4201c73..497e203 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soapjaxb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json
@@ -1,13 +1,13 @@
 {
   "model": {
     "kind": "model",
-    "name": "soapjaxb",
+    "name": "soap",
     "title": "SOAP",
     "description": "Marshal Java objects to SOAP messages and back.",
     "deprecated": false,
     "firstVersion": "2.3.0",
     "label": "dataformat,transformation,xml",
-    "javaType": "org.apache.camel.model.dataformat.SoapJaxbDataFormat",
+    "javaType": "org.apache.camel.model.dataformat.SoapDataFormat",
     "abstract": false,
     "input": false,
     "output": false
@@ -16,7 +16,7 @@
     "contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." },
     "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" },
     "elementNameStrategyRef": { "kind": "attribute", "displayName": "Element Name Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an element strategy to lookup from the registry. An element name strategy is used for two purposes. The first is to find a xml element name for a given object and soap action when marshaling the object into a SOAP message. The second is to fi [...]
-    "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
+    "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "1.1", "1.2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
     "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
     "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
index 047fb23..ac6896e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
+    "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tarfile", " [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
     "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
   }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 975d476..8ced00b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -1503,7 +1503,7 @@ Evaluates a Camel simple expression.
     </xs:annotation>
   </xs:element>
 
-  <xs:element name="soapjaxb" type="tns:soapJaxbDataFormat">
+  <xs:element name="soap" type="tns:soapDataFormat">
     <xs:annotation>
       <xs:documentation xml:lang="en"><![CDATA[
 Marshal Java objects to SOAP messages and back.
@@ -5897,7 +5897,7 @@ it reaches the end when Camel is shut down. Default value: false
             <xs:element ref="tns:protobuf"/>
             <xs:element ref="tns:rss"/>
             <xs:element ref="tns:secureXML"/>
-            <xs:element ref="tns:soapjaxb"/>
+            <xs:element ref="tns:soap"/>
             <xs:element ref="tns:syslog"/>
             <xs:element ref="tns:tarfile"/>
             <xs:element ref="tns:thrift"/>
@@ -7996,7 +7996,7 @@ the EncryptedKey structure or not. Default value: true
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="soapJaxbDataFormat">
+  <xs:complexType name="soapDataFormat">
     <xs:complexContent>
       <xs:extension base="tns:dataFormat">
         <xs:sequence/>
@@ -12214,7 +12214,7 @@ Sets a reference to use for lookup the policy in the registry.
             <xs:element ref="tns:protobuf"/>
             <xs:element ref="tns:rss"/>
             <xs:element ref="tns:secureXML"/>
-            <xs:element ref="tns:soapjaxb"/>
+            <xs:element ref="tns:soap"/>
             <xs:element ref="tns:syslog"/>
             <xs:element ref="tns:tarfile"/>
             <xs:element ref="tns:thrift"/>
@@ -13194,7 +13194,7 @@ Set a reference to a custom Expression to use.
         <xs:element ref="tns:protobuf"/>
         <xs:element ref="tns:rss"/>
         <xs:element ref="tns:secureXML"/>
-        <xs:element ref="tns:soapjaxb"/>
+        <xs:element ref="tns:soap"/>
         <xs:element ref="tns:syslog"/>
         <xs:element ref="tns:tarfile"/>
         <xs:element ref="tns:thrift"/>
@@ -14805,7 +14805,7 @@ OpenId Connect URL to discover OAuth2 configuration values.
             <xs:element ref="tns:protobuf"/>
             <xs:element ref="tns:rss"/>
             <xs:element ref="tns:secureXML"/>
-            <xs:element ref="tns:soapjaxb"/>
+            <xs:element ref="tns:soap"/>
             <xs:element ref="tns:syslog"/>
             <xs:element ref="tns:tarfile"/>
             <xs:element ref="tns:thrift"/>
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
index 568617f..e873103 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
@@ -34,7 +34,7 @@ protobuf
 protobuf-jackson
 rss
 secureXML
-soapjaxb
+soap
 syslog
 tarfile
 thrift
diff --git a/docs/components/modules/dataformats/examples/json/soap.json b/docs/components/modules/dataformats/examples/json/soap.json
new file mode 120000
index 0000000..f2a6d5a
--- /dev/null
+++ b/docs/components/modules/dataformats/examples/json/soap.json
@@ -0,0 +1 @@
+../../../../../../components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soap.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/soapjaxb.json b/docs/components/modules/dataformats/examples/json/soapjaxb.json
deleted file mode 120000
index 27a83f0..0000000
--- a/docs/components/modules/dataformats/examples/json/soapjaxb.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soapjaxb.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc
index 7e5000e..2fc1203 100644
--- a/docs/components/modules/dataformats/nav.adoc
+++ b/docs/components/modules/dataformats/nav.adoc
@@ -35,7 +35,7 @@
 ** xref:protobuf-dataformat.adoc[Protobuf]
 ** xref:protobuf-jackson-dataformat.adoc[Protobuf Jackson]
 ** xref:rss-dataformat.adoc[RSS]
-** xref:soapjaxb-dataformat.adoc[SOAP]
+** xref:soap-dataformat.adoc[SOAP]
 ** xref:syslog-dataformat.adoc[Syslog]
 ** xref:tarfile-dataformat.adoc[Tar File]
 ** xref:thrift-dataformat.adoc[Thrift]
diff --git a/docs/components/modules/dataformats/pages/soap-dataformat.adoc b/docs/components/modules/dataformats/pages/soap-dataformat.adoc
new file mode 120000
index 0000000..33632d0
--- /dev/null
+++ b/docs/components/modules/dataformats/pages/soap-dataformat.adoc
@@ -0,0 +1 @@
+../../../../../components/camel-soap/src/main/docs/soap-dataformat.adoc
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/pages/soapjaxb-dataformat.adoc b/docs/components/modules/dataformats/pages/soapjaxb-dataformat.adoc
deleted file mode 120000
index 55016d1..0000000
--- a/docs/components/modules/dataformats/pages/soapjaxb-dataformat.adoc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index ac74a69..528aa45 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -50,6 +50,7 @@ The data formats naming has been made consistent to use Camel Case:
 | zip-deflater | zipDeflater
 | jacksonxml | jacksonXml
 | mime-multipart | mimeMultipart
+| soapjaxb | soap
 | univociy-csv | univociyCsv
 | univociy-fixed | univociyFixed
 | univociy-tsv | univociyTsv
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 9414020..44d7207 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -154,7 +154,7 @@ import org.apache.camel.model.dataformat.MimeMultipartDataFormat;
 import org.apache.camel.model.dataformat.PGPDataFormat;
 import org.apache.camel.model.dataformat.ProtobufDataFormat;
 import org.apache.camel.model.dataformat.RssDataFormat;
-import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
+import org.apache.camel.model.dataformat.SoapDataFormat;
 import org.apache.camel.model.dataformat.SyslogDataFormat;
 import org.apache.camel.model.dataformat.TarFileDataFormat;
 import org.apache.camel.model.dataformat.ThriftDataFormat;
@@ -2831,10 +2831,10 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat"),
                     @YamlProperty(name = "from-type", type = "string"),
                     @YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat"),
-                    @YamlProperty(name = "gzip-deflator", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
+                    @YamlProperty(name = "gzip-deflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
                     @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
                     @YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
-                    @YamlProperty(name = "jacksonxml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
+                    @YamlProperty(name = "jackson-xml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
                     @YamlProperty(name = "jaxb", type = "object:org.apache.camel.model.dataformat.JaxbDataFormat"),
                     @YamlProperty(name = "json", type = "object:org.apache.camel.model.dataformat.JsonDataFormat"),
                     @YamlProperty(name = "json-api", type = "object:org.apache.camel.model.dataformat.JsonApiDataFormat"),
@@ -2846,7 +2846,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "rss", type = "object:org.apache.camel.model.dataformat.RssDataFormat"),
                     @YamlProperty(name = "scheme", type = "string"),
                     @YamlProperty(name = "secure-xml", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"),
-                    @YamlProperty(name = "soapjaxb", type = "object:org.apache.camel.model.dataformat.SoapJaxbDataFormat"),
+                    @YamlProperty(name = "soap", type = "object:org.apache.camel.model.dataformat.SoapDataFormat"),
                     @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat"),
                     @YamlProperty(name = "tarfile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat"),
                     @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat"),
@@ -2858,7 +2858,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "xmlrpc", type = "object:org.apache.camel.model.dataformat.XmlRpcDataFormat"),
                     @YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"),
                     @YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"),
-                    @YamlProperty(name = "zip", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
+                    @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
                     @YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
             }
     )
@@ -2956,7 +2956,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "gzip-deflator": {
+                case "gzip-deflater": {
                     org.apache.camel.model.dataformat.GzipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.GzipDeflaterDataFormat.class);
                     target.setDataFormatType(val);
                     break;
@@ -2971,7 +2971,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "jacksonxml": {
+                case "jackson-xml": {
                     org.apache.camel.model.dataformat.JacksonXMLDataFormat val = asType(node, org.apache.camel.model.dataformat.JacksonXMLDataFormat.class);
                     target.setDataFormatType(val);
                     break;
@@ -3016,8 +3016,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "soapjaxb": {
-                    org.apache.camel.model.dataformat.SoapJaxbDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapJaxbDataFormat.class);
+                case "soap": {
+                    org.apache.camel.model.dataformat.SoapDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapDataFormat.class);
                     target.setDataFormatType(val);
                     break;
                 }
@@ -3076,7 +3076,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "zip": {
+                case "zip-deflater": {
                     org.apache.camel.model.dataformat.ZipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipDeflaterDataFormat.class);
                     target.setDataFormatType(val);
                     break;
@@ -3140,7 +3140,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "gzip-deflator", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
                     @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
                     @YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
-                    @YamlProperty(name = "jacksonxml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
+                    @YamlProperty(name = "jackson-xml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
                     @YamlProperty(name = "jaxb", type = "object:org.apache.camel.model.dataformat.JaxbDataFormat"),
                     @YamlProperty(name = "json", type = "object:org.apache.camel.model.dataformat.JsonDataFormat"),
                     @YamlProperty(name = "json-api", type = "object:org.apache.camel.model.dataformat.JsonApiDataFormat"),
@@ -3150,7 +3150,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "protobuf", type = "object:org.apache.camel.model.dataformat.ProtobufDataFormat"),
                     @YamlProperty(name = "rss", type = "object:org.apache.camel.model.dataformat.RssDataFormat"),
                     @YamlProperty(name = "secure-xml", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"),
-                    @YamlProperty(name = "soapjaxb", type = "object:org.apache.camel.model.dataformat.SoapJaxbDataFormat"),
+                    @YamlProperty(name = "soap", type = "object:org.apache.camel.model.dataformat.SoapDataFormat"),
                     @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat"),
                     @YamlProperty(name = "tarfile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat"),
                     @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat"),
@@ -3364,7 +3364,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormats(existing);
                     break;
                 }
-                case "jacksonxml": {
+                case "jackson-xml": {
                     org.apache.camel.model.dataformat.JacksonXMLDataFormat val = asType(node, org.apache.camel.model.dataformat.JacksonXMLDataFormat.class);
                     java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats();
                     if (existing == null) {
@@ -3454,8 +3454,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormats(existing);
                     break;
                 }
-                case "soapjaxb": {
-                    org.apache.camel.model.dataformat.SoapJaxbDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapJaxbDataFormat.class);
+                case "soap": {
+                    org.apache.camel.model.dataformat.SoapDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapDataFormat.class);
                     java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats();
                     if (existing == null) {
                         existing = new java.util.ArrayList<>();
@@ -6872,7 +6872,10 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
     @YamlType(
             types = org.apache.camel.model.dataformat.JacksonXMLDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
-            nodes = "jacksonxml",
+            nodes = {
+                    "jackson-xml",
+                    "jacksonXml"
+            },
             properties = {
                     @YamlProperty(name = "allow-jms-type", type = "boolean"),
                     @YamlProperty(name = "allow-unmarshall-type", type = "boolean"),
@@ -8130,7 +8133,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
                     @YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
                     @YamlProperty(name = "inherit-error-handler", type = "boolean"),
-                    @YamlProperty(name = "jacksonxml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
+                    @YamlProperty(name = "jackson-xml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
                     @YamlProperty(name = "jaxb", type = "object:org.apache.camel.model.dataformat.JaxbDataFormat"),
                     @YamlProperty(name = "json", type = "object:org.apache.camel.model.dataformat.JsonDataFormat"),
                     @YamlProperty(name = "json-api", type = "object:org.apache.camel.model.dataformat.JsonApiDataFormat"),
@@ -8140,7 +8143,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "protobuf", type = "object:org.apache.camel.model.dataformat.ProtobufDataFormat"),
                     @YamlProperty(name = "rss", type = "object:org.apache.camel.model.dataformat.RssDataFormat"),
                     @YamlProperty(name = "secure-xml", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"),
-                    @YamlProperty(name = "soapjaxb", type = "object:org.apache.camel.model.dataformat.SoapJaxbDataFormat"),
+                    @YamlProperty(name = "soap", type = "object:org.apache.camel.model.dataformat.SoapDataFormat"),
                     @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat"),
                     @YamlProperty(name = "tarfile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat"),
                     @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat"),
@@ -8264,7 +8267,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "jacksonxml": {
+                case "jackson-xml": {
                     org.apache.camel.model.dataformat.JacksonXMLDataFormat val = asType(node, org.apache.camel.model.dataformat.JacksonXMLDataFormat.class);
                     target.setDataFormatType(val);
                     break;
@@ -8309,8 +8312,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "soapjaxb": {
-                    org.apache.camel.model.dataformat.SoapJaxbDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapJaxbDataFormat.class);
+                case "soap": {
+                    org.apache.camel.model.dataformat.SoapDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapDataFormat.class);
                     target.setDataFormatType(val);
                     break;
                 }
@@ -14645,9 +14648,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             inline = true,
-            types = org.apache.camel.model.dataformat.SoapJaxbDataFormat.class,
+            types = org.apache.camel.model.dataformat.SoapDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
-            nodes = "soapjaxb",
+            nodes = "soap",
             properties = {
                     @YamlProperty(name = "context-path", type = "string", required = true),
                     @YamlProperty(name = "element-name-strategy-ref", type = "string"),
@@ -14658,23 +14661,23 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "version", type = "string")
             }
     )
-    public static class SoapJaxbDataFormatDeserializer extends YamlDeserializerBase<SoapJaxbDataFormat> {
-        public SoapJaxbDataFormatDeserializer() {
-            super(SoapJaxbDataFormat.class);
+    public static class SoapDataFormatDeserializer extends YamlDeserializerBase<SoapDataFormat> {
+        public SoapDataFormatDeserializer() {
+            super(SoapDataFormat.class);
         }
 
         @Override
-        protected SoapJaxbDataFormat newInstance() {
-            return new SoapJaxbDataFormat();
+        protected SoapDataFormat newInstance() {
+            return new SoapDataFormat();
         }
 
         @Override
-        protected SoapJaxbDataFormat newInstance(String value) {
-            return new SoapJaxbDataFormat(value);
+        protected SoapDataFormat newInstance(String value) {
+            return new SoapDataFormat(value);
         }
 
         @Override
-        protected boolean setProperty(SoapJaxbDataFormat target, String propertyKey,
+        protected boolean setProperty(SoapDataFormat target, String propertyKey,
                 String propertyName, Node node) {
             switch(propertyKey) {
                 case "context-path": {
@@ -16869,7 +16872,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
                     @YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
                     @YamlProperty(name = "inherit-error-handler", type = "boolean"),
-                    @YamlProperty(name = "jacksonxml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
+                    @YamlProperty(name = "jackson-xml", type = "object:org.apache.camel.model.dataformat.JacksonXMLDataFormat"),
                     @YamlProperty(name = "jaxb", type = "object:org.apache.camel.model.dataformat.JaxbDataFormat"),
                     @YamlProperty(name = "json", type = "object:org.apache.camel.model.dataformat.JsonDataFormat"),
                     @YamlProperty(name = "json-api", type = "object:org.apache.camel.model.dataformat.JsonApiDataFormat"),
@@ -16879,7 +16882,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "protobuf", type = "object:org.apache.camel.model.dataformat.ProtobufDataFormat"),
                     @YamlProperty(name = "rss", type = "object:org.apache.camel.model.dataformat.RssDataFormat"),
                     @YamlProperty(name = "secure-xml", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"),
-                    @YamlProperty(name = "soapjaxb", type = "object:org.apache.camel.model.dataformat.SoapJaxbDataFormat"),
+                    @YamlProperty(name = "soap", type = "object:org.apache.camel.model.dataformat.SoapDataFormat"),
                     @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat"),
                     @YamlProperty(name = "tarfile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat"),
                     @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat"),
@@ -17003,7 +17006,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "jacksonxml": {
+                case "jackson-xml": {
                     org.apache.camel.model.dataformat.JacksonXMLDataFormat val = asType(node, org.apache.camel.model.dataformat.JacksonXMLDataFormat.class);
                     target.setDataFormatType(val);
                     break;
@@ -17048,8 +17051,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     target.setDataFormatType(val);
                     break;
                 }
-                case "soapjaxb": {
-                    org.apache.camel.model.dataformat.SoapJaxbDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapJaxbDataFormat.class);
+                case "soap": {
+                    org.apache.camel.model.dataformat.SoapDataFormat val = asType(node, org.apache.camel.model.dataformat.SoapDataFormat.class);
                     target.setDataFormatType(val);
                     break;
                 }
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 a3f07df..f877bbc 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
@@ -191,7 +191,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
             case "intercept-send-to-endpoint": return new ModelDeserializers.InterceptSendToEndpointDefinitionDeserializer();
             case "interceptSendToEndpoint": return new ModelDeserializers.InterceptSendToEndpointDefinitionDeserializer();
             case "org.apache.camel.model.InterceptSendToEndpointDefinition": return new ModelDeserializers.InterceptSendToEndpointDefinitionDeserializer();
-            case "jacksonxml": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
+            case "jackson-xml": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
+            case "jacksonXml": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
             case "org.apache.camel.model.dataformat.JacksonXMLDataFormat": return new ModelDeserializers.JacksonXMLDataFormatDeserializer();
             case "jaxb": return new ModelDeserializers.JaxbDataFormatDeserializer();
             case "org.apache.camel.model.dataformat.JaxbDataFormat": return new ModelDeserializers.JaxbDataFormatDeserializer();
@@ -428,8 +429,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
             case "org.apache.camel.model.SetPropertyDefinition": return new ModelDeserializers.SetPropertyDefinitionDeserializer();
             case "simple": return new ModelDeserializers.SimpleExpressionDeserializer();
             case "org.apache.camel.model.language.SimpleExpression": return new ModelDeserializers.SimpleExpressionDeserializer();
-            case "soapjaxb": return new ModelDeserializers.SoapJaxbDataFormatDeserializer();
-            case "org.apache.camel.model.dataformat.SoapJaxbDataFormat": return new ModelDeserializers.SoapJaxbDataFormatDeserializer();
+            case "soap": return new ModelDeserializers.SoapDataFormatDeserializer();
+            case "org.apache.camel.model.dataformat.SoapDataFormat": return new ModelDeserializers.SoapDataFormatDeserializer();
             case "sort": return new ModelDeserializers.SortDefinitionDeserializer();
             case "org.apache.camel.model.SortDefinition": return new ModelDeserializers.SortDefinitionDeserializer();
             case "spel": return new ModelDeserializers.SpELExpressionDeserializer();
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index ec6e7ce..910f7d1 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -1414,7 +1414,7 @@
           "inherit-error-handler" : {
             "type" : "boolean"
           },
-          "jacksonxml" : {
+          "jackson-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
           },
           "jaxb" : {
@@ -1444,8 +1444,8 @@
           "secure-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat"
           },
-          "soapjaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+          "soap" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapDataFormat"
           },
           "syslog" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SyslogDataFormat"
@@ -2879,7 +2879,7 @@
           "inherit-error-handler" : {
             "type" : "boolean"
           },
-          "jacksonxml" : {
+          "jackson-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
           },
           "jaxb" : {
@@ -2909,8 +2909,8 @@
           "secure-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat"
           },
-          "soapjaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+          "soap" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapDataFormat"
           },
           "syslog" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SyslogDataFormat"
@@ -4238,7 +4238,7 @@
           "ical" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
           },
-          "jacksonxml" : {
+          "jackson-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
           },
           "jaxb" : {
@@ -4268,8 +4268,8 @@
           "secure-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat"
           },
-          "soapjaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+          "soap" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapDataFormat"
           },
           "syslog" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SyslogDataFormat"
@@ -4880,7 +4880,7 @@
           }
         }
       },
-      "org.apache.camel.model.dataformat.SoapJaxbDataFormat" : {
+      "org.apache.camel.model.dataformat.SoapDataFormat" : {
         "oneOf" : [ {
           "type" : "string"
         }, {
@@ -7154,7 +7154,7 @@
           "grok" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
           },
-          "gzip-deflator" : {
+          "gzip-deflater" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
           },
           "hl7" : {
@@ -7163,7 +7163,7 @@
           "ical" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
           },
-          "jacksonxml" : {
+          "jackson-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
           },
           "jaxb" : {
@@ -7199,8 +7199,8 @@
           "secure-xml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat"
           },
-          "soapjaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+          "soap" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SoapDataFormat"
           },
           "syslog" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.SyslogDataFormat"
@@ -7235,7 +7235,7 @@
           "yaml" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat"
           },
-          "zip" : {
+          "zip-deflater" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
           },
           "zipfile" : {