This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch df2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 910c3f2854f9032e9ba7d818dbdf7dc052d5bf6f Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 16:46:30 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../org/apache/camel/catalog/dataformats/jaxb.json | 2 +- .../org/apache/camel/catalog/dataformats/soap.json | 4 ++-- .../org/apache/camel/catalog/models/jaxb.json | 2 +- .../org/apache/camel/catalog/models/soap.json | 4 ++-- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 10 +++++----- .../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 10 +++++----- .../camel/converter/jaxb/JaxbDataFormatConfigurer.java | 7 +++++++ .../META-INF/org/apache/camel/converter/jaxb/jaxb.json | 2 +- .../jaxb/JaxbMarshalNamespacePrefixMapperTest.java | 2 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 18 +++++++++--------- .../src/generated/resources/schema/camelYamlDsl.json | 14 +++++++------- 11 files changed, 41 insertions(+), 34 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json index 26c6c519fbd..4004d6aa0b5 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json @@ -30,7 +30,7 @@ "fragment": { "index": 11, "kind": "attribute", "displayName": "Fragment", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does n [...] "partClass": { "index": 12, "kind": "attribute", "displayName": "Part Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." }, "partNamespace": { "index": 13, "kind": "attribute", "displayName": "Part Namespace", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." }, - "namespacePrefixRef": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix Ref", "group": "advanced", "label": "advanced", "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 contai [...] + "namespacePrefix": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatically assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the [...] "xmlStreamWriterWrapper": { "index": 15, "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom xml stream writer." }, "schemaLocation": { "index": 16, "kind": "attribute", "displayName": "Schema Location", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the schema" }, "noNamespaceSchemaLocation": { "index": 17, "kind": "attribute", "displayName": "No Namespace Schema Location", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json index aedada4655d..ba60298cd62 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json @@ -19,9 +19,9 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "contextPath": { "index": 1, "kind": "attribute", "displayName": "Context Path", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." }, "encoding": { "index": 2, "kind": "attribute", "displayName": "Encoding", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" }, - "elementNameStrategyRef": { "index": 3, "kind": "attribute", "displayName": "Element Name Strategy Ref", "group": "advanced", "label": "advanced", "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 marshali [...] + "elementNameStrategy": { "index": 3, "kind": "attribute", "displayName": "Element Name Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.dataformat.soap.name.ElementNameStrategy", "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 ob [...] "version": { "index": 4, "kind": "attribute", "displayName": "Version", "group": "common", "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": { "index": 5, "kind": "attribute", "displayName": "Namespace Prefix Ref", "group": "advanced", "label": "advanced", "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 contain [...] + "namespacePrefix": { "index": 5, "kind": "attribute", "displayName": "Namespace Prefix", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "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 desi [...] "schema": { "index": 6, "kind": "attribute", "displayName": "Schema", "group": "common", "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 be resolved. You can separate multiple schema files by using the ',' character." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json index d1e727e3b76..7f766e73166 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json @@ -27,7 +27,7 @@ "fragment": { "index": 11, "kind": "attribute", "displayName": "Fragment", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does n [...] "partClass": { "index": 12, "kind": "attribute", "displayName": "Part Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." }, "partNamespace": { "index": 13, "kind": "attribute", "displayName": "Part Namespace", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." }, - "namespacePrefixRef": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix Ref", "group": "advanced", "label": "advanced", "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 contai [...] + "namespacePrefix": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatically assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the [...] "xmlStreamWriterWrapper": { "index": 15, "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom xml stream writer." }, "schemaLocation": { "index": 16, "kind": "attribute", "displayName": "Schema Location", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the schema" }, "noNamespaceSchemaLocation": { "index": 17, "kind": "attribute", "displayName": "No Namespace Schema Location", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json index 1d0112de3b4..c66286a1550 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/soap.json @@ -16,9 +16,9 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "contextPath": { "index": 1, "kind": "attribute", "displayName": "Context Path", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." }, "encoding": { "index": 2, "kind": "attribute", "displayName": "Encoding", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" }, - "elementNameStrategyRef": { "index": 3, "kind": "attribute", "displayName": "Element Name Strategy Ref", "group": "advanced", "label": "advanced", "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 marshali [...] + "elementNameStrategy": { "index": 3, "kind": "attribute", "displayName": "Element Name Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.dataformat.soap.name.ElementNameStrategy", "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 ob [...] "version": { "index": 4, "kind": "attribute", "displayName": "Version", "group": "common", "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": { "index": 5, "kind": "attribute", "displayName": "Namespace Prefix Ref", "group": "advanced", "label": "advanced", "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 contain [...] + "namespacePrefix": { "index": 5, "kind": "attribute", "displayName": "Namespace Prefix", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "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 desi [...] "schema": { "index": 6, "kind": "attribute", "displayName": "Schema", "group": "common", "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 be resolved. You can separate multiple schema files by using the ',' character." } } } 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 f7895ee41d4..7289acfc4b2 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 @@ -9346,12 +9346,12 @@ XML namespace to use for fragment parsing. See more details at the fragment opti </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="namespacePrefixRef" type="xs:string"> + <xs:attribute name="namespacePrefix" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -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. +When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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. ]]> </xs:documentation> </xs:annotation> @@ -10051,7 +10051,7 @@ To overrule and use a specific encoding. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="elementNameStrategyRef" type="xs:string"> + <xs:attribute name="elementNameStrategy" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -10078,7 +10078,7 @@ SOAP version should either be 1.1 or 1.2. Is by default 1.1. Default value: 1.1 </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="namespacePrefixRef" type="xs:string"> + <xs:attribute name="namespacePrefix" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd index 0c64f00ac63..1ef1689aef3 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd @@ -8019,12 +8019,12 @@ XML namespace to use for fragment parsing. See more details at the fragment opti </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="namespacePrefixRef" type="xs:string"> + <xs:attribute name="namespacePrefix" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -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. +When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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. ]]> </xs:documentation> </xs:annotation> @@ -8724,7 +8724,7 @@ To overrule and use a specific encoding. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="elementNameStrategyRef" type="xs:string"> + <xs:attribute name="elementNameStrategy" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -8751,7 +8751,7 @@ SOAP version should either be 1.1 or 1.2. Is by default 1.1. Default value: 1.1 </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="namespacePrefixRef" type="xs:string"> + <xs:attribute name="namespacePrefix" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ diff --git a/components/camel-jaxb/src/generated/java/org/apache/camel/converter/jaxb/JaxbDataFormatConfigurer.java b/components/camel-jaxb/src/generated/java/org/apache/camel/converter/jaxb/JaxbDataFormatConfigurer.java index 7841aed0604..48f51b5e44d 100644 --- a/components/camel-jaxb/src/generated/java/org/apache/camel/converter/jaxb/JaxbDataFormatConfigurer.java +++ b/components/camel-jaxb/src/generated/java/org/apache/camel/converter/jaxb/JaxbDataFormatConfigurer.java @@ -32,6 +32,7 @@ public class JaxbDataFormatConfigurer extends org.apache.camel.support.component map.put("IgnoreJAXBElement", boolean.class); map.put("JaxbProviderProperties", java.util.Map.class); map.put("MustBeJAXBElement", boolean.class); + map.put("NamespacePrefix", java.util.Map.class); map.put("NoNamespaceSchemaLocation", java.lang.String.class); map.put("ObjectFactory", boolean.class); map.put("PartClass", java.lang.Class.class); @@ -66,6 +67,8 @@ public class JaxbDataFormatConfigurer extends org.apache.camel.support.component case "jaxbProviderProperties": target.setJaxbProviderProperties(property(camelContext, java.util.Map.class, value)); return true; case "mustbejaxbelement": case "mustBeJAXBElement": target.setMustBeJAXBElement(property(camelContext, boolean.class, value)); return true; + case "namespaceprefix": + case "namespacePrefix": target.setNamespacePrefix(property(camelContext, java.util.Map.class, value)); return true; case "nonamespaceschemalocation": case "noNamespaceSchemaLocation": target.setNoNamespaceSchemaLocation(property(camelContext, java.lang.String.class, value)); return true; case "objectfactory": @@ -113,6 +116,8 @@ public class JaxbDataFormatConfigurer extends org.apache.camel.support.component case "jaxbProviderProperties": return java.util.Map.class; case "mustbejaxbelement": case "mustBeJAXBElement": return boolean.class; + case "namespaceprefix": + case "namespacePrefix": return java.util.Map.class; case "nonamespaceschemalocation": case "noNamespaceSchemaLocation": return java.lang.String.class; case "objectfactory": @@ -156,6 +161,8 @@ public class JaxbDataFormatConfigurer extends org.apache.camel.support.component case "jaxbProviderProperties": return target.getJaxbProviderProperties(); case "mustbejaxbelement": case "mustBeJAXBElement": return target.isMustBeJAXBElement(); + case "namespaceprefix": + case "namespacePrefix": return target.getNamespacePrefix(); case "nonamespaceschemalocation": case "noNamespaceSchemaLocation": return target.getNoNamespaceSchemaLocation(); case "objectfactory": diff --git a/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json b/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json index 26c6c519fbd..4004d6aa0b5 100644 --- a/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json +++ b/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json @@ -30,7 +30,7 @@ "fragment": { "index": 11, "kind": "attribute", "displayName": "Fragment", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does n [...] "partClass": { "index": 12, "kind": "attribute", "displayName": "Part Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." }, "partNamespace": { "index": 13, "kind": "attribute", "displayName": "Part Namespace", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." }, - "namespacePrefixRef": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix Ref", "group": "advanced", "label": "advanced", "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 contai [...] + "namespacePrefix": { "index": 14, "kind": "attribute", "displayName": "Namespace Prefix", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatically assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the [...] "xmlStreamWriterWrapper": { "index": 15, "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom xml stream writer." }, "schemaLocation": { "index": 16, "kind": "attribute", "displayName": "Schema Location", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the schema" }, "noNamespaceSchemaLocation": { "index": 17, "kind": "attribute", "displayName": "No Namespace Schema Location", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" }, diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java index d079347550d..3c448d40404 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java @@ -83,7 +83,7 @@ public class JaxbMarshalNamespacePrefixMapperTest extends CamelTestSupport { public void configure() { JaxbDataFormat df = new JaxbDataFormat(); df.setContextPath("org.apache.camel.example"); - df.setNamespacePrefixRef("myPrefix"); + df.setNamespacePrefix("myPrefix"); from("direct:start") .marshal(df) 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 2e80a907564..38a8406793a 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 @@ -7928,7 +7928,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "ignoreJAXBElement", type = "boolean", description = "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases.", displayName = "Ignore JAXBElement"), @YamlProperty(name = "jaxbProviderProperties", type = "string", description = "Refers to a custom java.util.Map to lookup in the registry containing custom JAXB provider properties to be used with the JAXB marshaller.", displayName = "Jaxb Provider Properties"), @YamlProperty(name = "mustBeJAXBElement", type = "boolean", description = "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format.", displayName = "Must Be JAXBElement"), - @YamlProperty(name = "namespacePrefixRef", type = "string", 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.", displayName = "Namespace Prefix Ref"), + @YamlProperty(name = "namespacePrefix", type = "string", description = "When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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.", displayName = "Namespace Prefix"), @YamlProperty(name = "noNamespaceSchemaLocation", type = "string", description = "To define the location of the namespaceless schema", displayName = "No Namespace Schema Location"), @YamlProperty(name = "objectFactory", type = "boolean", description = "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files.", displayName = "Object Factory"), @YamlProperty(name = "partClass", type = "string", description = "Name of class used for fragment parsing. See more details at the fragment option.", displayName = "Part Class"), @@ -8010,9 +8010,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setMustBeJAXBElement(val); break; } - case "namespacePrefixRef": { + case "namespacePrefix": { String val = asText(node); - target.setNamespacePrefixRef(val); + target.setNamespacePrefix(val); break; } case "noNamespaceSchemaLocation": { @@ -17182,10 +17182,10 @@ public final class ModelDeserializers extends YamlDeserializerSupport { deprecated = false, properties = { @YamlProperty(name = "contextPath", type = "string", required = true, description = "Package name where your JAXB classes are located.", displayName = "Context Path"), - @YamlProperty(name = "elementNameStrategyRef", type = "string", 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 find an Exception class for a given soap fault name. The following three element strategy class name is provided out of the box. QNameStrategy [...] + @YamlProperty(name = "elementNameStrategy", type = "string", 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 find an Exception class for a given soap fault name. The following three element strategy class name is provided out of the box. QNameStrategy - U [...] @YamlProperty(name = "encoding", type = "string", description = "To overrule and use a specific encoding", displayName = "Encoding"), @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), - @YamlProperty(name = "namespacePrefixRef", type = "string", 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.", displayName = "Namespace Prefix Ref"), + @YamlProperty(name = "namespacePrefix", type = "string", 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.", displayName = "Namespace Prefix"), @YamlProperty(name = "schema", type = "string", description = "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should be resolved. You can separate multiple schema files by using the ',' character.", displayName = "Schema"), @YamlProperty(name = "version", type = "enum:1.1,1.2", defaultValue = "1.1", description = "SOAP version should either be 1.1 or 1.2. Is by default 1.1", displayName = "Version") } @@ -17215,9 +17215,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setContextPath(val); break; } - case "elementNameStrategyRef": { + case "elementNameStrategy": { String val = asText(node); - target.setElementNameStrategyRef(val); + target.setElementNameStrategy(val); break; } case "encoding": { @@ -17230,9 +17230,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setId(val); break; } - case "namespacePrefixRef": { + case "namespacePrefix": { String val = asText(node); - target.setNamespacePrefixRef(val); + target.setNamespacePrefix(val); break; } case "schema": { diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json index de7ca4b8542..bf7b7ea084f 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json @@ -11356,10 +11356,10 @@ "title" : "Must Be JAXBElement", "description" : "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." }, - "namespacePrefixRef" : { + "namespacePrefix" : { "type" : "string", - "title" : "Namespace Prefix Ref", - "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." + "title" : "Namespace Prefix", + "description" : "When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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." }, "noNamespaceSchemaLocation" : { "type" : "string", @@ -11915,9 +11915,9 @@ "title" : "Context Path", "description" : "Package name where your JAXB classes are located." }, - "elementNameStrategyRef" : { + "elementNameStrategy" : { "type" : "string", - "title" : "Element Name Strategy Ref", + "title" : "Element Name Strategy", "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 find an Exception class for a given soap fault name. The following three element strategy class name is provided out of the box. QNameStrategy - Uses a fixed qName that is configured on instantiation. Exception [...] }, "encoding" : { @@ -11930,9 +11930,9 @@ "title" : "Id", "description" : "The id of this node" }, - "namespacePrefixRef" : { + "namespacePrefix" : { "type" : "string", - "title" : "Namespace Prefix Ref", + "title" : "Namespace Prefix", "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" : {
