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 8f5c9173804 CAMEL-21482: camel-jaxb - JaxbDataFormat ignoreJAXBElement is default true 8f5c9173804 is described below commit 8f5c9173804e02b1b403f9defc0e1058479de302 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Nov 28 10:17:35 2024 +0100 CAMEL-21482: camel-jaxb - JaxbDataFormat ignoreJAXBElement is default true --- .../org/apache/camel/springboot/catalog/dataformats/jaxb.json | 4 ++-- components-starter/camel-jaxb-starter/src/main/docs/jaxb.json | 4 ++-- .../camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java | 4 ++-- 3 files changed, 6 insertions(+), 6 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 d1324868f42..b0350205e87 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 @@ -21,8 +21,8 @@ "contextPathIsClassName": { "index": 2, "kind": "attribute", "displayName": "Context Path Is Class Name", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This can be set to true to mark that the contextPath is referring to a classname and not a package name." }, "schema": { "index": 3, "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." }, "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 [...] + "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": true, "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": true, "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 descr [...] "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." }, 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 ec6c14d973b..48b262951dd 100644 --- a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json +++ b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json @@ -108,7 +108,7 @@ "type": "java.lang.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.", "sourceType": "org.apache.camel.converter.jaxb.springboot.JaxbDataFormatConfiguration", - "defaultValue": false + "defaultValue": true }, { "name": "camel.dataformat.jaxb.part-class", @@ -127,7 +127,7 @@ "type": "java.lang.Boolean", "description": "To enable pretty printing output nicely formatted. Is by default false.", "sourceType": "org.apache.camel.converter.jaxb.springboot.JaxbDataFormatConfiguration", - "defaultValue": false + "defaultValue": true }, { "name": "camel.dataformat.jaxb.schema", 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 e6dff4cf561..ce0223cb5ba 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 @@ -62,13 +62,13 @@ public class JaxbDataFormatConfiguration /** * To enable pretty printing output nicely formatted. Is by default false. */ - private Boolean prettyPrint = false; + private Boolean prettyPrint = true; /** * 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. */ - private Boolean objectFactory = false; + private Boolean objectFactory = true; /** * Whether to ignore JAXBElement elements - only needed to be set to false * in very special use-cases.