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 00eb509 [create-pull-request] automated change 00eb509 is described below commit 00eb509bc96cd404e37d961fb4be4bf2c3f1b305 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Mar 9 00:46:29 2021 +0000 [create-pull-request] automated change --- .../springboot/catalog/components/netty-http.json | 2 ++ .../camel/springboot/catalog/components/netty.json | 2 ++ .../catalog/components/spring-rabbitmq.json | 6 ++++ components-starter/camel-corda-starter/pom.xml | 8 ----- components-starter/camel-iota-starter/pom.xml | 12 ------- .../src/main/docs/netty-http-starter.adoc | 3 +- .../NettyHttpComponentConfiguration.java | 12 +++++++ .../src/main/docs/netty-starter.adoc | 3 +- .../springboot/NettyComponentConfiguration.java | 12 +++++++ .../src/main/docs/spring-rabbitmq-starter.adoc | 7 ++-- .../SpringRabbitMQComponentConfiguration.java | 37 ++++++++++++++++++++++ docs/modules/ROOT/pages/netty-http-starter.adoc | 3 +- docs/modules/ROOT/pages/netty-starter.adoc | 3 +- .../ROOT/pages/spring-rabbitmq-starter.adoc | 7 ++-- 14 files changed, 87 insertions(+), 30 deletions(-) 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 3cec499..fef5b75 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 @@ -61,6 +61,7 @@ "producerPoolMinIdle": { "kind": "property", "displayName": "Producer Pool Min Idle", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Sets the minimum number of instances allowed in the producer pool before the evictor thread ( [...] "udpConnectionlessSending": { "kind": "property", "displayName": "Udp Connectionless Sending", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "This option supports connection less udp sending which is [...] "useByteBuf": { "kind": "property", "displayName": "Use Byte Buf", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "If the useByteBuf is true, netty producer will turn the message body into ByteBuf bef [...] + "hostnameVerification": { "kind": "property", "displayName": "Hostname Verification", "group": " security", "label": "common, security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To enable\/disable hostname verification on SSLEngine" }, "allowSerializedHeaders": { "kind": "property", "displayName": "Allow Serialized Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP when transferExchange is true. When set to true, serializable o [...] "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] "channelGroup": { "kind": "property", "displayName": "Channel Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.group.ChannelGroup", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To use a explicit ChannelGroup." }, @@ -150,6 +151,7 @@ "producerPoolMinEvictableIdle": { "kind": "parameter", "displayName": "Producer Pool Min Evictable Idle", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Sets the minimum amount of time (value [...] "producerPoolMinIdle": { "kind": "parameter", "displayName": "Producer Pool Min Idle", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Sets the minimum number of instances allowed in the producer pool before the evicto [...] "useRelativePath": { "kind": "parameter", "displayName": "Use Relative Path", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Sets whether to use a relative path in HTTP requests." }, + "hostnameVerification": { "kind": "parameter", "displayName": "Hostname Verification", "group": " security", "label": "common, security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "To enable\/disable hostname verification on SSLEngine" }, "allowSerializedHeaders": { "kind": "parameter", "displayName": "Allow Serialized Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Only used for TCP when transferExchange is true. When set to true, seri [...] "channelGroup": { "kind": "parameter", "displayName": "Channel Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.group.ChannelGroup", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "To use a explicit ChannelGroup." }, "configuration": { "kind": "parameter", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom configured NettyHttpConfiguration for configuring this endpoint." }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json index 35e9b5c..3fd5450 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json @@ -60,6 +60,7 @@ "producerPoolMinIdle": { "kind": "property", "displayName": "Producer Pool Min Idle", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Sets the minimum number of instances allowed in the producer pool before the evictor thread ( [...] "udpConnectionlessSending": { "kind": "property", "displayName": "Udp Connectionless Sending", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "This option supports connection less udp sending which is [...] "useByteBuf": { "kind": "property", "displayName": "Use Byte Buf", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "If the useByteBuf is true, netty producer will turn the message body into ByteBuf bef [...] + "hostnameVerification": { "kind": "property", "displayName": "Hostname Verification", "group": " security", "label": "common, security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To enable\/disable hostname verification on SSLEngine" }, "allowSerializedHeaders": { "kind": "property", "displayName": "Allow Serialized Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP when transferExchange is true. When set to true, serializable o [...] "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] "channelGroup": { "kind": "property", "displayName": "Channel Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.group.ChannelGroup", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To use a explicit ChannelGroup." }, @@ -136,6 +137,7 @@ "producerPoolMinIdle": { "kind": "parameter", "displayName": "Producer Pool Min Idle", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Sets the minimum number of instances allowed in the producer pool before the evictor thread [...] "udpConnectionlessSending": { "kind": "parameter", "displayName": "Udp Connectionless Sending", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "This option supports connection less udp sending which i [...] "useByteBuf": { "kind": "parameter", "displayName": "Use Byte Buf", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "If the useByteBuf is true, netty producer will turn the message body into ByteBuf be [...] + "hostnameVerification": { "kind": "parameter", "displayName": "Hostname Verification", "group": " security", "label": "common, security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To enable\/disable hostname verification on SSLEngine" }, "allowSerializedHeaders": { "kind": "parameter", "displayName": "Allow Serialized Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP when transferExchange is true. When set to true, serializable [...] "channelGroup": { "kind": "parameter", "displayName": "Channel Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.group.ChannelGroup", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To use a explicit ChannelGroup." }, "nativeTransport": { "kind": "parameter", "displayName": "Native Transport", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Whether to use native transport instead of NIO. Native transport takes advantage of the host op [...] diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json index 10fef0a..6a4c1dc 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json @@ -32,8 +32,11 @@ "deadLetterExchangeType": { "kind": "property", "displayName": "Dead Letter Exchange Type", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "direct", "fanout", "headers", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "direct", "description": "The type of the dead letter exchange" }, "deadLetterQueue": { "kind": "property", "displayName": "Dead Letter Queue", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the dead letter queue" }, "deadLetterRoutingKey": { "kind": "property", "displayName": "Dead Letter Routing Key", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The routing key for the dead letter exchange" }, + "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "The number of consumers" }, "errorHandler": { "kind": "property", "displayName": "Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ErrorHandler for handling exceptions from the message listener (consumer)" }, "listenerContainerFactory": { "kind": "property", "displayName": "Listener Container Factory", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.springrabbit.ListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages" }, + "maxConcurrentConsumers": { "kind": "property", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, + "messageListenerContainerType": { "kind": "property", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "kind": "property", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 250, "description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput." }, "shutdownTimeout": { "kind": "property", "displayName": "Shutdown Timeout", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they c [...] "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 star [...] @@ -62,8 +65,11 @@ "exclusive": { "kind": "parameter", "displayName": "Exclusive", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true for an exclusive consumer" }, "noLocal": { "kind": "parameter", "displayName": "No Local", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true for an no-local consumer" }, "queues": { "kind": "parameter", "displayName": "Queues", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The queue(s) to use for consuming messages. Multiple queue names can be separated by comma. If none has been configured then Camel will generate an unique id as the queue name for the consumer." }, + "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The number of consumers" }, "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, "autowired": 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 con [...] "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, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." }, + "maxConcurrentConsumers": { "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, + "messageListenerContainerType": { "kind": "parameter", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "kind": "parameter", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput." }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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 sta [...] "replyTimeout": { "kind": "parameter", "displayName": "Reply Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request\/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout." }, diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 4aa7023..b215b27 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -41,14 +41,6 @@ <!--START OF GENERATED CODE--> <exclusions> <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </exclusion> diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml index 3656ac0..1cdd52f 100644 --- a/components-starter/camel-iota-starter/pom.xml +++ b/components-starter/camel-iota-starter/pom.xml @@ -38,18 +38,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-iota</artifactId> <version>${camel-version}</version> - <!--START OF GENERATED CODE--> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc b/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc index 6b0edd4..c1bf19b 100644 --- a/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc +++ b/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc @@ -17,7 +17,7 @@ When using netty-http with Spring Boot make sure to use the following Maven depe ---- -The component supports 62 options, which are listed below. +The component supports 63 options, which are listed below. @@ -43,6 +43,7 @@ The component supports 62 options, which are listed below. | *camel.component.netty-http.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List | *camel.component.netty-http.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | EventExecutorGroup | *camel.component.netty-http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | HeaderFilterStrategy +| *camel.component.netty-http.hostname-verification* | To enable/disable hostname verification on SSLEngine | false | Boolean | *camel.component.netty-http.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean | *camel.component.netty-http.key-store-file* | Client side certificate keystore to be used for encryption | | File | *camel.component.netty-http.key-store-format* | Keystore format to be used for payload encryption. Defaults to JKS if not set | | String diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java index 59f4cb9..c3ca3a2 100644 --- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java +++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java @@ -260,6 +260,10 @@ public class NettyHttpComponentConfiguration */ private Integer producerPoolMinIdle; /** + * To enable/disable hostname verification on SSLEngine + */ + private Boolean hostnameVerification = false; + /** * Only used for TCP when transferExchange is true. When set to true, * serializable objects in headers and properties will be added to the * exchange. Otherwise Camel will exclude any non-serializable objects and @@ -686,6 +690,14 @@ public class NettyHttpComponentConfiguration this.producerPoolMinIdle = producerPoolMinIdle; } + public Boolean getHostnameVerification() { + return hostnameVerification; + } + + public void setHostnameVerification(Boolean hostnameVerification) { + this.hostnameVerification = hostnameVerification; + } + public Boolean getAllowSerializedHeaders() { return allowSerializedHeaders; } diff --git a/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc b/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc index dc3e182..7bbc847 100644 --- a/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc +++ b/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc @@ -17,7 +17,7 @@ When using netty with Spring Boot make sure to use the following Maven dependenc ---- -The component supports 73 options, which are listed below. +The component supports 74 options, which are listed below. @@ -49,6 +49,7 @@ The component supports 73 options, which are listed below. | *camel.component.netty.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List | *camel.component.netty.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String | *camel.component.netty.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | EventExecutorGroup +| *camel.component.netty.hostname-verification* | To enable/disable hostname verification on SSLEngine | false | Boolean | *camel.component.netty.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean | *camel.component.netty.key-store-file* | Client side certificate keystore to be used for encryption | | File | *camel.component.netty.key-store-format* | Keystore format to be used for payload encryption. Defaults to JKS if not set | | String diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java index a199f49..815e6f7 100644 --- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java +++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java @@ -293,6 +293,10 @@ public class NettyComponentConfiguration */ private Boolean useByteBuf = false; /** + * To enable/disable hostname verification on SSLEngine + */ + private Boolean hostnameVerification = false; + /** * Only used for TCP when transferExchange is true. When set to true, * serializable objects in headers and properties will be added to the * exchange. Otherwise Camel will exclude any non-serializable objects and @@ -794,6 +798,14 @@ public class NettyComponentConfiguration this.useByteBuf = useByteBuf; } + public Boolean getHostnameVerification() { + return hostnameVerification; + } + + public void setHostnameVerification(Boolean hostnameVerification) { + this.hostnameVerification = hostnameVerification; + } + public Boolean getAllowSerializedHeaders() { return allowSerializedHeaders; } diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq-starter.adoc b/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq-starter.adoc index 0bd8593..89d4cb6 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq-starter.adoc +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq-starter.adoc @@ -17,7 +17,7 @@ When using spring-rabbitmq with Spring Boot make sure to use the following Maven ---- -The component supports 21 options, which are listed below. +The component supports 24 options, which are listed below. @@ -29,6 +29,7 @@ The component supports 21 options, which are listed below. | *camel.component.spring-rabbitmq.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean | *camel.component.spring-rabbitmq.autowired-enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | Boolean | *camel.component.spring-rabbitmq.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.spring-rabbitmq.concurrent-consumers* | The number of consumers | 1 | Integer | *camel.component.spring-rabbitmq.connection-factory* | The connection factory to be use. A connection factory must be configured either on the component or endpoint. The option is a org.springframework.amqp.rabbit.connection.ConnectionFactory type. | | ConnectionFactory | *camel.component.spring-rabbitmq.dead-letter-exchange* | The name of the dead letter exchange | | String | *camel.component.spring-rabbitmq.dead-letter-exchange-type* | The type of the dead letter exchange | direct | String @@ -40,12 +41,12 @@ The component supports 21 options, which are listed below. | *camel.component.spring-rabbitmq.ignore-declaration-exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | Boolean | *camel.component.spring-rabbitmq.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 proc [...] | *camel.component.spring-rabbitmq.listener-container-factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages. The option is a org.apache.camel.component.springrabbit.ListenerContainerFactory type. | | ListenerContainerFactory +| *camel.component.spring-rabbitmq.max-concurrent-consumers* | The maximum number of consumers (available only with SMLC) | | Integer | *camel.component.spring-rabbitmq.message-converter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. The option is a org.springframework.amqp.support.converter.MessageConverter type. | | MessageConverter +| *camel.component.spring-rabbitmq.message-listener-container-type* | The type of the MessageListenerContainer | DMLC | String | *camel.component.spring-rabbitmq.message-properties-converter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. The option is a org.apache.camel.component.springrabbit.MessagePropertiesConverter type. | | MessagePropertiesConverter | *camel.component.spring-rabbitmq.prefetch-count* | Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput. | 250 | Integer | *camel.component.spring-rabbitmq.shutdown-timeout* | The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout. The option is a long type. | 5000 | Long | *camel.component.spring-rabbitmq.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean |=== - - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java index 308b0cd..a38c317 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java @@ -100,6 +100,10 @@ public class SpringRabbitMQComponentConfiguration */ private String deadLetterRoutingKey; /** + * The number of consumers + */ + private Integer concurrentConsumers = 1; + /** * To use a custom ErrorHandler for handling exceptions from the message * listener (consumer). The option is a * org.springframework.util.ErrorHandler type. @@ -112,6 +116,14 @@ public class SpringRabbitMQComponentConfiguration */ private ListenerContainerFactory listenerContainerFactory; /** + * The maximum number of consumers (available only with SMLC) + */ + private Integer maxConcurrentConsumers; + /** + * The type of the MessageListenerContainer + */ + private String messageListenerContainerType = "DMLC"; + /** * Tell the broker how many messages to send to each consumer in a single * request. Often this can be set quite high to improve throughput. */ @@ -247,6 +259,14 @@ public class SpringRabbitMQComponentConfiguration this.deadLetterRoutingKey = deadLetterRoutingKey; } + public Integer getConcurrentConsumers() { + return concurrentConsumers; + } + + public void setConcurrentConsumers(Integer concurrentConsumers) { + this.concurrentConsumers = concurrentConsumers; + } + public ErrorHandler getErrorHandler() { return errorHandler; } @@ -264,6 +284,23 @@ public class SpringRabbitMQComponentConfiguration this.listenerContainerFactory = listenerContainerFactory; } + public Integer getMaxConcurrentConsumers() { + return maxConcurrentConsumers; + } + + public void setMaxConcurrentConsumers(Integer maxConcurrentConsumers) { + this.maxConcurrentConsumers = maxConcurrentConsumers; + } + + public String getMessageListenerContainerType() { + return messageListenerContainerType; + } + + public void setMessageListenerContainerType( + String messageListenerContainerType) { + this.messageListenerContainerType = messageListenerContainerType; + } + public Integer getPrefetchCount() { return prefetchCount; } diff --git a/docs/modules/ROOT/pages/netty-http-starter.adoc b/docs/modules/ROOT/pages/netty-http-starter.adoc index 6b0edd4..c1bf19b 100644 --- a/docs/modules/ROOT/pages/netty-http-starter.adoc +++ b/docs/modules/ROOT/pages/netty-http-starter.adoc @@ -17,7 +17,7 @@ When using netty-http with Spring Boot make sure to use the following Maven depe ---- -The component supports 62 options, which are listed below. +The component supports 63 options, which are listed below. @@ -43,6 +43,7 @@ The component supports 62 options, which are listed below. | *camel.component.netty-http.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List | *camel.component.netty-http.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | EventExecutorGroup | *camel.component.netty-http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | HeaderFilterStrategy +| *camel.component.netty-http.hostname-verification* | To enable/disable hostname verification on SSLEngine | false | Boolean | *camel.component.netty-http.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean | *camel.component.netty-http.key-store-file* | Client side certificate keystore to be used for encryption | | File | *camel.component.netty-http.key-store-format* | Keystore format to be used for payload encryption. Defaults to JKS if not set | | String diff --git a/docs/modules/ROOT/pages/netty-starter.adoc b/docs/modules/ROOT/pages/netty-starter.adoc index dc3e182..7bbc847 100644 --- a/docs/modules/ROOT/pages/netty-starter.adoc +++ b/docs/modules/ROOT/pages/netty-starter.adoc @@ -17,7 +17,7 @@ When using netty with Spring Boot make sure to use the following Maven dependenc ---- -The component supports 73 options, which are listed below. +The component supports 74 options, which are listed below. @@ -49,6 +49,7 @@ The component supports 73 options, which are listed below. | *camel.component.netty.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List | *camel.component.netty.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String | *camel.component.netty.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | EventExecutorGroup +| *camel.component.netty.hostname-verification* | To enable/disable hostname verification on SSLEngine | false | Boolean | *camel.component.netty.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean | *camel.component.netty.key-store-file* | Client side certificate keystore to be used for encryption | | File | *camel.component.netty.key-store-format* | Keystore format to be used for payload encryption. Defaults to JKS if not set | | String diff --git a/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc b/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc index 0bd8593..89d4cb6 100644 --- a/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc +++ b/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc @@ -17,7 +17,7 @@ When using spring-rabbitmq with Spring Boot make sure to use the following Maven ---- -The component supports 21 options, which are listed below. +The component supports 24 options, which are listed below. @@ -29,6 +29,7 @@ The component supports 21 options, which are listed below. | *camel.component.spring-rabbitmq.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean | *camel.component.spring-rabbitmq.autowired-enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | Boolean | *camel.component.spring-rabbitmq.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.spring-rabbitmq.concurrent-consumers* | The number of consumers | 1 | Integer | *camel.component.spring-rabbitmq.connection-factory* | The connection factory to be use. A connection factory must be configured either on the component or endpoint. The option is a org.springframework.amqp.rabbit.connection.ConnectionFactory type. | | ConnectionFactory | *camel.component.spring-rabbitmq.dead-letter-exchange* | The name of the dead letter exchange | | String | *camel.component.spring-rabbitmq.dead-letter-exchange-type* | The type of the dead letter exchange | direct | String @@ -40,12 +41,12 @@ The component supports 21 options, which are listed below. | *camel.component.spring-rabbitmq.ignore-declaration-exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | Boolean | *camel.component.spring-rabbitmq.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 proc [...] | *camel.component.spring-rabbitmq.listener-container-factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages. The option is a org.apache.camel.component.springrabbit.ListenerContainerFactory type. | | ListenerContainerFactory +| *camel.component.spring-rabbitmq.max-concurrent-consumers* | The maximum number of consumers (available only with SMLC) | | Integer | *camel.component.spring-rabbitmq.message-converter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. The option is a org.springframework.amqp.support.converter.MessageConverter type. | | MessageConverter +| *camel.component.spring-rabbitmq.message-listener-container-type* | The type of the MessageListenerContainer | DMLC | String | *camel.component.spring-rabbitmq.message-properties-converter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. The option is a org.apache.camel.component.springrabbit.MessagePropertiesConverter type. | | MessagePropertiesConverter | *camel.component.spring-rabbitmq.prefetch-count* | Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput. | 250 | Integer | *camel.component.spring-rabbitmq.shutdown-timeout* | The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout. The option is a long type. | 5000 | Long | *camel.component.spring-rabbitmq.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean |=== - - // spring-boot-auto-configure options: END