This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 7ed4327 Regen for commit 74d638c3e70e330d905139450ba97f9deb0cd5fa 7ed4327 is described below commit 7ed432763a78d06bf7713128232750a3ebeb48e9 Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Fri Oct 16 05:29:23 2020 +0000 Regen for commit 74d638c3e70e330d905139450ba97f9deb0cd5fa Signed-off-by: GitHub <nore...@github.com> --- .../generated/resources/org/apache/camel/catalog/dataformats.properties | 1 + .../src/generated/resources/org/apache/camel/catalog/docs.properties | 1 + .../src/generated/resources/org/apache/camel/catalog/models/json.json | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 1 + docs/components/modules/dataformats/nav.adoc | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties index 904332e..7c52bd4 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties @@ -23,6 +23,7 @@ json-fastjson json-gson json-jackson json-johnzon +json-jsonb json-xstream jsonApi lzf diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties index 1020490..436db48 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties @@ -269,6 +269,7 @@ json-fastjson-dataformat json-gson-dataformat json-jackson-dataformat json-johnzon-dataformat +json-jsonb-dataformat json-validator-component json-xstream-dataformat jsonApi-dataformat diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json index c69c0a7..32584b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json @@ -14,7 +14,7 @@ "objectMapper": { "kind": "attribute", "displayName": "Object Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing ObjectMapper with the given id when using Jackson." }, "useDefaultObjectMapper": { "kind": "attribute", "displayName": "Use Default Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to lookup and use default Jackson ObjectMapper from the registry." }, "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, - "library": { "kind": "attribute", "displayName": "Library", "required": false, "type": "enum", "javaType": "org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "fastjson", "gson", "jackson", "johnzon", "x-stream" ], "deprecated": false, "secret": false, "defaultValue": "Jackson", "description": "Which json library to use." }, + "library": { "kind": "attribute", "displayName": "Library", "required": false, "type": "enum", "javaType": "org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "fastjson", "gson", "jackson", "johnzon", "jsonb", "x-stream" ], "deprecated": false, "secret": false, "defaultValue": "Jackson", "description": "Which json library to use." }, "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }, "jsonView": { "kind": "attribute", "displayName": "Json View", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "secret": false, "description": "When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations" }, "include": { "kind": "attribute", "displayName": "Include", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL" }, 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 a9fab3b..28d6a73 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 @@ -14311,6 +14311,7 @@ Sets a reference to a thread pool to be used by the error handler. <xs:enumeration value="Johnzon"/> <xs:enumeration value="Gson"/> <xs:enumeration value="Fastjson"/> + <xs:enumeration value="Jsonb"/> </xs:restriction> </xs:simpleType> diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc index 4aeaa73..c3858af 100644 --- a/docs/components/modules/dataformats/nav.adoc +++ b/docs/components/modules/dataformats/nav.adoc @@ -25,6 +25,7 @@ ** xref:dataformats:json-gson-dataformat.adoc[JSON Gson] ** xref:dataformats:json-jackson-dataformat.adoc[JSON Jackson] ** xref:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] +** xref:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] ** xref:dataformats:json-xstream-dataformat.adoc[JSON XStream] ** xref:dataformats:jsonApi-dataformat.adoc[JSonApi] ** xref:dataformats:lzf-dataformat.adoc[LZF Deflate Compression]