You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/20 09:44:02 UTC
[camel-spring-boot] branch master updated: Regen from master
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 256b2d1 Regen from master
256b2d1 is described below
commit 256b2d1012d226c373537f2b7de434bb37b3dd2c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 20 10:43:37 2020 +0100
Regen from master
---
.../catalog/components/atmosphere-websocket.json | 1 +
.../springboot/catalog/components/elytron.json | 5 +-
.../camel/springboot/catalog/components/ftp.json | 1 +
.../camel/springboot/catalog/components/ftps.json | 1 +
.../camel/springboot/catalog/components/jetty.json | 1 +
.../camel/springboot/catalog/components/jms.json | 1 +
.../springboot/catalog/components/netty-http.json | 1 +
.../camel/springboot/catalog/components/scp.json | 1 +
.../springboot/catalog/components/servlet.json | 1 +
.../camel/springboot/catalog/components/sftp.json | 1 +
.../springboot/catalog/components/undertow.json | 4 +
.../catalog/dataformats/json-fastjson.json | 22 +-
.../springboot/catalog/dataformats/json-gson.json | 21 +-
.../catalog/dataformats/json-jackson.json | 4 -
.../catalog/dataformats/json-johnzon.json | 21 +-
.../catalog/dataformats/json-xstream.json | 22 +-
.../springboot/catalog/dataformats/xstream.json | 5 +-
.../src/main/docs/elytron-starter.adoc | 5 +-
.../springboot/ElytronComponentConfiguration.java | 28 +++
.../src/main/docs/fastjson-starter.adoc | 20 +-
.../FastjsonDataFormatConfiguration.java | 255 ---------------------
.../src/main/docs/gson-starter.adoc | 19 +-
.../springboot/GsonDataFormatConfiguration.java | 243 --------------------
.../src/main/docs/jackson-starter.adoc | 5 +-
.../springboot/JacksonDataFormatConfiguration.java | 48 ----
.../src/main/docs/johnzon-starter.adoc | 19 +-
.../springboot/JohnzonDataFormatConfiguration.java | 245 --------------------
.../src/main/docs/undertow-starter.adoc | 4 +-
.../springboot/UndertowComponentConfiguration.java | 28 +++
.../src/main/docs/xstream-starter.adoc | 22 +-
.../springboot/JsonDataFormatConfiguration.java | 246 +-------------------
.../springboot/XStreamDataFormatConfiguration.java | 27 ---
docs/modules/ROOT/pages/elytron-starter.adoc | 5 +-
docs/modules/ROOT/pages/fastjson-starter.adoc | 20 +-
docs/modules/ROOT/pages/gson-starter.adoc | 19 +-
docs/modules/ROOT/pages/jackson-starter.adoc | 5 +-
docs/modules/ROOT/pages/johnzon-starter.adoc | 19 +-
docs/modules/ROOT/pages/undertow-starter.adoc | 4 +-
docs/modules/ROOT/pages/xstream-starter.adoc | 22 +-
39 files changed, 112 insertions(+), 1309 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
index 61f38aa..567ac02 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
@@ -8,6 +8,7 @@
"description": "To exchange data with external Websocket clients using Atmosphere.",
"label": "websocket",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elytron.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elytron.json
index ff0be9d..0678edd 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elytron.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elytron.json
@@ -29,12 +29,13 @@
"mechanismName": { "kind": "property", "displayName": "Mechanism Name", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "BEARER_TOKEN", "description": "Name of the mechanism, which will be used for selection of authentication mechanism." },
"securityDomainBuilder": { "kind": "property", "displayName": "Security Domain Builder", "group": "advanced", "label": "advanced", "required": true, "type": "object", "javaType": "org.wildfly.security.auth.server.SecurityDomain.Builder", "deprecated": false, "secret": false, "description": "Definition of Builder, which will be used for creation of security domain." },
"undertowHttpBinding": { "kind": "property", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+ "allowedRoles": { "kind": "property", "displayName": "Allowed Roles", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles." },
+ "securityConfiguration": { "kind": "property", "displayName": "Security Configuration", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration." },
"sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }
},
"properties": {
"httpURI": { "kind": "path", "displayName": "Http URI", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The url of the HTTP endpoint to use." },
- "allowedRoles": { "kind": "parameter", "displayName": "Allowed Roles", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Comma separated list of allowed roles." },
"useStreaming": { "kind": "parameter", "displayName": "Use Streaming", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "For HTTP endpoint: if true, text and binary messages will be wrapped as java.io.InputStream before they are passed to an Exchange; otherwise they will be passed as byte. For WebSocket endpoint: if true, text and binary messages will be wra [...]
"accessLog": { "kind": "parameter", "displayName": "Access Log", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether or not the consumer should write access log" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
@@ -59,6 +60,8 @@
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
"undertowHttpBinding": { "kind": "parameter", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow." },
+ "allowedRoles": { "kind": "parameter", "displayName": "Allowed Roles", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "List of allowed roles in String format" },
+ "securityConfiguration": { "kind": "parameter", "displayName": "Security Configuration", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "OConfiguration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides whether accepts configuration." },
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
"fireWebSocketChannelEvents": { "kind": "parameter", "displayName": "Fire Web Socket Channel Events", "group": "websocket", "label": "consumer,websocket", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType." },
"sendTimeout": { "kind": "parameter", "displayName": "Send Timeout", "group": "websocket", "label": "producer,websocket", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "30000", "description": "Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds)." },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftp.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftp.json
index 0c9a2a4..52d7a39 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftp.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftp.json
@@ -9,6 +9,7 @@
"description": "The ftp component is used for uploading or downloading files from FTP servers.",
"label": "file",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
index 10171ad..5d9d135 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
@@ -9,6 +9,7 @@
"description": "The ftps (FTP secure SSL\/TLS) component is used for uploading or downloading files from FTP servers.",
"label": "file",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
index bb0dec3..ef23dc5 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
@@ -8,6 +8,7 @@
"description": "To use Jetty as a HTTP server as consumer for Camel routes.",
"label": "http",
"deprecated": false,
+ "deprecationNote": "",
"async": true,
"consumerOnly": true,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
index 9189027..553490d 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
@@ -8,6 +8,7 @@
"description": "The jms component allows messages to be sent to (or consumed from) a JMS Queue or Topic.",
"label": "messaging",
"deprecated": false,
+ "deprecationNote": "",
"async": true,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index 96629cb..1008c4e 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -8,6 +8,7 @@
"description": "Netty HTTP server and client using the Netty 4.x library.",
"label": "http",
"deprecated": false,
+ "deprecationNote": "",
"async": true,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
index a9c9a02..ec0f345 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
@@ -8,6 +8,7 @@
"description": "To copy files using the secure copy protocol (SCP).",
"label": "file",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": false,
"producerOnly": true,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
index 013e986..f25dc06 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
@@ -8,6 +8,7 @@
"description": "To use a HTTP Servlet as entry for Camel routes when running in a servlet container.",
"label": "http",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": true,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
index 1dc589c..034d7a8 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
@@ -8,6 +8,7 @@
"description": "The sftp (FTP over SSH) component is used for uploading or downloading files from SFTP servers.",
"label": "file",
"deprecated": false,
+ "deprecationNote": "",
"async": false,
"consumerOnly": false,
"producerOnly": false,
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
index ede0c7f..8a2bb5e 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
@@ -26,6 +26,8 @@
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"hostOptions": { "kind": "property", "displayName": "Host Options", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHostOptions", "deprecated": false, "secret": false, "description": "To configure common options, such as thread pools" },
"undertowHttpBinding": { "kind": "property", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
+ "allowedRoles": { "kind": "property", "displayName": "Allowed Roles", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles." },
+ "securityConfiguration": { "kind": "property", "displayName": "Security Configuration", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration." },
"sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }
},
@@ -55,6 +57,8 @@
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
"undertowHttpBinding": { "kind": "parameter", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow." },
+ "allowedRoles": { "kind": "parameter", "displayName": "Allowed Roles", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles." },
+ "securityConfiguration": { "kind": "parameter", "displayName": "Security Configuration", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "OConfiguration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides whether accepts configuration." },
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
"fireWebSocketChannelEvents": { "kind": "parameter", "displayName": "Fire Web Socket Channel Events", "group": "websocket", "label": "consumer,websocket", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType." },
"sendTimeout": { "kind": "parameter", "displayName": "Send Timeout", "group": "websocket", "label": "producer,websocket", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "30000", "description": "Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds)." },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
index 0de0b0a..8fc1eb2 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
@@ -16,26 +16,6 @@
"version": "3.2.0-SNAPSHOT"
},
"properties": {
- "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", "XStream" ], "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" },
- "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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, "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." },
- "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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.MapperF [...]
- "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable 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.Mapp [...]
- "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
- "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
+ "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
}
}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
index 7d11a98..cc89122 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
@@ -16,26 +16,7 @@
"version": "3.2.0-SNAPSHOT"
},
"properties": {
- "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", "XStream" ], "deprecated": false, "secret": false, "defaultValue": "Gson", "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" },
- "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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, "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." },
- "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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.MapperF [...]
- "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable 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.Mapp [...]
- "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
- "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
+ "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
}
}
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 1678540..3267eea 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
@@ -19,19 +19,15 @@
"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", "XStream" ], "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" },
"allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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, "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." },
"useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
"enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
"moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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." },
"moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
"enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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.MapperF [...]
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable 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.Mapp [...]
- "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
"timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
"autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
index ea444da..ff02257 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
@@ -17,25 +17,6 @@
},
"properties": {
"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", "XStream" ], "deprecated": false, "secret": false, "defaultValue": "Johnzon", "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" },
- "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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, "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." },
- "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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.MapperF [...]
- "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable 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.Mapp [...]
- "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
- "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
+ "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." }
}
}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
index 886055b..ee44131 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
@@ -16,26 +16,8 @@
"version": "3.2.0-SNAPSHOT"
},
"properties": {
- "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", "XStream" ], "deprecated": false, "secret": false, "defaultValue": "XStream", "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" },
- "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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, "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." },
- "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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.MapperF [...]
- "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable 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.Mapp [...]
- "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
- "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
+ "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSon output." },
+ "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
}
}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json
index c3991ac..57d0adc 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json
@@ -18,14 +18,11 @@
"properties": {
"permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and [...]
"encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the encoding to use" },
- "driver": { "kind": "attribute", "displayName": "Driver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom XStream driver. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" },
- "driverRef": { "kind": "attribute", "displayName": "Driver Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To refer to a custom XStream driver to lookup in the registry. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" },
"mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Mode for dealing with duplicate references The possible values are: NO_REFERENCES ID_REFERENCES XPATH_RELATIVE_REFERENCES XPATH_ABSOLUTE_REFERENCES SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" },
"converters": { "kind": "element", "displayName": "Converters", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter" },
"aliases": { "kind": "element", "displayName": "Aliases", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Alias a Class to a shorter name to be used in XML elements." },
"omitFields": { "kind": "element", "displayName": "Omit Fields", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma." },
"implicitCollections": { "kind": "element", "displayName": "Implicit Collections", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma." },
- "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
+ "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
}
}
diff --git a/components-starter/camel-elytron-starter/src/main/docs/elytron-starter.adoc b/components-starter/camel-elytron-starter/src/main/docs/elytron-starter.adoc
index cb4f62b..091d2ca 100644
--- a/components-starter/camel-elytron-starter/src/main/docs/elytron-starter.adoc
+++ b/components-starter/camel-elytron-starter/src/main/docs/elytron-starter.adoc
@@ -17,13 +17,14 @@ When using elytron with Spring Boot make sure to use the following Maven depende
----
-The component supports 12 options, which are listed below.
+The component supports 14 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.elytron.allowed-roles* | Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles. | | String
| *camel.component.elytron.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.elytron.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.elytron.elytron-provider* | Elytron security provider, has to support mechanism from parameter mechanismName. The option is a org.wildfly.security.WildFlyElytronBaseProvider type. | | String
@@ -32,10 +33,10 @@ The component supports 12 options, which are listed below.
| *camel.component.elytron.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed th [...]
| *camel.component.elytron.mechanism-name* | Name of the mechanism, which will be used for selection of authentication mechanism. | BEARER_TOKEN | String
| *camel.component.elytron.mute-exception* | If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace. | false | Boolean
+| *camel.component.elytron.security-configuration* | Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration. The option is a java.lang.Object type. | | String
| *camel.component.elytron.security-domain-builder* | Definition of Builder, which will be used for creation of security domain. The option is a org.wildfly.security.auth.server.SecurityDomain.Builder type. | | String
| *camel.component.elytron.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
| *camel.component.elytron.undertow-http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.component.undertow.UndertowHttpBinding type. | | String
| *camel.component.elytron.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
-
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-elytron-starter/src/main/java/org/apache/camel/component/elytron/springboot/ElytronComponentConfiguration.java b/components-starter/camel-elytron-starter/src/main/java/org/apache/camel/component/elytron/springboot/ElytronComponentConfiguration.java
index cd4a5b4..61a34aa 100644
--- a/components-starter/camel-elytron-starter/src/main/java/org/apache/camel/component/elytron/springboot/ElytronComponentConfiguration.java
+++ b/components-starter/camel-elytron-starter/src/main/java/org/apache/camel/component/elytron/springboot/ElytronComponentConfiguration.java
@@ -96,6 +96,18 @@ public class ElytronComponentConfiguration
*/
private String undertowHttpBinding;
/**
+ * Configuration used by UndertowSecurityProvider. Comma separated list of
+ * allowed roles.
+ */
+ private String allowedRoles;
+ /**
+ * Configuration used by UndertowSecurityProvider. Security configuration
+ * object for use from UndertowSecurityProvider. Configuration is
+ * UndertowSecurityProvider specific. Each provider decides, whether it
+ * accepts configuration. The option is a java.lang.Object type.
+ */
+ private String securityConfiguration;
+ /**
* To configure security using SSLContextParameters. The option is a
* org.apache.camel.support.jsse.SSLContextParameters type.
*/
@@ -177,6 +189,22 @@ public class ElytronComponentConfiguration
this.undertowHttpBinding = undertowHttpBinding;
}
+ public String getAllowedRoles() {
+ return allowedRoles;
+ }
+
+ public void setAllowedRoles(String allowedRoles) {
+ this.allowedRoles = allowedRoles;
+ }
+
+ public String getSecurityConfiguration() {
+ return securityConfiguration;
+ }
+
+ public void setSecurityConfiguration(String securityConfiguration) {
+ this.securityConfiguration = securityConfiguration;
+ }
+
public String getSslContextParameters() {
return sslContextParameters;
}
diff --git a/components-starter/camel-fastjson-starter/src/main/docs/fastjson-starter.adoc b/components-starter/camel-fastjson-starter/src/main/docs/fastjson-starter.adoc
index d59642e..db5d4a8 100644
--- a/components-starter/camel-fastjson-starter/src/main/docs/fastjson-starter.adoc
+++ b/components-starter/camel-fastjson-starter/src/main/docs/fastjson-starter.adoc
@@ -17,32 +17,14 @@ When using fastjson with Spring Boot make sure to use the following Maven depend
----
-The component supports 20 options, which are listed below.
+The component supports 2 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-fastjson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-fastjson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-fastjson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-fastjson.collection-type-name* | 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. | | String
| *camel.dataformat.json-fastjson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-fastjson.disable-features* | Set of features to disable 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-fastjson.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-fastjson.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.json-fastjson.enabled* | Whether to enable auto configuration of the json-fastjson data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-fastjson.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-fastjson.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-fastjson.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-fastjson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-fastjson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-fastjson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple pe [...]
-| *camel.dataformat.json-fastjson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-fastjson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-fastjson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-fastjson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-fastjson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
index 4501489..f6279a5 100644
--- a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
+++ b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
@@ -38,117 +38,6 @@ public class FastjsonDataFormatConfiguration
*/
private Boolean enabled;
/**
- * Lookup and use the existing ObjectMapper with the given id when using
- * Jackson.
- */
- private String objectMapper;
- /**
- * Whether to lookup and use default Jackson ObjectMapper from the registry.
- */
- private Boolean useDefaultObjectMapper = true;
- /**
- * To enable pretty printing output nicely formatted. Is by default false.
- */
- private Boolean prettyPrint = false;
- /**
- * Class name of the java type to use when unmarshalling
- */
- private String unmarshalTypeName;
- /**
- * 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
- */
- private Class<Object> jsonView;
- /**
- * 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
- */
- private String include;
- /**
- * Used for JMS users to allow the JMSType header from the JMS spec to
- * specify a FQN classname to use to unmarshal to.
- */
- private Boolean allowJmsType = false;
- /**
- * 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.
- */
- private String collectionTypeName;
- /**
- * To unmarshal to a List of Map or a List of Pojo.
- */
- private Boolean useList = false;
- /**
- * Whether to enable the JAXB annotations module when using jackson. When
- * enabled then JAXB annotations can be used by Jackson.
- */
- private Boolean enableJaxbAnnotationModule = false;
- /**
- * 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.
- */
- private String moduleClassNames;
- /**
- * To use custom Jackson modules referred from the Camel registry. Multiple
- * modules can be separated by comma.
- */
- private String moduleRefs;
- /**
- * 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
- */
- private String enableFeatures;
- /**
- * Set of features to disable 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
- */
- private String disableFeatures;
- /**
- * Adds permissions that controls which Java packages and classes XStream is
- * allowed to use during unmarshal from xml/json to Java beans. A permission
- * must be configured either here or globally using a JVM system property.
- * The permission can be specified in a syntax where a plus sign is allow,
- * and minus sign is deny. Wildcards is supported by using . as prefix. For
- * example to allow com.foo and all subpackages then specfy com.foo..
- * Multiple permissions can be configured separated by comma, such as
- * com.foo.,-com.foo.bar.MySecretBean. The following default permission is
- * always included: -,java.lang.,java.util. unless its overridden by
- * specifying a JVM system property with they key
- * org.apache.camel.xstream.permissions.
- */
- private String permissions;
- /**
- * If enabled then Jackson is allowed to attempt to use the
- * CamelJacksonUnmarshalType header during the unmarshalling. This should
- * only be enabled when desired to be used.
- */
- private Boolean allowUnmarshallType = false;
- /**
- * If set then Jackson will use the Timezone when marshalling/unmarshalling.
- * This option will have no effect on the others Json DataFormat, like gson,
- * fastjson and xstream.
- */
- private String timezone;
- /**
- * If set to true then Jackson will lookup for an objectMapper into the
- * registry
- */
- private Boolean autoDiscoverObjectMapper = false;
- /**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
* example application/xml for data formats marshalling to XML, or
@@ -156,150 +45,6 @@ public class FastjsonDataFormatConfiguration
*/
private Boolean contentTypeHeader = false;
- public String getObjectMapper() {
- return objectMapper;
- }
-
- public void setObjectMapper(String objectMapper) {
- this.objectMapper = objectMapper;
- }
-
- public Boolean getUseDefaultObjectMapper() {
- return useDefaultObjectMapper;
- }
-
- public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
- this.useDefaultObjectMapper = useDefaultObjectMapper;
- }
-
- public Boolean getPrettyPrint() {
- return prettyPrint;
- }
-
- public void setPrettyPrint(Boolean prettyPrint) {
- this.prettyPrint = prettyPrint;
- }
-
- public String getUnmarshalTypeName() {
- return unmarshalTypeName;
- }
-
- public void setUnmarshalTypeName(String unmarshalTypeName) {
- this.unmarshalTypeName = unmarshalTypeName;
- }
-
- public Class<Object> getJsonView() {
- return jsonView;
- }
-
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public Boolean getAllowJmsType() {
- return allowJmsType;
- }
-
- public void setAllowJmsType(Boolean allowJmsType) {
- this.allowJmsType = allowJmsType;
- }
-
- public String getCollectionTypeName() {
- return collectionTypeName;
- }
-
- public void setCollectionTypeName(String collectionTypeName) {
- this.collectionTypeName = collectionTypeName;
- }
-
- public Boolean getUseList() {
- return useList;
- }
-
- public void setUseList(Boolean useList) {
- this.useList = useList;
- }
-
- public Boolean getEnableJaxbAnnotationModule() {
- return enableJaxbAnnotationModule;
- }
-
- public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
- this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
- }
-
- public String getModuleClassNames() {
- return moduleClassNames;
- }
-
- public void setModuleClassNames(String moduleClassNames) {
- this.moduleClassNames = moduleClassNames;
- }
-
- public String getModuleRefs() {
- return moduleRefs;
- }
-
- public void setModuleRefs(String moduleRefs) {
- this.moduleRefs = moduleRefs;
- }
-
- public String getEnableFeatures() {
- return enableFeatures;
- }
-
- public void setEnableFeatures(String enableFeatures) {
- this.enableFeatures = enableFeatures;
- }
-
- public String getDisableFeatures() {
- return disableFeatures;
- }
-
- public void setDisableFeatures(String disableFeatures) {
- this.disableFeatures = disableFeatures;
- }
-
- public String getPermissions() {
- return permissions;
- }
-
- public void setPermissions(String permissions) {
- this.permissions = permissions;
- }
-
- public Boolean getAllowUnmarshallType() {
- return allowUnmarshallType;
- }
-
- public void setAllowUnmarshallType(Boolean allowUnmarshallType) {
- this.allowUnmarshallType = allowUnmarshallType;
- }
-
- public String getTimezone() {
- return timezone;
- }
-
- public void setTimezone(String timezone) {
- this.timezone = timezone;
- }
-
- public Boolean getAutoDiscoverObjectMapper() {
- return autoDiscoverObjectMapper;
- }
-
- public void setAutoDiscoverObjectMapper(Boolean autoDiscoverObjectMapper) {
- this.autoDiscoverObjectMapper = autoDiscoverObjectMapper;
- }
-
public Boolean getContentTypeHeader() {
return contentTypeHeader;
}
diff --git a/components-starter/camel-gson-starter/src/main/docs/gson-starter.adoc b/components-starter/camel-gson-starter/src/main/docs/gson-starter.adoc
index b7f8bc6..2978acf 100644
--- a/components-starter/camel-gson-starter/src/main/docs/gson-starter.adoc
+++ b/components-starter/camel-gson-starter/src/main/docs/gson-starter.adoc
@@ -17,32 +17,15 @@ When using gson with Spring Boot make sure to use the following Maven dependency
----
-The component supports 20 options, which are listed below.
+The component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-gson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-gson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-gson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-gson.collection-type-name* | 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. | | String
| *camel.dataformat.json-gson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-gson.disable-features* | Set of features to disable 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-gson.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-gson.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.json-gson.enabled* | Whether to enable auto configuration of the json-gson data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-gson.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-gson.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-gson.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-gson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-gson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-gson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple permis [...]
| *camel.dataformat.json-gson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-gson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-gson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-gson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-gson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 2726bf8..83b2d41 100644
--- a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++ b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -38,117 +38,10 @@ public class GsonDataFormatConfiguration
*/
private Boolean enabled;
/**
- * Lookup and use the existing ObjectMapper with the given id when using
- * Jackson.
- */
- private String objectMapper;
- /**
- * Whether to lookup and use default Jackson ObjectMapper from the registry.
- */
- private Boolean useDefaultObjectMapper = true;
- /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
/**
- * Class name of the java type to use when unmarshalling
- */
- private String unmarshalTypeName;
- /**
- * 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
- */
- private Class<Object> jsonView;
- /**
- * 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
- */
- private String include;
- /**
- * Used for JMS users to allow the JMSType header from the JMS spec to
- * specify a FQN classname to use to unmarshal to.
- */
- private Boolean allowJmsType = false;
- /**
- * 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.
- */
- private String collectionTypeName;
- /**
- * To unmarshal to a List of Map or a List of Pojo.
- */
- private Boolean useList = false;
- /**
- * Whether to enable the JAXB annotations module when using jackson. When
- * enabled then JAXB annotations can be used by Jackson.
- */
- private Boolean enableJaxbAnnotationModule = false;
- /**
- * 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.
- */
- private String moduleClassNames;
- /**
- * To use custom Jackson modules referred from the Camel registry. Multiple
- * modules can be separated by comma.
- */
- private String moduleRefs;
- /**
- * 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
- */
- private String enableFeatures;
- /**
- * Set of features to disable 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
- */
- private String disableFeatures;
- /**
- * Adds permissions that controls which Java packages and classes XStream is
- * allowed to use during unmarshal from xml/json to Java beans. A permission
- * must be configured either here or globally using a JVM system property.
- * The permission can be specified in a syntax where a plus sign is allow,
- * and minus sign is deny. Wildcards is supported by using . as prefix. For
- * example to allow com.foo and all subpackages then specfy com.foo..
- * Multiple permissions can be configured separated by comma, such as
- * com.foo.,-com.foo.bar.MySecretBean. The following default permission is
- * always included: -,java.lang.,java.util. unless its overridden by
- * specifying a JVM system property with they key
- * org.apache.camel.xstream.permissions.
- */
- private String permissions;
- /**
- * If enabled then Jackson is allowed to attempt to use the
- * CamelJacksonUnmarshalType header during the unmarshalling. This should
- * only be enabled when desired to be used.
- */
- private Boolean allowUnmarshallType = false;
- /**
- * If set then Jackson will use the Timezone when marshalling/unmarshalling.
- * This option will have no effect on the others Json DataFormat, like gson,
- * fastjson and xstream.
- */
- private String timezone;
- /**
- * If set to true then Jackson will lookup for an objectMapper into the
- * registry
- */
- private Boolean autoDiscoverObjectMapper = false;
- /**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
* example application/xml for data formats marshalling to XML, or
@@ -156,22 +49,6 @@ public class GsonDataFormatConfiguration
*/
private Boolean contentTypeHeader = false;
- public String getObjectMapper() {
- return objectMapper;
- }
-
- public void setObjectMapper(String objectMapper) {
- this.objectMapper = objectMapper;
- }
-
- public Boolean getUseDefaultObjectMapper() {
- return useDefaultObjectMapper;
- }
-
- public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
- this.useDefaultObjectMapper = useDefaultObjectMapper;
- }
-
public Boolean getPrettyPrint() {
return prettyPrint;
}
@@ -180,126 +57,6 @@ public class GsonDataFormatConfiguration
this.prettyPrint = prettyPrint;
}
- public String getUnmarshalTypeName() {
- return unmarshalTypeName;
- }
-
- public void setUnmarshalTypeName(String unmarshalTypeName) {
- this.unmarshalTypeName = unmarshalTypeName;
- }
-
- public Class<Object> getJsonView() {
- return jsonView;
- }
-
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public Boolean getAllowJmsType() {
- return allowJmsType;
- }
-
- public void setAllowJmsType(Boolean allowJmsType) {
- this.allowJmsType = allowJmsType;
- }
-
- public String getCollectionTypeName() {
- return collectionTypeName;
- }
-
- public void setCollectionTypeName(String collectionTypeName) {
- this.collectionTypeName = collectionTypeName;
- }
-
- public Boolean getUseList() {
- return useList;
- }
-
- public void setUseList(Boolean useList) {
- this.useList = useList;
- }
-
- public Boolean getEnableJaxbAnnotationModule() {
- return enableJaxbAnnotationModule;
- }
-
- public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
- this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
- }
-
- public String getModuleClassNames() {
- return moduleClassNames;
- }
-
- public void setModuleClassNames(String moduleClassNames) {
- this.moduleClassNames = moduleClassNames;
- }
-
- public String getModuleRefs() {
- return moduleRefs;
- }
-
- public void setModuleRefs(String moduleRefs) {
- this.moduleRefs = moduleRefs;
- }
-
- public String getEnableFeatures() {
- return enableFeatures;
- }
-
- public void setEnableFeatures(String enableFeatures) {
- this.enableFeatures = enableFeatures;
- }
-
- public String getDisableFeatures() {
- return disableFeatures;
- }
-
- public void setDisableFeatures(String disableFeatures) {
- this.disableFeatures = disableFeatures;
- }
-
- public String getPermissions() {
- return permissions;
- }
-
- public void setPermissions(String permissions) {
- this.permissions = permissions;
- }
-
- public Boolean getAllowUnmarshallType() {
- return allowUnmarshallType;
- }
-
- public void setAllowUnmarshallType(Boolean allowUnmarshallType) {
- this.allowUnmarshallType = allowUnmarshallType;
- }
-
- public String getTimezone() {
- return timezone;
- }
-
- public void setTimezone(String timezone) {
- this.timezone = timezone;
- }
-
- public Boolean getAutoDiscoverObjectMapper() {
- return autoDiscoverObjectMapper;
- }
-
- public void setAutoDiscoverObjectMapper(Boolean autoDiscoverObjectMapper) {
- this.autoDiscoverObjectMapper = autoDiscoverObjectMapper;
- }
-
public Boolean getContentTypeHeader() {
return contentTypeHeader;
}
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 9123762..013e2d1 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
@@ -17,7 +17,7 @@ When using jackson with Spring Boot make sure to use the following Maven depende
----
-The component supports 20 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -27,7 +27,6 @@ The component supports 20 options, which are listed below.
| *camel.dataformat.json-jackson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
| *camel.dataformat.json-jackson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
| *camel.dataformat.json-jackson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-jackson.collection-type-name* | 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. | | String
| *camel.dataformat.json-jackson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
| *camel.dataformat.json-jackson.disable-features* | Set of features to disable 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.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
@@ -38,10 +37,8 @@ The component supports 20 options, which are listed below.
| *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
-| *camel.dataformat.json-jackson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-jackson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
| *camel.dataformat.json-jackson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-jackson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
| *camel.dataformat.json-jackson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
| *camel.dataformat.json-jackson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
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 5b14ffe..43f107e 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
@@ -51,10 +51,6 @@ public class JacksonDataFormatConfiguration
*/
private Boolean prettyPrint = false;
/**
- * Class name of the java type to use when unmarshalling
- */
- private String unmarshalTypeName;
- /**
* 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
@@ -72,12 +68,6 @@ public class JacksonDataFormatConfiguration
*/
private Boolean allowJmsType = false;
/**
- * 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.
- */
- private String collectionTypeName;
- /**
* To unmarshal to a List of Map or a List of Pojo.
*/
private Boolean useList = false;
@@ -118,20 +108,6 @@ public class JacksonDataFormatConfiguration
*/
private String disableFeatures;
/**
- * Adds permissions that controls which Java packages and classes XStream is
- * allowed to use during unmarshal from xml/json to Java beans. A permission
- * must be configured either here or globally using a JVM system property.
- * The permission can be specified in a syntax where a plus sign is allow,
- * and minus sign is deny. Wildcards is supported by using . as prefix. For
- * example to allow com.foo and all subpackages then specfy com.foo..
- * Multiple permissions can be configured separated by comma, such as
- * com.foo.,-com.foo.bar.MySecretBean. The following default permission is
- * always included: -,java.lang.,java.util. unless its overridden by
- * specifying a JVM system property with they key
- * org.apache.camel.xstream.permissions.
- */
- private String permissions;
- /**
* If enabled then Jackson is allowed to attempt to use the
* CamelJacksonUnmarshalType header during the unmarshalling. This should
* only be enabled when desired to be used.
@@ -180,14 +156,6 @@ public class JacksonDataFormatConfiguration
this.prettyPrint = prettyPrint;
}
- public String getUnmarshalTypeName() {
- return unmarshalTypeName;
- }
-
- public void setUnmarshalTypeName(String unmarshalTypeName) {
- this.unmarshalTypeName = unmarshalTypeName;
- }
-
public Class<Object> getJsonView() {
return jsonView;
}
@@ -212,14 +180,6 @@ public class JacksonDataFormatConfiguration
this.allowJmsType = allowJmsType;
}
- public String getCollectionTypeName() {
- return collectionTypeName;
- }
-
- public void setCollectionTypeName(String collectionTypeName) {
- this.collectionTypeName = collectionTypeName;
- }
-
public Boolean getUseList() {
return useList;
}
@@ -268,14 +228,6 @@ public class JacksonDataFormatConfiguration
this.disableFeatures = disableFeatures;
}
- public String getPermissions() {
- return permissions;
- }
-
- public void setPermissions(String permissions) {
- this.permissions = permissions;
- }
-
public Boolean getAllowUnmarshallType() {
return allowUnmarshallType;
}
diff --git a/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc b/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
index fd59bd7..055b922 100644
--- a/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
+++ b/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
@@ -17,32 +17,15 @@ When using johnzon with Spring Boot make sure to use the following Maven depende
----
-The component supports 20 options, which are listed below.
+The component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-johnzon.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-johnzon.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-johnzon.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-johnzon.collection-type-name* | 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. | | String
-| *camel.dataformat.json-johnzon.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-johnzon.disable-features* | Set of features to disable 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-johnzon.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-johnzon.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.json-johnzon.enabled* | Whether to enable auto configuration of the json-johnzon data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-johnzon.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-johnzon.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-johnzon.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-johnzon.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-johnzon.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-johnzon.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-johnzon.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-johnzon.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-johnzon.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-johnzon.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 525e446..6700717 100644
--- a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++ b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -43,118 +43,9 @@ public class JohnzonDataFormatConfiguration
*/
private String objectMapper;
/**
- * Whether to lookup and use default Jackson ObjectMapper from the registry.
- */
- private Boolean useDefaultObjectMapper = true;
- /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
- /**
- * Class name of the java type to use when unmarshalling
- */
- private String unmarshalTypeName;
- /**
- * 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
- */
- private Class<Object> jsonView;
- /**
- * 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
- */
- private String include;
- /**
- * Used for JMS users to allow the JMSType header from the JMS spec to
- * specify a FQN classname to use to unmarshal to.
- */
- private Boolean allowJmsType = false;
- /**
- * 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.
- */
- private String collectionTypeName;
- /**
- * To unmarshal to a List of Map or a List of Pojo.
- */
- private Boolean useList = false;
- /**
- * Whether to enable the JAXB annotations module when using jackson. When
- * enabled then JAXB annotations can be used by Jackson.
- */
- private Boolean enableJaxbAnnotationModule = false;
- /**
- * 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.
- */
- private String moduleClassNames;
- /**
- * To use custom Jackson modules referred from the Camel registry. Multiple
- * modules can be separated by comma.
- */
- private String moduleRefs;
- /**
- * 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
- */
- private String enableFeatures;
- /**
- * Set of features to disable 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
- */
- private String disableFeatures;
- /**
- * Adds permissions that controls which Java packages and classes XStream is
- * allowed to use during unmarshal from xml/json to Java beans. A permission
- * must be configured either here or globally using a JVM system property.
- * The permission can be specified in a syntax where a plus sign is allow,
- * and minus sign is deny. Wildcards is supported by using . as prefix. For
- * example to allow com.foo and all subpackages then specfy com.foo..
- * Multiple permissions can be configured separated by comma, such as
- * com.foo.,-com.foo.bar.MySecretBean. The following default permission is
- * always included: -,java.lang.,java.util. unless its overridden by
- * specifying a JVM system property with they key
- * org.apache.camel.xstream.permissions.
- */
- private String permissions;
- /**
- * If enabled then Jackson is allowed to attempt to use the
- * CamelJacksonUnmarshalType header during the unmarshalling. This should
- * only be enabled when desired to be used.
- */
- private Boolean allowUnmarshallType = false;
- /**
- * If set then Jackson will use the Timezone when marshalling/unmarshalling.
- * This option will have no effect on the others Json DataFormat, like gson,
- * fastjson and xstream.
- */
- private String timezone;
- /**
- * If set to true then Jackson will lookup for an objectMapper into the
- * registry
- */
- private Boolean autoDiscoverObjectMapper = false;
- /**
- * Whether the data format should set the Content-Type header with the type
- * from the data format if the data format is capable of doing so. For
- * example application/xml for data formats marshalling to XML, or
- * application/json for data formats marshalling to JSon etc.
- */
- private Boolean contentTypeHeader = false;
public String getObjectMapper() {
return objectMapper;
@@ -164,14 +55,6 @@ public class JohnzonDataFormatConfiguration
this.objectMapper = objectMapper;
}
- public Boolean getUseDefaultObjectMapper() {
- return useDefaultObjectMapper;
- }
-
- public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
- this.useDefaultObjectMapper = useDefaultObjectMapper;
- }
-
public Boolean getPrettyPrint() {
return prettyPrint;
}
@@ -179,132 +62,4 @@ public class JohnzonDataFormatConfiguration
public void setPrettyPrint(Boolean prettyPrint) {
this.prettyPrint = prettyPrint;
}
-
- public String getUnmarshalTypeName() {
- return unmarshalTypeName;
- }
-
- public void setUnmarshalTypeName(String unmarshalTypeName) {
- this.unmarshalTypeName = unmarshalTypeName;
- }
-
- public Class<Object> getJsonView() {
- return jsonView;
- }
-
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public Boolean getAllowJmsType() {
- return allowJmsType;
- }
-
- public void setAllowJmsType(Boolean allowJmsType) {
- this.allowJmsType = allowJmsType;
- }
-
- public String getCollectionTypeName() {
- return collectionTypeName;
- }
-
- public void setCollectionTypeName(String collectionTypeName) {
- this.collectionTypeName = collectionTypeName;
- }
-
- public Boolean getUseList() {
- return useList;
- }
-
- public void setUseList(Boolean useList) {
- this.useList = useList;
- }
-
- public Boolean getEnableJaxbAnnotationModule() {
- return enableJaxbAnnotationModule;
- }
-
- public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
- this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
- }
-
- public String getModuleClassNames() {
- return moduleClassNames;
- }
-
- public void setModuleClassNames(String moduleClassNames) {
- this.moduleClassNames = moduleClassNames;
- }
-
- public String getModuleRefs() {
- return moduleRefs;
- }
-
- public void setModuleRefs(String moduleRefs) {
- this.moduleRefs = moduleRefs;
- }
-
- public String getEnableFeatures() {
- return enableFeatures;
- }
-
- public void setEnableFeatures(String enableFeatures) {
- this.enableFeatures = enableFeatures;
- }
-
- public String getDisableFeatures() {
- return disableFeatures;
- }
-
- public void setDisableFeatures(String disableFeatures) {
- this.disableFeatures = disableFeatures;
- }
-
- public String getPermissions() {
- return permissions;
- }
-
- public void setPermissions(String permissions) {
- this.permissions = permissions;
- }
-
- public Boolean getAllowUnmarshallType() {
- return allowUnmarshallType;
- }
-
- public void setAllowUnmarshallType(Boolean allowUnmarshallType) {
- this.allowUnmarshallType = allowUnmarshallType;
- }
-
- public String getTimezone() {
- return timezone;
- }
-
- public void setTimezone(String timezone) {
- this.timezone = timezone;
- }
-
- public Boolean getAutoDiscoverObjectMapper() {
- return autoDiscoverObjectMapper;
- }
-
- public void setAutoDiscoverObjectMapper(Boolean autoDiscoverObjectMapper) {
- this.autoDiscoverObjectMapper = autoDiscoverObjectMapper;
- }
-
- public Boolean getContentTypeHeader() {
- return contentTypeHeader;
- }
-
- public void setContentTypeHeader(Boolean contentTypeHeader) {
- this.contentTypeHeader = contentTypeHeader;
- }
}
\ No newline at end of file
diff --git a/components-starter/camel-undertow-starter/src/main/docs/undertow-starter.adoc b/components-starter/camel-undertow-starter/src/main/docs/undertow-starter.adoc
index 9b5434a..7241aba 100644
--- a/components-starter/camel-undertow-starter/src/main/docs/undertow-starter.adoc
+++ b/components-starter/camel-undertow-starter/src/main/docs/undertow-starter.adoc
@@ -17,19 +17,21 @@ When using undertow with Spring Boot make sure to use the following Maven depend
----
-The component supports 9 options, which are listed below.
+The component supports 11 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.undertow.allowed-roles* | Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles. | | String
| *camel.component.undertow.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.undertow.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.undertow.enabled* | Whether to enable auto configuration of the undertow component. This is enabled by default. | | Boolean
| *camel.component.undertow.host-options* | To configure common options, such as thread pools. The option is a org.apache.camel.component.undertow.UndertowHostOptions type. | | String
| *camel.component.undertow.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
| *camel.component.undertow.mute-exception* | If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace. | false | Boolean
+| *camel.component.undertow.security-configuration* | Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration. The option is a java.lang.Object type. | | String
| *camel.component.undertow.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
| *camel.component.undertow.undertow-http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.component.undertow.UndertowHttpBinding type. | | String
| *camel.component.undertow.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
index 267cdeb..a9da3c6 100644
--- a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
+++ b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
@@ -79,6 +79,18 @@ public class UndertowComponentConfiguration
*/
private String undertowHttpBinding;
/**
+ * Configuration used by UndertowSecurityProvider. Comma separated list of
+ * allowed roles.
+ */
+ private String allowedRoles;
+ /**
+ * Configuration used by UndertowSecurityProvider. Security configuration
+ * object for use from UndertowSecurityProvider. Configuration is
+ * UndertowSecurityProvider specific. Each provider decides, whether it
+ * accepts configuration. The option is a java.lang.Object type.
+ */
+ private String securityConfiguration;
+ /**
* To configure security using SSLContextParameters. The option is a
* org.apache.camel.support.jsse.SSLContextParameters type.
*/
@@ -136,6 +148,22 @@ public class UndertowComponentConfiguration
this.undertowHttpBinding = undertowHttpBinding;
}
+ public String getAllowedRoles() {
+ return allowedRoles;
+ }
+
+ public void setAllowedRoles(String allowedRoles) {
+ this.allowedRoles = allowedRoles;
+ }
+
+ public String getSecurityConfiguration() {
+ return securityConfiguration;
+ }
+
+ public void setSecurityConfiguration(String securityConfiguration) {
+ this.securityConfiguration = securityConfiguration;
+ }
+
public String getSslContextParameters() {
return sslContextParameters;
}
diff --git a/components-starter/camel-xstream-starter/src/main/docs/xstream-starter.adoc b/components-starter/camel-xstream-starter/src/main/docs/xstream-starter.adoc
index c46bac8..1619aa9 100644
--- a/components-starter/camel-xstream-starter/src/main/docs/xstream-starter.adoc
+++ b/components-starter/camel-xstream-starter/src/main/docs/xstream-starter.adoc
@@ -17,38 +17,20 @@ When using xstream with Spring Boot make sure to use the following Maven depende
----
-The component supports 31 options, which are listed below.
+The component supports 13 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-xstream.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-xstream.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-xstream.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-xstream.collection-type-name* | 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. | | String
| *camel.dataformat.json-xstream.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-xstream.disable-features* | Set of features to disable 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-xstream.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-xstream.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.json-xstream.drop-root-node* | Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSon output. | false | Boolean
| *camel.dataformat.json-xstream.enabled* | Whether to enable auto configuration of the json-xstream data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-xstream.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-xstream.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-xstream.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-xstream.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-xstream.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-xstream.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-xstream.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-xstream.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-xstream.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-xstream.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-xstream.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
| *camel.dataformat.xstream.aliases* | Alias a Class to a shorter name to be used in XML elements. | | List
| *camel.dataformat.xstream.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
| *camel.dataformat.xstream.converters* | List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter | | List
-| *camel.dataformat.xstream.driver* | To use a custom XStream driver. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver | | String
-| *camel.dataformat.xstream.driver-ref* | To refer to a custom XStream driver to lookup in the registry. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver | | String
| *camel.dataformat.xstream.enabled* | Whether to enable auto configuration of the xstream data format. This is enabled by default. | | Boolean
| *camel.dataformat.xstream.encoding* | Sets the encoding to use | | String
| *camel.dataformat.xstream.implicit-collections* | Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma. | | List
diff --git a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index 4f0371e..3313e50 100644
--- a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++ b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -38,116 +38,16 @@ public class JsonDataFormatConfiguration
*/
private Boolean enabled;
/**
- * Lookup and use the existing ObjectMapper with the given id when using
- * Jackson.
- */
- private String objectMapper;
- /**
- * Whether to lookup and use default Jackson ObjectMapper from the registry.
- */
- private Boolean useDefaultObjectMapper = true;
- /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
/**
- * Class name of the java type to use when unmarshalling
- */
- private String unmarshalTypeName;
- /**
- * 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
- */
- private Class<Object> jsonView;
- /**
- * 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
- */
- private String include;
- /**
- * Used for JMS users to allow the JMSType header from the JMS spec to
- * specify a FQN classname to use to unmarshal to.
- */
- private Boolean allowJmsType = false;
- /**
- * 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.
- */
- private String collectionTypeName;
- /**
- * To unmarshal to a List of Map or a List of Pojo.
- */
- private Boolean useList = false;
- /**
- * Whether to enable the JAXB annotations module when using jackson. When
- * enabled then JAXB annotations can be used by Jackson.
- */
- private Boolean enableJaxbAnnotationModule = false;
- /**
- * 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.
- */
- private String moduleClassNames;
- /**
- * To use custom Jackson modules referred from the Camel registry. Multiple
- * modules can be separated by comma.
- */
- private String moduleRefs;
- /**
- * 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
- */
- private String enableFeatures;
- /**
- * Set of features to disable 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
+ * Whether XStream will drop the root node in the generated JSon. You may
+ * want to enable this when using POJOs; as then the written object will
+ * include the class name as root node, which is often not intended to be
+ * written in the JSon output.
*/
- private String disableFeatures;
- /**
- * Adds permissions that controls which Java packages and classes XStream is
- * allowed to use during unmarshal from xml/json to Java beans. A permission
- * must be configured either here or globally using a JVM system property.
- * The permission can be specified in a syntax where a plus sign is allow,
- * and minus sign is deny. Wildcards is supported by using . as prefix. For
- * example to allow com.foo and all subpackages then specfy com.foo..
- * Multiple permissions can be configured separated by comma, such as
- * com.foo.,-com.foo.bar.MySecretBean. The following default permission is
- * always included: -,java.lang.,java.util. unless its overridden by
- * specifying a JVM system property with they key
- * org.apache.camel.xstream.permissions.
- */
- private String permissions;
- /**
- * If enabled then Jackson is allowed to attempt to use the
- * CamelJacksonUnmarshalType header during the unmarshalling. This should
- * only be enabled when desired to be used.
- */
- private Boolean allowUnmarshallType = false;
- /**
- * If set then Jackson will use the Timezone when marshalling/unmarshalling.
- * This option will have no effect on the others Json DataFormat, like gson,
- * fastjson and xstream.
- */
- private String timezone;
- /**
- * If set to true then Jackson will lookup for an objectMapper into the
- * registry
- */
- private Boolean autoDiscoverObjectMapper = false;
+ private Boolean dropRootNode = false;
/**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
@@ -156,22 +56,6 @@ public class JsonDataFormatConfiguration
*/
private Boolean contentTypeHeader = false;
- public String getObjectMapper() {
- return objectMapper;
- }
-
- public void setObjectMapper(String objectMapper) {
- this.objectMapper = objectMapper;
- }
-
- public Boolean getUseDefaultObjectMapper() {
- return useDefaultObjectMapper;
- }
-
- public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
- this.useDefaultObjectMapper = useDefaultObjectMapper;
- }
-
public Boolean getPrettyPrint() {
return prettyPrint;
}
@@ -180,124 +64,12 @@ public class JsonDataFormatConfiguration
this.prettyPrint = prettyPrint;
}
- public String getUnmarshalTypeName() {
- return unmarshalTypeName;
- }
-
- public void setUnmarshalTypeName(String unmarshalTypeName) {
- this.unmarshalTypeName = unmarshalTypeName;
- }
-
- public Class<Object> getJsonView() {
- return jsonView;
- }
-
- public void setJsonView(Class<Object> jsonView) {
- this.jsonView = jsonView;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public Boolean getAllowJmsType() {
- return allowJmsType;
- }
-
- public void setAllowJmsType(Boolean allowJmsType) {
- this.allowJmsType = allowJmsType;
- }
-
- public String getCollectionTypeName() {
- return collectionTypeName;
- }
-
- public void setCollectionTypeName(String collectionTypeName) {
- this.collectionTypeName = collectionTypeName;
- }
-
- public Boolean getUseList() {
- return useList;
- }
-
- public void setUseList(Boolean useList) {
- this.useList = useList;
- }
-
- public Boolean getEnableJaxbAnnotationModule() {
- return enableJaxbAnnotationModule;
- }
-
- public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
- this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
- }
-
- public String getModuleClassNames() {
- return moduleClassNames;
- }
-
- public void setModuleClassNames(String moduleClassNames) {
- this.moduleClassNames = moduleClassNames;
- }
-
- public String getModuleRefs() {
- return moduleRefs;
- }
-
- public void setModuleRefs(String moduleRefs) {
- this.moduleRefs = moduleRefs;
- }
-
- public String getEnableFeatures() {
- return enableFeatures;
- }
-
- public void setEnableFeatures(String enableFeatures) {
- this.enableFeatures = enableFeatures;
- }
-
- public String getDisableFeatures() {
- return disableFeatures;
- }
-
- public void setDisableFeatures(String disableFeatures) {
- this.disableFeatures = disableFeatures;
- }
-
- public String getPermissions() {
- return permissions;
- }
-
- public void setPermissions(String permissions) {
- this.permissions = permissions;
- }
-
- public Boolean getAllowUnmarshallType() {
- return allowUnmarshallType;
- }
-
- public void setAllowUnmarshallType(Boolean allowUnmarshallType) {
- this.allowUnmarshallType = allowUnmarshallType;
- }
-
- public String getTimezone() {
- return timezone;
- }
-
- public void setTimezone(String timezone) {
- this.timezone = timezone;
- }
-
- public Boolean getAutoDiscoverObjectMapper() {
- return autoDiscoverObjectMapper;
+ public Boolean getDropRootNode() {
+ return dropRootNode;
}
- public void setAutoDiscoverObjectMapper(Boolean autoDiscoverObjectMapper) {
- this.autoDiscoverObjectMapper = autoDiscoverObjectMapper;
+ public void setDropRootNode(Boolean dropRootNode) {
+ this.dropRootNode = dropRootNode;
}
public Boolean getContentTypeHeader() {
diff --git a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
index e6e1829..82061f4 100644
--- a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
+++ b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
@@ -58,17 +58,6 @@ public class XStreamDataFormatConfiguration
*/
private String encoding;
/**
- * To use a custom XStream driver. The instance must be of type
- * com.thoughtworks.xstream.io.HierarchicalStreamDriver
- */
- private String driver;
- /**
- * To refer to a custom XStream driver to lookup in the registry. The
- * instance must be of type
- * com.thoughtworks.xstream.io.HierarchicalStreamDriver
- */
- private String driverRef;
- /**
* Mode for dealing with duplicate references The possible values are:
* NO_REFERENCES ID_REFERENCES XPATH_RELATIVE_REFERENCES
* XPATH_ABSOLUTE_REFERENCES SINGLE_NODE_XPATH_RELATIVE_REFERENCES
@@ -119,22 +108,6 @@ public class XStreamDataFormatConfiguration
this.encoding = encoding;
}
- public String getDriver() {
- return driver;
- }
-
- public void setDriver(String driver) {
- this.driver = driver;
- }
-
- public String getDriverRef() {
- return driverRef;
- }
-
- public void setDriverRef(String driverRef) {
- this.driverRef = driverRef;
- }
-
public String getMode() {
return mode;
}
diff --git a/docs/modules/ROOT/pages/elytron-starter.adoc b/docs/modules/ROOT/pages/elytron-starter.adoc
index cb4f62b..091d2ca 100644
--- a/docs/modules/ROOT/pages/elytron-starter.adoc
+++ b/docs/modules/ROOT/pages/elytron-starter.adoc
@@ -17,13 +17,14 @@ When using elytron with Spring Boot make sure to use the following Maven depende
----
-The component supports 12 options, which are listed below.
+The component supports 14 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.elytron.allowed-roles* | Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles. | | String
| *camel.component.elytron.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.elytron.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.elytron.elytron-provider* | Elytron security provider, has to support mechanism from parameter mechanismName. The option is a org.wildfly.security.WildFlyElytronBaseProvider type. | | String
@@ -32,10 +33,10 @@ The component supports 12 options, which are listed below.
| *camel.component.elytron.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed th [...]
| *camel.component.elytron.mechanism-name* | Name of the mechanism, which will be used for selection of authentication mechanism. | BEARER_TOKEN | String
| *camel.component.elytron.mute-exception* | If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace. | false | Boolean
+| *camel.component.elytron.security-configuration* | Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration. The option is a java.lang.Object type. | | String
| *camel.component.elytron.security-domain-builder* | Definition of Builder, which will be used for creation of security domain. The option is a org.wildfly.security.auth.server.SecurityDomain.Builder type. | | String
| *camel.component.elytron.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
| *camel.component.elytron.undertow-http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.component.undertow.UndertowHttpBinding type. | | String
| *camel.component.elytron.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/fastjson-starter.adoc b/docs/modules/ROOT/pages/fastjson-starter.adoc
index d59642e..db5d4a8 100644
--- a/docs/modules/ROOT/pages/fastjson-starter.adoc
+++ b/docs/modules/ROOT/pages/fastjson-starter.adoc
@@ -17,32 +17,14 @@ When using fastjson with Spring Boot make sure to use the following Maven depend
----
-The component supports 20 options, which are listed below.
+The component supports 2 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-fastjson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-fastjson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-fastjson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-fastjson.collection-type-name* | 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. | | String
| *camel.dataformat.json-fastjson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-fastjson.disable-features* | Set of features to disable 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-fastjson.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-fastjson.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.json-fastjson.enabled* | Whether to enable auto configuration of the json-fastjson data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-fastjson.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-fastjson.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-fastjson.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-fastjson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-fastjson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-fastjson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple pe [...]
-| *camel.dataformat.json-fastjson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-fastjson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-fastjson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-fastjson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-fastjson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/gson-starter.adoc b/docs/modules/ROOT/pages/gson-starter.adoc
index b7f8bc6..2978acf 100644
--- a/docs/modules/ROOT/pages/gson-starter.adoc
+++ b/docs/modules/ROOT/pages/gson-starter.adoc
@@ -17,32 +17,15 @@ When using gson with Spring Boot make sure to use the following Maven dependency
----
-The component supports 20 options, which are listed below.
+The component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-gson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-gson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-gson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-gson.collection-type-name* | 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. | | String
| *camel.dataformat.json-gson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-gson.disable-features* | Set of features to disable 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-gson.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-gson.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.json-gson.enabled* | Whether to enable auto configuration of the json-gson data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-gson.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-gson.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-gson.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-gson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-gson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-gson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple permis [...]
| *camel.dataformat.json-gson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-gson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-gson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-gson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-gson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/jackson-starter.adoc b/docs/modules/ROOT/pages/jackson-starter.adoc
index 9123762..013e2d1 100644
--- a/docs/modules/ROOT/pages/jackson-starter.adoc
+++ b/docs/modules/ROOT/pages/jackson-starter.adoc
@@ -17,7 +17,7 @@ When using jackson with Spring Boot make sure to use the following Maven depende
----
-The component supports 20 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -27,7 +27,6 @@ The component supports 20 options, which are listed below.
| *camel.dataformat.json-jackson.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
| *camel.dataformat.json-jackson.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
| *camel.dataformat.json-jackson.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-jackson.collection-type-name* | 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. | | String
| *camel.dataformat.json-jackson.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
| *camel.dataformat.json-jackson.disable-features* | Set of features to disable 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.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
@@ -38,10 +37,8 @@ The component supports 20 options, which are listed below.
| *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
-| *camel.dataformat.json-jackson.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-jackson.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
| *camel.dataformat.json-jackson.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-jackson.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
| *camel.dataformat.json-jackson.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
| *camel.dataformat.json-jackson.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
diff --git a/docs/modules/ROOT/pages/johnzon-starter.adoc b/docs/modules/ROOT/pages/johnzon-starter.adoc
index fd59bd7..055b922 100644
--- a/docs/modules/ROOT/pages/johnzon-starter.adoc
+++ b/docs/modules/ROOT/pages/johnzon-starter.adoc
@@ -17,32 +17,15 @@ When using johnzon with Spring Boot make sure to use the following Maven depende
----
-The component supports 20 options, which are listed below.
+The component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-johnzon.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-johnzon.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-johnzon.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-johnzon.collection-type-name* | 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. | | String
-| *camel.dataformat.json-johnzon.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-johnzon.disable-features* | Set of features to disable 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-johnzon.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-johnzon.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.json-johnzon.enabled* | Whether to enable auto configuration of the json-johnzon data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-johnzon.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-johnzon.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-johnzon.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-johnzon.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-johnzon.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-johnzon.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-johnzon.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-johnzon.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-johnzon.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-johnzon.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/undertow-starter.adoc b/docs/modules/ROOT/pages/undertow-starter.adoc
index 9b5434a..7241aba 100644
--- a/docs/modules/ROOT/pages/undertow-starter.adoc
+++ b/docs/modules/ROOT/pages/undertow-starter.adoc
@@ -17,19 +17,21 @@ When using undertow with Spring Boot make sure to use the following Maven depend
----
-The component supports 9 options, which are listed below.
+The component supports 11 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.undertow.allowed-roles* | Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles. | | String
| *camel.component.undertow.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.undertow.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.undertow.enabled* | Whether to enable auto configuration of the undertow component. This is enabled by default. | | Boolean
| *camel.component.undertow.host-options* | To configure common options, such as thread pools. The option is a org.apache.camel.component.undertow.UndertowHostOptions type. | | String
| *camel.component.undertow.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
| *camel.component.undertow.mute-exception* | If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace. | false | Boolean
+| *camel.component.undertow.security-configuration* | Configuration used by UndertowSecurityProvider. Security configuration object for use from UndertowSecurityProvider. Configuration is UndertowSecurityProvider specific. Each provider decides, whether it accepts configuration. The option is a java.lang.Object type. | | String
| *camel.component.undertow.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
| *camel.component.undertow.undertow-http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.component.undertow.UndertowHttpBinding type. | | String
| *camel.component.undertow.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/docs/modules/ROOT/pages/xstream-starter.adoc b/docs/modules/ROOT/pages/xstream-starter.adoc
index c46bac8..1619aa9 100644
--- a/docs/modules/ROOT/pages/xstream-starter.adoc
+++ b/docs/modules/ROOT/pages/xstream-starter.adoc
@@ -17,38 +17,20 @@ When using xstream with Spring Boot make sure to use the following Maven depende
----
-The component supports 31 options, which are listed below.
+The component supports 13 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.dataformat.json-xstream.allow-jms-type* | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to. | false | Boolean
-| *camel.dataformat.json-xstream.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used. | false | Boolean
-| *camel.dataformat.json-xstream.auto-discover-object-mapper* | If set to true then Jackson will lookup for an objectMapper into the registry | false | Boolean
-| *camel.dataformat.json-xstream.collection-type-name* | 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. | | String
| *camel.dataformat.json-xstream.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
-| *camel.dataformat.json-xstream.disable-features* | Set of features to disable 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-xstream.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-xstream.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.json-xstream.drop-root-node* | Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSon output. | false | Boolean
| *camel.dataformat.json-xstream.enabled* | Whether to enable auto configuration of the json-xstream data format. This is enabled by default. | | Boolean
-| *camel.dataformat.json-xstream.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-xstream.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-xstream.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-xstream.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String
-| *camel.dataformat.json-xstream.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String
-| *camel.dataformat.json-xstream.permissions* | Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple per [...]
| *camel.dataformat.json-xstream.pretty-print* | To enable pretty printing output nicely formatted. Is by default false. | false | Boolean
-| *camel.dataformat.json-xstream.timezone* | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream. | | String
-| *camel.dataformat.json-xstream.unmarshal-type-name* | Class name of the java type to use when unmarshalling | | String
-| *camel.dataformat.json-xstream.use-default-object-mapper* | Whether to lookup and use default Jackson ObjectMapper from the registry. | true | Boolean
-| *camel.dataformat.json-xstream.use-list* | To unmarshal to a List of Map or a List of Pojo. | false | Boolean
| *camel.dataformat.xstream.aliases* | Alias a Class to a shorter name to be used in XML elements. | | List
| *camel.dataformat.xstream.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
| *camel.dataformat.xstream.converters* | List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter | | List
-| *camel.dataformat.xstream.driver* | To use a custom XStream driver. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver | | String
-| *camel.dataformat.xstream.driver-ref* | To refer to a custom XStream driver to lookup in the registry. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver | | String
| *camel.dataformat.xstream.enabled* | Whether to enable auto configuration of the xstream data format. This is enabled by default. | | Boolean
| *camel.dataformat.xstream.encoding* | Sets the encoding to use | | String
| *camel.dataformat.xstream.implicit-collections* | Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma. | | List