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 7718417 Regen for commit 666b57bce5e36e8e67e1b4ce3bac9fc85e0f8508
7718417 is described below
commit 77184179cdc0907251214aeb238f9cf40662de40
Author: davsclaus <[email protected]>
AuthorDate: Sat Jan 30 14:01:49 2021 +0000
Regen for commit 666b57bce5e36e8e67e1b4ce3bac9fc85e0f8508
Signed-off-by: GitHub <[email protected]>
---
.../resources/org/apache/camel/catalog/dataformats/jacksonxml.json | 2 +-
.../resources/org/apache/camel/catalog/dataformats/json-jackson.json | 2 +-
.../resources/org/apache/camel/catalog/models/jacksonxml.json | 2 +-
.../src/generated/resources/org/apache/camel/catalog/models/json.json | 2 +-
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonxml.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonxml.json
index 8b4c8ed..8f6a70b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonxml.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonxml.json
@@ -19,7 +19,7 @@
"xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Lookup and use the existing XmlMapper with the given id." },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print",
"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." },
"unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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, "autowired": 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" },
+ "jsonViewTypeName": { "kind": "attribute", "displayName": "Json View Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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,
"autowired": 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" },
"allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Used for JMS users to allow the JMSType header from the
JMS spec to specify a FQN classname to use to unmarshal to." },
"collectionTypeName": { "kind": "attribute", "displayName": "Collection
Type Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom collection type to lookup in the registry to
use. This option should rarely be used, but allows to use different collection
types than java.util.Collection based as default." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/json-jackson.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/json-jackson.json
index 5177a3f..9135d95 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/json-jackson.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/json-jackson.json
@@ -20,7 +20,7 @@
"useDefaultObjectMapper": { "kind": "attribute", "displayName": "Use
Default Object Mapper", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": 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, "autowired": false, "secret": false, "defaultValue":
false, "description": "To enable pretty printing output nicely formatted. Is by
default false." },
"unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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, "autowired": 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" },
+ "jsonViewTypeName": { "kind": "attribute", "displayName": "Json View Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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,
"autowired": 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" },
"allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Used for JMS users to allow the JMSType header from the
JMS spec to specify a FQN classname to use to unmarshal to." },
"collectionTypeName": { "kind": "attribute", "displayName": "Collection
Type Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom collection type to lookup in the registry to
use. This option should rarely be used, but allows to use different collection
types than java.util.Collection based as default." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonxml.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonxml.json
index 7475625..acb9edf 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonxml.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonxml.json
@@ -15,7 +15,7 @@
"xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Lookup and use the existing XmlMapper with the given id." },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print",
"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." },
"unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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, "autowired": 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" },
+ "jsonViewTypeName": { "kind": "attribute", "displayName": "Json View Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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,
"autowired": 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" },
"allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Used for JMS users to allow the JMSType header from the
JMS spec to specify a FQN classname to use to unmarshal to." },
"collectionTypeName": { "kind": "attribute", "displayName": "Collection
Type Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom collection type to lookup in the registry to
use. This option should rarely be used, but allows to use different collection
types than java.util.Collection based as default." },
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 d30b320..f32d4c2 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
@@ -16,7 +16,7 @@
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print",
"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." },
"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, "autowired":
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, "autowired": 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, "autowired": 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" },
+ "jsonViewTypeName": { "kind": "attribute", "displayName": "Json View Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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,
"autowired": 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" },
"allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Used for JMS users to allow the JMSType header from the
JMS spec to specify a FQN classname to use to unmarshal to." },
"collectionTypeName": { "kind": "attribute", "displayName": "Collection
Type Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom collection type to lookup in the registry to
use. This option should rarely be used, but allows to use different collection
types than java.util.Collection based as default." },
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 070e9a6..d7cdfbd 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
@@ -6651,7 +6651,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonView" type="xs:string">
+ <xs:attribute name="jsonViewTypeName" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
When marshalling a POJO to JSON you might want to exclude certain fields from
@@ -6974,7 +6974,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonView" type="xs:string">
+ <xs:attribute name="jsonViewTypeName" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><