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:33 UTC

[camel] 22/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 85ba285bf6ee2bfc82c002236310d55b6f6097c7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 16 13:13:35 2022 +0100

    CAMEL-17499: soapjaxb dataformat renamed
---
 .../services/org/apache/camel/model.properties     |  2 +-
 .../apache/camel/model/dataformat/dataFormats.json |  2 +-
 .../org/apache/camel/model/dataformat/jaxb.index   |  2 +-
 .../model/dataformat/{soapjaxb.json => soap.json}  |  6 +--
 .../resources/org/apache/camel/model/marshal.json  |  2 +-
 .../org/apache/camel/model/unmarshal.json          |  2 +-
 .../org/apache/camel/builder/DataFormatClause.java | 50 +++++++++++-----------
 .../org/apache/camel/model/MarshalDefinition.java  |  4 +-
 .../apache/camel/model/UnmarshalDefinition.java    |  4 +-
 .../model/dataformat/DataFormatsDefinition.java    |  2 +-
 ...SoapJaxbDataFormat.java => SoapDataFormat.java} | 16 +++----
 .../DataFormatTransformerDefinition.java           |  4 +-
 .../reifier/dataformat/DataFormatReifier.java      |  4 +-
 .../dataformat/SoapJaxbDataFormatReifier.java      |  6 +--
 .../java/org/apache/camel/xml/in/ModelParser.java  |  5 +--
 15 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
index 4ea3d97..acbb364 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
+++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
@@ -165,7 +165,7 @@ setExchangePattern
 setHeader
 setProperty
 simple
-soapjaxb
+soap
 sort
 spel
 split
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
index 5a6bbbe..ba9cc00 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/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/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
index deea7b7..a8cbfa8 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
@@ -32,7 +32,7 @@ PGPDataFormat
 ProtobufDataFormat
 ProtobufLibrary
 RssDataFormat
-SoapJaxbDataFormat
+SoapDataFormat
 SyslogDataFormat
 TarFileDataFormat
 ThriftDataFormat
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soap.json
similarity index 90%
rename from core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soap.json
index 4201c73..497e203 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/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/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
index 99bb71e..019ec36 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/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/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
index 047fb23..ac6896e 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/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/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
index c97a6c3..6c38743 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -54,7 +54,7 @@ import org.apache.camel.model.dataformat.PGPDataFormat;
 import org.apache.camel.model.dataformat.ProtobufDataFormat;
 import org.apache.camel.model.dataformat.ProtobufLibrary;
 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;
@@ -803,65 +803,65 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
     }
 
     /**
-     * Uses the Soap 1.1 JAXB data format
+     * Uses the Soap v1.1 data format
      */
