This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new abd84ada598 CAMEL-21482: camel-jaxb - JaxbDataFormat ignoreJAXBElement is default true abd84ada598 is described below commit abd84ada5982ca538dd940fbeb8ba8d9379c05e6 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Nov 28 09:48:53 2024 +0100 CAMEL-21482: camel-jaxb - JaxbDataFormat ignoreJAXBElement is default true --- .../resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json | 2 +- components-starter/camel-jaxb-starter/src/main/docs/jaxb.json | 2 +- .../camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json index d14c948d702..d1324868f42 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json @@ -23,7 +23,7 @@ "schemaSeverityLevel": { "index": 4, "kind": "attribute", "displayName": "Schema Severity Level", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.Integer", "enum": [ "0", "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "description": "Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default val [...] "prettyPrint": { "index": 5, "kind": "attribute", "displayName": "Pretty Print", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, "objectFactory": { "index": 6, "kind": "attribute", "displayName": "Object Factory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "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 desc [...] - "ignoreJAXBElement": { "index": 7, "kind": "attribute", "displayName": "Ignore JAXBElement", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." }, + "ignoreJAXBElement": { "index": 7, "kind": "attribute", "displayName": "Ignore JAXBElement", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." }, "mustBeJAXBElement": { "index": 8, "kind": "attribute", "displayName": "Must Be JAXBElement", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "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." }, "filterNonXmlChars": { "index": 9, "kind": "attribute", "displayName": "Filter Non Xml Chars", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." }, "encoding": { "index": 10, "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" }, diff --git a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json index 66a19355799..ec6c14d973b 100644 --- a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json +++ b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json @@ -76,7 +76,7 @@ "type": "java.lang.Boolean", "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases.", "sourceType": "org.apache.camel.converter.jaxb.springboot.JaxbDataFormatConfiguration", - "defaultValue": false + "defaultValue": true }, { "name": "camel.dataformat.jaxb.jaxb-provider-properties", diff --git a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java index 19a46884aff..e6dff4cf561 100644 --- a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java +++ b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java @@ -73,7 +73,7 @@ public class JaxbDataFormatConfiguration * Whether to ignore JAXBElement elements - only needed to be set to false * in very special use-cases. */ - private Boolean ignoreJAXBElement = false; + private Boolean ignoreJAXBElement = true; /** * 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