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 168532a Regen
168532a is described below
commit 168532a53dd57e465f3c689a7efe6ec206bc16fb
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Mar 13 09:07:36 2020 +0100
Regen
---
.../catalog/components/platform-http.json | 1 +
.../springboot/catalog/components/rabbitmq.json | 2 ++
.../springboot/catalog/dataformats/any23.json | 1 +
.../springboot/catalog/dataformats/xstream.json | 8 +++---
.../src/main/docs/any23-starter.adoc | 4 +--
.../springboot/Any23DataFormatConfiguration.java | 15 +++++++++++
.../src/main/docs/rabbitmq-starter.adoc | 4 +--
.../springboot/RabbitMQComponentConfiguration.java | 14 ++++++++++
.../src/main/docs/xstream-starter.adoc | 6 ++---
.../springboot/XStreamDataFormatConfiguration.java | 31 +++++++++++-----------
docs/modules/ROOT/pages/any23-starter.adoc | 4 +--
docs/modules/ROOT/pages/rabbitmq-starter.adoc | 4 +--
docs/modules/ROOT/pages/xstream-starter.adoc | 6 ++---
13 files changed, 67 insertions(+), 33 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
index 0ce3b3a..6c53428 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
@@ -27,6 +27,7 @@
"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 [...]
"consumes": { "kind": "parameter", "displayName": "Consumes", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The content type this endpoint accepts as an input, such as
application\/xml or application\/json. null or *\/* mean no
restriction." },
"httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method
Restrict", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "A comma separated list of HTTP methods to serve, e.g. GET,POST
. If no methods are specified, all methods will be served." },
+ "matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri
Prefix", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "description": "Whether or not the consumer should try
to find a target consumer by matching the URI prefix if no exact match is
found." },
"produces": { "kind": "parameter", "displayName": "Produces", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The content type this endpoint produces, such as
application\/xml or application\/json." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
index 82ee35e..4e1a5a5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
@@ -58,6 +58,7 @@
"automaticRecoveryEnabled": { "kind": "property", "displayName":
"Automatic Recovery Enabled", "group": "advanced", "label": "advanced",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "secret": false, "description": "Enables connection
automatic recovery (uses connection implementation that performs automatic
recovery when connection shutdown is not initiated by the application)" },
"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" },
"clientProperties": { "kind": "property", "displayName": "Client
Properties", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.Object>", "deprecated": false, "secret": false, "description":
"Connection client properties (client info used in negotiating with the
server)" },
+ "connectionFactoryExceptionHandler": { "kind": "property", "displayName":
"Connection Factory Exception Handler", "group": "advanced", "label":
"advanced", "required": false, "type": "object", "javaType":
"com.rabbitmq.client.ExceptionHandler", "deprecated": false, "secret": false,
"description": "Custom rabbitmq ExceptionHandler for ConnectionFactory" },
"connectionTimeout": { "kind": "property", "displayName": "Connection
Timeout", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "60000", "description": "Connection timeout" },
"networkRecoveryInterval": { "kind": "property", "displayName": "Network
Recovery Interval", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "5000", "description": "Network recovery
interval in milliseconds (interval used when recovering from network failure)"
},
"requestedChannelMax": { "kind": "property", "displayName": "Requested
Channel Max", "group": "advanced", "label": "advanced", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "2047", "description": "Connection requested channel max (max
number of channels offered)" },
@@ -121,6 +122,7 @@
"args": { "kind": "parameter", "displayName": "Args", "group": "advanced",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "prefix": "arg.",
"multiValue": true, "deprecated": false, "secret": false, "description":
"Specify arguments for configuring the different RabbitMQ concepts, a different
prefix is required for each: Exchange: arg.exchange. Queue: arg.queue. Binding:
arg.binding. For example to declare a q [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"clientProperties": { "kind": "parameter", "displayName": "Client
Properties", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.Object>", "deprecated": false, "secret": false, "description":
"Connection client properties (client info used in negotiating with the
server)" },
+ "connectionFactoryExceptionHandler": { "kind": "parameter", "displayName":
"Connection Factory Exception Handler", "group": "advanced", "label":
"advanced", "required": false, "type": "object", "javaType":
"com.rabbitmq.client.ExceptionHandler", "deprecated": false, "secret": false,
"description": "Custom rabbitmq ExceptionHandler for ConnectionFactory" },
"connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "60000", "description": "Connection timeout" },
"networkRecoveryInterval": { "kind": "parameter", "displayName": "Network
Recovery Interval", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "5000", "description": "Network recovery
interval in milliseconds (interval used when recovering from network failure)"
},
"requestedChannelMax": { "kind": "parameter", "displayName": "Requested
Channel Max", "group": "advanced", "label": "advanced", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "2047", "description": "Connection requested channel max (max
number of channels offered)" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/any23.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/any23.json
index 66b7b51..c54c2ed 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/any23.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/any23.json
@@ -17,6 +17,7 @@
},
"properties": {
"outputFormat": { "kind": "attribute", "displayName": "Output Format",
"required": false, "type": "enum", "javaType":
"org.apache.camel.dataformat.any23.Any23OutputFormat", "enum": [ "JSONLD",
"NQUADS", "NTRIPLES", "RDF4JMODEL", "RDFJSON", "RDFXML", "TURTLE" ],
"deprecated": false, "secret": false, "defaultValue": "RDF4JMODEL",
"description": "What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE,
NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL." },
+ "configuration": { "kind": "element", "displayName": "Configuration",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated":
false, "secret": false, "description": "Configurations for Apache Any23 as
key-value pairs in order to customize the extraction process. The list of
supported parameters can be found here. If not provided, a default
configuration is used." },
"extractors": { "kind": "element", "displayName": "Extractors",
"required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "secret": false,
"description": "List of Any23 extractors to be used in the unmarshal operation.
A list of the available extractors can be found here here. If not provided, all
the available extractors are used." },
"baseURI": { "kind": "attribute", "displayName": "Base URI", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "The URI to use as base for building RDF
entities if only relative paths are provided." },
"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 f75d6f4..c3991ac 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
@@ -21,10 +21,10 @@
"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<java.lang.String>", "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": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.String>", "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": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.String[]>", "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." },
- "implicitCollections": { "kind": "element", "displayName": "Implicit
Collections", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.String[]>", "deprecated": false,
"secret": false, "description": "Adds a default implicit collection which is
used for any unmapped XML tag." },
+ "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" }
}
diff --git
a/components-starter/camel-any23-starter/src/main/docs/any23-starter.adoc
b/components-starter/camel-any23-starter/src/main/docs/any23-starter.adoc
index 5c29c6e..c53ee27 100644
--- a/components-starter/camel-any23-starter/src/main/docs/any23-starter.adoc
+++ b/components-starter/camel-any23-starter/src/main/docs/any23-starter.adoc
@@ -17,7 +17,7 @@ When using any23 with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
@@ -25,10 +25,10 @@ The component supports 5 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building
RDF entities if only relative paths are provided. | | String
+| *camel.dataformat.any23.configuration* | Configurations for Apache Any23 as
key-value pairs in order to customize the extraction process. The list of
supported parameters can be found here. If not provided, a default
configuration is used. | | List
| *camel.dataformat.any23.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.any23.enabled* | Whether to enable auto configuration of
the any23 data format. This is enabled by default. | | Boolean
| *camel.dataformat.any23.extractors* | List of Any23 extractors to be used in
the unmarshal operation. A list of the available extractors can be found here
here. If not provided, all the available extractors are used. | | List
| *camel.dataformat.any23.output-format* | What RDF syntax to unmarshal as,
can be: NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by
default: RDF4JMODEL. | | Any23OutputFormat
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
b/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
index 6b2e188..b1aab17 100644
---
a/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
+++
b/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
@@ -20,6 +20,7 @@ import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.dataformat.any23.Any23DataFormat;
import org.apache.camel.dataformat.any23.Any23OutputFormat;
+import org.apache.camel.model.PropertyDefinition;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -45,6 +46,12 @@ public class Any23DataFormatConfiguration
*/
private Any23OutputFormat outputFormat = Any23OutputFormat.RDF4JMODEL;
/**
+ * Configurations for Apache Any23 as key-value pairs in order to customize
+ * the extraction process. The list of supported parameters can be found
+ * here. If not provided, a default configuration is used.
+ */
+ private List<PropertyDefinition> configuration;
+ /**
* List of Any23 extractors to be used in the unmarshal operation. A list
of
* the available extractors can be found here here. If not provided, all
the
* available extractors are used.
@@ -71,6 +78,14 @@ public class Any23DataFormatConfiguration
this.outputFormat = outputFormat;
}
+ public List<PropertyDefinition> getConfiguration() {
+ return configuration;
+ }
+
+ public void setConfiguration(List<PropertyDefinition> configuration) {
+ this.configuration = configuration;
+ }
+
public List<String> getExtractors() {
return extractors;
}
diff --git
a/components-starter/camel-rabbitmq-starter/src/main/docs/rabbitmq-starter.adoc
b/components-starter/camel-rabbitmq-starter/src/main/docs/rabbitmq-starter.adoc
index 2755514..55134e6 100644
---
a/components-starter/camel-rabbitmq-starter/src/main/docs/rabbitmq-starter.adoc
+++
b/components-starter/camel-rabbitmq-starter/src/main/docs/rabbitmq-starter.adoc
@@ -17,7 +17,7 @@ When using rabbitmq with Spring Boot make sure to use the
following Maven depend
----
-The component supports 53 options, which are listed below.
+The component supports 54 options, which are listed below.
@@ -37,6 +37,7 @@ The component supports 53 options, which are listed below.
| *camel.component.rabbitmq.channel-pool-max-wait* | Set the maximum number of
milliseconds to wait for a channel from the pool | 1000 | Long
| *camel.component.rabbitmq.client-properties* | Connection client properties
(client info used in negotiating with the server) | | Map
| *camel.component.rabbitmq.connection-factory* | To use a custom RabbitMQ
connection factory. When this option is set, all connection options
(connectionTimeout, requestedChannelMax...) set on URI are not used. The option
is a com.rabbitmq.client.ConnectionFactory type. | | String
+| *camel.component.rabbitmq.connection-factory-exception-handler* | Custom
rabbitmq ExceptionHandler for ConnectionFactory. The option is a
com.rabbitmq.client.ExceptionHandler type. | | String
| *camel.component.rabbitmq.connection-timeout* | Connection timeout | 60000 |
Integer
| *camel.component.rabbitmq.dead-letter-exchange* | The name of the dead
letter exchange | | String
| *camel.component.rabbitmq.dead-letter-exchange-type* | The type of the dead
letter exchange | direct | String
@@ -78,5 +79,4 @@ The component supports 53 options, which are listed below.
| *camel.component.rabbitmq.username* | Username in case of authenticated
access | guest | String
| *camel.component.rabbitmq.vhost* | The vhost for the channel | / | String
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
b/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
index 6a9d914..7528a5c 100644
---
a/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
+++
b/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
@@ -253,6 +253,11 @@ public class RabbitMQComponentConfiguration
*/
private Map<String, Object> clientProperties;
/**
+ * Custom rabbitmq ExceptionHandler for ConnectionFactory. The option is a
+ * com.rabbitmq.client.ExceptionHandler type.
+ */
+ private String connectionFactoryExceptionHandler;
+ /**
* Connection timeout
*/
private Integer connectionTimeout = 60000;
@@ -624,6 +629,15 @@ public class RabbitMQComponentConfiguration
this.clientProperties = clientProperties;
}
+ public String getConnectionFactoryExceptionHandler() {
+ return connectionFactoryExceptionHandler;
+ }
+
+ public void setConnectionFactoryExceptionHandler(
+ String connectionFactoryExceptionHandler) {
+ this.connectionFactoryExceptionHandler =
connectionFactoryExceptionHandler;
+ }
+
public Integer getConnectionTimeout() {
return connectionTimeout;
}
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 4d52e18..c46bac8 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
@@ -44,16 +44,16 @@ The component supports 31 options, which are listed below.
| *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. | | Map
+| *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. | | Map
+| *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
| *camel.dataformat.xstream.mode* | 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 | | String
-| *camel.dataformat.xstream.omit-fields* | 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. | | Map
+| *camel.dataformat.xstream.omit-fields* | 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. | | List
| *camel.dataformat.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 specify
com.foo.. Multiple permiss [...]
|===
// spring-boot-auto-configure options: END
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 741afaf..e6e1829 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
@@ -17,8 +17,8 @@
package org.apache.camel.dataformat.xstream.springboot;
import java.util.List;
-import java.util.Map;
import javax.annotation.Generated;
+import org.apache.camel.model.PropertyDefinition;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -79,22 +79,22 @@ public class XStreamDataFormatConfiguration
* List of class names for using custom XStream converters. The classes
must
* be of type com.thoughtworks.xstream.converters.Converter
*/
- private List<String> converters;
+ private List<PropertyDefinition> converters;
/**
* Alias a Class to a shorter name to be used in XML elements.
*/
- private Map<String, String> aliases;
+ private List<PropertyDefinition> aliases;
/**
* 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.
+ * converted. Multiple values can be separated by comma.
*/
- private Map<String, String[]> omitFields;
+ private List<PropertyDefinition> omitFields;
/**
* Adds a default implicit collection which is used for any unmapped XML
- * tag.
+ * tag. Multiple values can be separated by comma.
*/
- private Map<String, String[]> implicitCollections;
+ private List<PropertyDefinition> implicitCollections;
/**
* 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
@@ -143,35 +143,36 @@ public class XStreamDataFormatConfiguration
this.mode = mode;
}
- public List<String> getConverters() {
+ public List<PropertyDefinition> getConverters() {
return converters;
}
- public void setConverters(List<String> converters) {
+ public void setConverters(List<PropertyDefinition> converters) {
this.converters = converters;
}
- public Map<String, String> getAliases() {
+ public List<PropertyDefinition> getAliases() {
return aliases;
}
- public void setAliases(Map<String, String> aliases) {
+ public void setAliases(List<PropertyDefinition> aliases) {
this.aliases = aliases;
}
- public Map<String, String[]> getOmitFields() {
+ public List<PropertyDefinition> getOmitFields() {
return omitFields;
}
- public void setOmitFields(Map<String, String[]> omitFields) {
+ public void setOmitFields(List<PropertyDefinition> omitFields) {
this.omitFields = omitFields;
}
- public Map<String, String[]> getImplicitCollections() {
+ public List<PropertyDefinition> getImplicitCollections() {
return implicitCollections;
}
- public void setImplicitCollections(Map<String, String[]>
implicitCollections) {
+ public void setImplicitCollections(
+ List<PropertyDefinition> implicitCollections) {
this.implicitCollections = implicitCollections;
}
diff --git a/docs/modules/ROOT/pages/any23-starter.adoc
b/docs/modules/ROOT/pages/any23-starter.adoc
index 5c29c6e..c53ee27 100644
--- a/docs/modules/ROOT/pages/any23-starter.adoc
+++ b/docs/modules/ROOT/pages/any23-starter.adoc
@@ -17,7 +17,7 @@ When using any23 with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
@@ -25,10 +25,10 @@ The component supports 5 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building
RDF entities if only relative paths are provided. | | String
+| *camel.dataformat.any23.configuration* | Configurations for Apache Any23 as
key-value pairs in order to customize the extraction process. The list of
supported parameters can be found here. If not provided, a default
configuration is used. | | List
| *camel.dataformat.any23.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.any23.enabled* | Whether to enable auto configuration of
the any23 data format. This is enabled by default. | | Boolean
| *camel.dataformat.any23.extractors* | List of Any23 extractors to be used in
the unmarshal operation. A list of the available extractors can be found here
here. If not provided, all the available extractors are used. | | List
| *camel.dataformat.any23.output-format* | What RDF syntax to unmarshal as,
can be: NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by
default: RDF4JMODEL. | | Any23OutputFormat
|===
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/rabbitmq-starter.adoc
b/docs/modules/ROOT/pages/rabbitmq-starter.adoc
index 2755514..55134e6 100644
--- a/docs/modules/ROOT/pages/rabbitmq-starter.adoc
+++ b/docs/modules/ROOT/pages/rabbitmq-starter.adoc
@@ -17,7 +17,7 @@ When using rabbitmq with Spring Boot make sure to use the
following Maven depend
----
-The component supports 53 options, which are listed below.
+The component supports 54 options, which are listed below.
@@ -37,6 +37,7 @@ The component supports 53 options, which are listed below.
| *camel.component.rabbitmq.channel-pool-max-wait* | Set the maximum number of
milliseconds to wait for a channel from the pool | 1000 | Long
| *camel.component.rabbitmq.client-properties* | Connection client properties
(client info used in negotiating with the server) | | Map
| *camel.component.rabbitmq.connection-factory* | To use a custom RabbitMQ
connection factory. When this option is set, all connection options
(connectionTimeout, requestedChannelMax...) set on URI are not used. The option
is a com.rabbitmq.client.ConnectionFactory type. | | String
+| *camel.component.rabbitmq.connection-factory-exception-handler* | Custom
rabbitmq ExceptionHandler for ConnectionFactory. The option is a
com.rabbitmq.client.ExceptionHandler type. | | String
| *camel.component.rabbitmq.connection-timeout* | Connection timeout | 60000 |
Integer
| *camel.component.rabbitmq.dead-letter-exchange* | The name of the dead
letter exchange | | String
| *camel.component.rabbitmq.dead-letter-exchange-type* | The type of the dead
letter exchange | direct | String
@@ -78,5 +79,4 @@ The component supports 53 options, which are listed below.
| *camel.component.rabbitmq.username* | Username in case of authenticated
access | guest | String
| *camel.component.rabbitmq.vhost* | The vhost for the channel | / | String
|===
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/xstream-starter.adoc
b/docs/modules/ROOT/pages/xstream-starter.adoc
index 4d52e18..c46bac8 100644
--- a/docs/modules/ROOT/pages/xstream-starter.adoc
+++ b/docs/modules/ROOT/pages/xstream-starter.adoc
@@ -44,16 +44,16 @@ The component supports 31 options, which are listed below.
| *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. | | Map
+| *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. | | Map
+| *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
| *camel.dataformat.xstream.mode* | 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 | | String
-| *camel.dataformat.xstream.omit-fields* | 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. | | Map
+| *camel.dataformat.xstream.omit-fields* | 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. | | List
| *camel.dataformat.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 specify
com.foo.. Multiple permiss [...]
|===
// spring-boot-auto-configure options: END