-    public T soapjaxb() {
-        return dataFormat(new SoapJaxbDataFormat());
+    public T soap() {
+        return dataFormat(new SoapDataFormat());
     }
 
     /**
-     * Uses the Soap 1.1 JAXB data format
+     * Uses the Soap v1.1 data format
      */
-    public T soapjaxb(String contextPath) {
-        return dataFormat(new SoapJaxbDataFormat(contextPath));
+    public T soap(String contextPath) {
+        return dataFormat(new SoapDataFormat(contextPath));
     }
 
     /**
-     * Uses the Soap 1.1 JAXB data format
+     * Uses the Soap v1.1 data format
      */
-    public T soapjaxb(String contextPath, String elementNameStrategyRef) {
-        return dataFormat(new SoapJaxbDataFormat(contextPath, elementNameStrategyRef));
+    public T soap(String contextPath, String elementNameStrategyRef) {
+        return dataFormat(new SoapDataFormat(contextPath, elementNameStrategyRef));
     }
 
     /**
-     * Uses the Soap 1.1 JAXB data format
+     * Uses the Soap v1.1 data format
      */
-    public T soapjaxb(String contextPath, Object elementNameStrategy) {
-        return dataFormat(new SoapJaxbDataFormat(contextPath, elementNameStrategy));
+    public T soap(String contextPath, Object elementNameStrategy) {
+        return dataFormat(new SoapDataFormat(contextPath, elementNameStrategy));
     }
 
     /**
-     * Uses the Soap 1.2 JAXB data format
+     * Uses the Soap v1.2 data format
      */
-    public T soapjaxb12() {
-        SoapJaxbDataFormat soap = new SoapJaxbDataFormat();
+    public T soap12() {
+        SoapDataFormat soap = new SoapDataFormat();
         soap.setVersion("1.2");
         return dataFormat(soap);
     }
 
     /**
-     * Uses the Soap 1.2 JAXB data format
+     * Uses the Soap v1.2 data format
      */
-    public T soapjaxb12(String contextPath) {
-        SoapJaxbDataFormat soap = new SoapJaxbDataFormat(contextPath);
+    public T soap12(String contextPath) {
+        SoapDataFormat soap = new SoapDataFormat(contextPath);
         soap.setVersion("1.2");
         return dataFormat(soap);
     }
 
     /**
-     * Uses the Soap 1.2 JAXB data format
+     * Uses the Soap v1.2 data format
      */
-    public T soapjaxb12(String contextPath, String elementNameStrategyRef) {
-        SoapJaxbDataFormat soap = new SoapJaxbDataFormat(contextPath, elementNameStrategyRef);
+    public T soap12(String contextPath, String elementNameStrategyRef) {
+        SoapDataFormat soap = new SoapDataFormat(contextPath, elementNameStrategyRef);
         soap.setVersion("1.2");
         return dataFormat(soap);
     }
 
     /**
-     * Uses the Soap JAXB data format
+     * Uses the Soap v1.2 data format
      */
-    public T soapjaxb12(String contextPath, Object elementNameStrategy) {
-        SoapJaxbDataFormat soap = new SoapJaxbDataFormat(contextPath, elementNameStrategy);
+    public T soap12(String contextPath, Object elementNameStrategy) {
+        SoapDataFormat soap = new SoapDataFormat(contextPath, elementNameStrategy);
         soap.setVersion("1.2");
         return dataFormat(soap);
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 7f3eb01..382e35e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -49,7 +49,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;
@@ -101,7 +101,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp
             @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
             @XmlElement(required = false, name = "rss", type = RssDataFormat.class),
             @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
+            @XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
             @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
             @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
             @XmlElement(required = false, name = "thrift", type = ThriftDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 6e37241..ee9eecc 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -49,7 +49,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;
@@ -101,7 +101,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
             @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
             @XmlElement(required = false, name = "rss", type = RssDataFormat.class),
             @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
+            @XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
             @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
             @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
             @XmlElement(required = false, name = "thrift", type = ThriftDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 2be189a..07baab5 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -66,7 +66,7 @@ public class DataFormatsDefinition {
             @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
             @XmlElement(required = false, name = "rss", type = RssDataFormat.class),
             @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
+            @XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
             @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
             @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
             @XmlElement(required = false, name = "thrift", type = ThriftDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
similarity index 94%
rename from core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
index 0d23b5d..43bc5f5 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
@@ -29,9 +29,9 @@ import org.apache.camel.spi.Metadata;
  * Marshal Java objects to SOAP messages and back.
  */
 @Metadata(firstVersion = "2.3.0", label = "dataformat,transformation,xml", title = "SOAP")
-@XmlRootElement(name = "soapjaxb")
+@XmlRootElement(name = "soap")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SoapJaxbDataFormat extends DataFormatDefinition {
+public class SoapDataFormat extends DataFormatDefinition {
     @XmlAttribute(required = true)
     private String contextPath;
     @XmlAttribute
@@ -41,29 +41,29 @@ public class SoapJaxbDataFormat extends DataFormatDefinition {
     @XmlTransient
     private Object elementNameStrategy;
     @XmlAttribute
-    @Metadata(defaultValue = "1.1")
+    @Metadata(defaultValue = "1.1", enums = "1.1,1.2")
     private String version;
     @XmlAttribute
     private String namespacePrefixRef;
     @XmlAttribute
     private String schema;
 
-    public SoapJaxbDataFormat() {
-        super("soapjaxb");
+    public SoapDataFormat() {
+        super("soap");
     }
 
-    public SoapJaxbDataFormat(String contextPath) {
+    public SoapDataFormat(String contextPath) {
         this();
         setContextPath(contextPath);
     }
 
-    public SoapJaxbDataFormat(String contextPath, String elementNameStrategyRef) {
+    public SoapDataFormat(String contextPath, String elementNameStrategyRef) {
         this();
         setContextPath(contextPath);
         setElementNameStrategyRef(elementNameStrategyRef);
     }
 
-    public SoapJaxbDataFormat(String contextPath, Object elementNameStrategy) {
+    public SoapDataFormat(String contextPath, Object elementNameStrategy) {
         this();
         setContextPath(contextPath);
         setElementNameStrategy(elementNameStrategy);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index 32e2ae1..acc5271 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -51,7 +51,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;
@@ -105,7 +105,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
             @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
             @XmlElement(required = false, name = "rss", type = RssDataFormat.class),
             @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
+            @XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
             @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
             @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
             @XmlElement(required = false, name = "thrift", type = ThriftDataFormat.class),
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index e1e3363..495dc39 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -54,7 +54,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;
@@ -233,7 +233,7 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends
             return new ProtobufDataFormatReifier(camelContext, definition);
         } else if (definition instanceof RssDataFormat) {
             return new RssDataFormatReifier(camelContext, definition);
-        } else if (definition instanceof SoapJaxbDataFormat) {
+        } else if (definition instanceof SoapDataFormat) {
             return new SoapJaxbDataFormatReifier(camelContext, definition);
         } else if (definition instanceof SyslogDataFormat) {
             return new SyslogDataFormatReifier(camelContext, definition);
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
index 845ddde..1ee0c0a 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
@@ -20,12 +20,12 @@ import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
+import org.apache.camel.model.dataformat.SoapDataFormat;
 
-public class SoapJaxbDataFormatReifier extends DataFormatReifier<SoapJaxbDataFormat> {
+public class SoapJaxbDataFormatReifier extends DataFormatReifier<SoapDataFormat> {
 
     public SoapJaxbDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) {
-        super(camelContext, (SoapJaxbDataFormat) definition);
+        super(camelContext, (SoapDataFormat) definition);
     }
 
     @Override
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 70710ac..8a03717 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -32,7 +32,6 @@ import java.util.Optional;
 import org.apache.camel.model.*;
 import org.apache.camel.model.cloud.*;
 import org.apache.camel.model.config.BatchResequencerConfig;
-import org.apache.camel.model.config.ResequencerConfig;
 import org.apache.camel.model.config.StreamResequencerConfig;
 import org.apache.camel.model.dataformat.*;
 import org.apache.camel.model.language.*;
@@ -2279,8 +2278,8 @@ public class ModelParser extends BaseParser {
         return doParse(new RssDataFormat(),
             identifiedTypeAttributeHandler(), noElementHandler(), noValueHandler());
     }
-    protected SoapJaxbDataFormat doParseSoapJaxbDataFormat() throws IOException, XmlPullParserException {
-        return doParse(new SoapJaxbDataFormat(), (def, key, val) -> {
+    protected SoapDataFormat doParseSoapJaxbDataFormat() throws IOException, XmlPullParserException {
+        return doParse(new SoapDataFormat(), (def, key, val) -> {
             switch (key) {
                 case "contextPath": def.setContextPath(val); break;
                 case "elementNameStrategyRef": def.setElementNameStrategyRef(val); break;