This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 863e2291e40eaecf516a59c1acdb6bd2468af594 Author: davsclaus <[email protected]> AuthorDate: Fri Dec 30 17:56:26 2022 +0000 Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8 Signed-off-by: GitHub <[email protected]> --- .../apache/camel/catalog/dataformats/jsonApi.json | 4 ++-- .../org/apache/camel/catalog/models/jsonApi.json | 4 ++-- .../apache/camel/catalog/schemas/camel-spring.xsd | 26 +++++++++------------- .../camel/component/jsonapi/JsonApiDataFormat.java | 3 +-- .../camel/model/dataformat/JsonApiDataFormat.java | 7 +++--- .../camel/component/rest/FromRestGetTest.java | 2 -- .../java/org/apache/camel/xml/in/BaseParser.java | 1 - .../org/apache/camel/xml/in/ModelParserTest.java | 3 ++- .../camel/maven/packaging/SchemaGeneratorMojo.java | 1 - 9 files changed, 20 insertions(+), 31 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json index 2f90a61c902..5d041aa89f7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json @@ -16,8 +16,8 @@ "modelJavaType": "org.apache.camel.model.dataformat.JsonApiDataFormat" }, "properties": { - "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>[]", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling" }, - "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account while unmarshalling" }, + "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling. Multiple classes can be separated by comma." }, + "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The class to take into account while unmarshalling." }, "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/jsonApi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json index c654b024c42..781d1dba500 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json @@ -13,8 +13,8 @@ "output": false }, "properties": { - "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>[]", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling" }, - "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account while unmarshalling" }, + "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling. Multiple classes can be separated by comma." }, + "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The class to take into account while unmarshalling." }, "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/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 8a0b6eaf7ca..29f71800aea 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 @@ -11534,28 +11534,22 @@ true <xs:sequence/> - <xs:attribute name="dataFormatTypes"> + <xs:attribute name="dataFormatTypes" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The classes to take into account for the marshalling. +The classes to take into account for the marshalling. Multiple classes can be +separated by comma. ]]> </xs:documentation> </xs:annotation> - - <xs:simpleType> - - <xs:list itemType="xs:string"/> - - </xs:simpleType> - </xs:attribute> <xs:attribute name="mainFormatType" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The classes to take into account while unmarshalling. +The class to take into account while unmarshalling. ]]> </xs:documentation> </xs:annotation> @@ -22168,7 +22162,7 @@ hostname. </xs:annotation> </xs:attribute> - <xs:attribute name="useXForwardHeaders" type="xs:boolean"> + <xs:attribute name="useXForwardHeaders" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <