This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 5b40d99 Regen
5b40d99 is described below
commit 5b40d993d1e8217b257cfb84b5f730a1cca1edf5
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 30 14:26:16 2021 +0100
Regen
---
.../camel/springboot/catalog/dataformats/jacksonxml.json | 2 +-
.../camel/springboot/catalog/dataformats/json-jackson.json | 2 +-
.../camel-jackson-starter/src/main/docs/jackson-starter.adoc | 2 +-
.../jackson/springboot/JacksonDataFormatConfiguration.java | 10 +++++-----
.../src/main/docs/jacksonxml-starter.adoc | 2 +-
.../springboot/JacksonXMLDataFormatConfiguration.java | 10 +++++-----
docs/modules/ROOT/pages/jackson-starter.adoc | 2 +-
docs/modules/ROOT/pages/jacksonxml-starter.adoc | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jacksonxml.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jacksonxml.json
index ff599c6..08f78fd 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jacksonxml.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
index df81b55..f4d0b2f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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/components-starter/camel-jackson-starter/src/main/docs/jackson-starter.adoc
b/components-starter/camel-jackson-starter/src/main/docs/jackson-starter.adoc
index 666c7f7..12659b1 100644
---
a/components-starter/camel-jackson-starter/src/main/docs/jackson-starter.adoc
+++
b/components-starter/camel-jackson-starter/src/main/docs/jackson-starter.adoc
@@ -33,7 +33,7 @@ The component supports 18 options, which are listed below.
| *camel.dataformat.json-jackson.enable-features* | Set of features to enable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should
be a name that matches a enum from
com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma | | String
| *camel.dataformat.json-jackson.enabled* | Whether to enable auto
configuration of the json-jackson data format. This is enabled by default. | |
Boolean
| *camel.dataformat.json-jackson.include* | 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 | | String
-| *camel.dataformat.json-jackson.json-view* | 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 | | Class
+| *camel.dataformat.json-jackson.json-view-type-name* | 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 | | String
| *camel.dataformat.json-jackson.module-class-names* | To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma. | | String
| *camel.dataformat.json-jackson.module-refs* | To use custom Jackson modules
referred from the Camel registry. Multiple modules can be separated by comma. |
| String
| *camel.dataformat.json-jackson.object-mapper* | Lookup and use the existing
ObjectMapper with the given id when using Jackson. | | String
diff --git
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 50f6dc8..e7edd01 100644
---
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -58,7 +58,7 @@ public class JacksonDataFormatConfiguration
* 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
*/
- private Class<Object> jsonView;
+ private String jsonViewTypeName;
/**
* 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
@@ -168,12 +168,12 @@ public class JacksonDataFormatConfiguration
this.unmarshalTypeName = unmarshalTypeName;
}
- public Class<Object> getJsonView() {
- return jsonView;
+ public String getJsonViewTypeName() {
+ return jsonViewTypeName;
}
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
+ public void setJsonViewTypeName(String jsonViewTypeName) {
+ this.jsonViewTypeName = jsonViewTypeName;
}
public String getInclude() {
diff --git
a/components-starter/camel-jacksonxml-starter/src/main/docs/jacksonxml-starter.adoc
b/components-starter/camel-jacksonxml-starter/src/main/docs/jacksonxml-starter.adoc
index a6c8c59..057513d 100644
---
a/components-starter/camel-jacksonxml-starter/src/main/docs/jacksonxml-starter.adoc
+++
b/components-starter/camel-jacksonxml-starter/src/main/docs/jacksonxml-starter.adoc
@@ -33,7 +33,7 @@ The component supports 16 options, which are listed below.
| *camel.dataformat.jacksonxml.enable-jaxb-annotation-module* | Whether to
enable the JAXB annotations module when using jackson. When enabled then JAXB
annotations can be used by Jackson. | false | Boolean
| *camel.dataformat.jacksonxml.enabled* | Whether to enable auto configuration
of the jacksonxml data format. This is enabled by default. | | Boolean
| *camel.dataformat.jacksonxml.include* | 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 | | String
-| *camel.dataformat.jacksonxml.json-view* | 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 | | Class
+| *camel.dataformat.jacksonxml.json-view-type-name* | 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 | | String
| *camel.dataformat.jacksonxml.module-class-names* | To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma. | | String
| *camel.dataformat.jacksonxml.module-refs* | To use custom Jackson modules
referred from the Camel registry. Multiple modules can be separated by comma. |
| String
| *camel.dataformat.jacksonxml.pretty-print* | To enable pretty printing
output nicely formatted. Is by default false. | false | Boolean
diff --git
a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
index bd247f3..7d503bd 100644
---
a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
+++
b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
@@ -54,7 +54,7 @@ public class JacksonXMLDataFormatConfiguration
* 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
*/
- private Class<Object> jsonView;
+ private String jsonViewTypeName;
/**
* 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
@@ -150,12 +150,12 @@ public class JacksonXMLDataFormatConfiguration
this.unmarshalTypeName = unmarshalTypeName;
}
- public Class<Object> getJsonView() {
- return jsonView;
+ public String getJsonViewTypeName() {
+ return jsonViewTypeName;
}
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
+ public void setJsonViewTypeName(String jsonViewTypeName) {
+ this.jsonViewTypeName = jsonViewTypeName;
}
public String getInclude() {
diff --git a/docs/modules/ROOT/pages/jackson-starter.adoc
b/docs/modules/ROOT/pages/jackson-starter.adoc
index 666c7f7..12659b1 100644
--- a/docs/modules/ROOT/pages/jackson-starter.adoc
+++ b/docs/modules/ROOT/pages/jackson-starter.adoc
@@ -33,7 +33,7 @@ The component supports 18 options, which are listed below.
| *camel.dataformat.json-jackson.enable-features* | Set of features to enable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should
be a name that matches a enum from
com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma | | String
| *camel.dataformat.json-jackson.enabled* | Whether to enable auto
configuration of the json-jackson data format. This is enabled by default. | |
Boolean
| *camel.dataformat.json-jackson.include* | 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 | | String
-| *camel.dataformat.json-jackson.json-view* | 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 | | Class
+| *camel.dataformat.json-jackson.json-view-type-name* | 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 | | String
| *camel.dataformat.json-jackson.module-class-names* | To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma. | | String
| *camel.dataformat.json-jackson.module-refs* | To use custom Jackson modules
referred from the Camel registry. Multiple modules can be separated by comma. |
| String
| *camel.dataformat.json-jackson.object-mapper* | Lookup and use the existing
ObjectMapper with the given id when using Jackson. | | String
diff --git a/docs/modules/ROOT/pages/jacksonxml-starter.adoc
b/docs/modules/ROOT/pages/jacksonxml-starter.adoc
index a6c8c59..057513d 100644
--- a/docs/modules/ROOT/pages/jacksonxml-starter.adoc
+++ b/docs/modules/ROOT/pages/jacksonxml-starter.adoc
@@ -33,7 +33,7 @@ The component supports 16 options, which are listed below.
| *camel.dataformat.jacksonxml.enable-jaxb-annotation-module* | Whether to
enable the JAXB annotations module when using jackson. When enabled then JAXB
annotations can be used by Jackson. | false | Boolean
| *camel.dataformat.jacksonxml.enabled* | Whether to enable auto configuration
of the jacksonxml data format. This is enabled by default. | | Boolean
| *camel.dataformat.jacksonxml.include* | 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 | | String
-| *camel.dataformat.jacksonxml.json-view* | 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 | | Class
+| *camel.dataformat.jacksonxml.json-view-type-name* | 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 | | String
| *camel.dataformat.jacksonxml.module-class-names* | To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma. | | String
| *camel.dataformat.jacksonxml.module-refs* | To use custom Jackson modules
referred from the Camel registry. Multiple modules can be separated by comma. |
| String
| *camel.dataformat.jacksonxml.pretty-print* | To enable pretty printing
output nicely formatted. Is by default false. | false | Boolean
