This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/camel-master by this push: new 8dc5d68 [create-pull-request] automated change 8dc5d68 is described below commit 8dc5d683c9cf7871a32a9135c43f3896d4807c4f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Mar 17 03:45:52 2021 +0000 [create-pull-request] automated change --- .../connectors/camel-aws-secrets-manager-sink.json | 10 ++-- .../connectors/camel-aws2-sqs-source.json | 8 ++-- .../connectors/camel-spring-rabbitmq-sink.json | 7 +++ .../connectors/camel-spring-rabbitmq-source.json | 54 ++++++++++++++++++++++ .../resources/camel-aws-secrets-manager-sink.json | 10 ++-- ...l-aws-secrets-manager-kafka-sink-connector.adoc | 4 +- .../CamelAwssecretsmanagerSinkConnector.properties | 4 +- .../CamelAwssecretsmanagerSinkConnectorConfig.java | 4 +- .../generated/resources/camel-aws2-sqs-source.json | 8 ++-- .../camel-aws2-sqs-kafka-source-connector.adoc | 4 +- .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java | 8 ++-- .../resources/camel-spring-rabbitmq-sink.json | 7 +++ .../resources/camel-spring-rabbitmq-source.json | 54 ++++++++++++++++++++++ ...camel-spring-rabbitmq-kafka-sink-connector.adoc | 3 +- ...mel-spring-rabbitmq-kafka-source-connector.adoc | 10 +++- .../CamelSpringrabbitmqSinkConnectorConfig.java | 4 ++ .../CamelSpringrabbitmqSourceConnectorConfig.java | 32 +++++++++++++ ...l-aws-secrets-manager-kafka-sink-connector.adoc | 4 +- .../camel-aws2-sqs-kafka-source-connector.adoc | 4 +- ...camel-spring-rabbitmq-kafka-sink-connector.adoc | 3 +- ...mel-spring-rabbitmq-kafka-source-connector.adoc | 10 +++- 21 files changed, 216 insertions(+), 36 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json index 7cf7b7b..9b97334 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink.json @@ -31,14 +31,15 @@ }, "camel.sink.endpoint.operation": { "name": "camel.sink.endpoint.operation", - "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]", + "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]", "priority": "HIGH", "required": "true", "enum": [ "listSecrets", "createSecret", "getSecret", - "describeSecret" + "describeSecret", + "deleteSecret" ] }, "camel.sink.endpoint.overrideEndpoint": { @@ -137,14 +138,15 @@ }, "camel.component.aws-secrets-manager.operation": { "name": "camel.component.aws-secrets-manager.operation", - "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]", + "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]", "priority": "HIGH", "required": "true", "enum": [ "listSecrets", "createSecret", "getSecret", - "describeSecret" + "describeSecret", + "deleteSecret" ] }, "camel.component.aws-secrets-manager.overrideEndpoint": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json index 13ef2ce..0dc497c 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json @@ -133,9 +133,9 @@ }, "camel.source.endpoint.deleteIfFiltered": { "name": "camel.source.endpoint.deleteIfFiltered", - "description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.", + "description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.", "defaultValue": "true", - "priority": "LOW", + "priority": "MEDIUM", "required": "false" }, "camel.source.endpoint.extendMessageVisibility": { @@ -513,9 +513,9 @@ }, "camel.component.aws2-sqs.deleteIfFiltered": { "name": "camel.component.aws2-sqs.deleteIfFiltered", - "description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.", + "description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.", "defaultValue": "true", - "priority": "LOW", + "priority": "MEDIUM", "required": "false" }, "camel.component.aws2-sqs.extendMessageVisibility": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json index b3b495c..1a6a93c 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-sink.json @@ -113,6 +113,13 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.replyTimeout": { + "name": "camel.component.spring-rabbitmq.replyTimeout", + "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.", + "defaultValue": "5000L", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.autowiredEnabled": { "name": "camel.component.spring-rabbitmq.autowiredEnabled", "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.", diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json index 309945c..901ae4f 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-rabbitmq-source.json @@ -131,6 +131,13 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.maximumRetryAttempts": { + "name": "camel.source.endpoint.maximumRetryAttempts", + "description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message", + "defaultValue": "5", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.noLocal": { "name": "camel.source.endpoint.noLocal", "description": "Set to true for an no-local consumer", @@ -144,6 +151,20 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.rejectAndDontRequeue": { + "name": "camel.source.endpoint.rejectAndDontRequeue", + "description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.", + "defaultValue": "true", + "priority": "MEDIUM", + "required": "false" + }, + "camel.source.endpoint.retryDelay": { + "name": "camel.source.endpoint.retryDelay", + "description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process", + "defaultValue": "1000", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.concurrentConsumers": { "name": "camel.source.endpoint.concurrentConsumers", "description": "The number of consumers", @@ -190,6 +211,12 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.retry": { + "name": "camel.source.endpoint.retry", + "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.args": { "name": "camel.source.endpoint.args", "description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000", @@ -286,6 +313,27 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.maximumRetryAttempts": { + "name": "camel.component.spring-rabbitmq.maximumRetryAttempts", + "description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message", + "defaultValue": "5", + "priority": "MEDIUM", + "required": "false" + }, + "camel.component.spring-rabbitmq.rejectAndDontRequeue": { + "name": "camel.component.spring-rabbitmq.rejectAndDontRequeue", + "description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.", + "defaultValue": "true", + "priority": "MEDIUM", + "required": "false" + }, + "camel.component.spring-rabbitmq.retryDelay": { + "name": "camel.component.spring-rabbitmq.retryDelay", + "description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process", + "defaultValue": "1000", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.concurrentConsumers": { "name": "camel.component.spring-rabbitmq.concurrentConsumers", "description": "The number of consumers", @@ -329,6 +377,12 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.retry": { + "name": "camel.component.spring-rabbitmq.retry", + "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.shutdownTimeout": { "name": "camel.component.spring-rabbitmq.shutdownTimeout", "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 can finish within this timeout.", diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json index 7cf7b7b..9b97334 100644 --- a/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json +++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink.json @@ -31,14 +31,15 @@ }, "camel.sink.endpoint.operation": { "name": "camel.sink.endpoint.operation", - "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]", + "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]", "priority": "HIGH", "required": "true", "enum": [ "listSecrets", "createSecret", "getSecret", - "describeSecret" + "describeSecret", + "deleteSecret" ] }, "camel.sink.endpoint.overrideEndpoint": { @@ -137,14 +138,15 @@ }, "camel.component.aws-secrets-manager.operation": { "name": "camel.component.aws-secrets-manager.operation", - "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]", + "description": "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]", "priority": "HIGH", "required": "true", "enum": [ "listSecrets", "createSecret", "getSecret", - "describeSecret" + "describeSecret", + "deleteSecret" ] }, "camel.component.aws-secrets-manager.overrideEndpoint": { diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc index 91a9916..622d793 100644 --- a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc +++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/camel-aws-secrets-manager-kafka-sink-connector.adoc @@ -34,7 +34,7 @@ The camel-aws-secrets-manager sink connector supports 31 options, which are list | *camel.sink.path.label* | Logical name | null | true | HIGH | *camel.sink.endpoint.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM | *camel.sink.endpoint.lazyStartProducer* | 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 then cre [...] -| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] | null | true | HIGH +| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] | null | true | HIGH | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM @@ -49,7 +49,7 @@ The camel-aws-secrets-manager sink connector supports 31 options, which are list | *camel.component.aws-secrets-manager.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM | *camel.component.aws-secrets-manager.configuration* | Component configuration | null | false | MEDIUM | *camel.component.aws-secrets-manager.lazyStart 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 p [...] -| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] | null | true | HIGH +| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] | null | true | HIGH | *camel.component.aws-secrets-manager.override Endpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM | *camel.component.aws-secrets-manager.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM | *camel.component.aws-secrets-manager.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties index 2233c42..7e522b5 100644 --- a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties +++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagerSinkConnector.properties @@ -28,9 +28,9 @@ topics= # mandatory properties (for a complete properties list see the connector documentation): -# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] +# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] camel.component.aws-secrets-manager.operation= -# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] +# The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] camel.sink.endpoint.operation= # Logical name camel.sink.path.label= diff --git a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java index fd049a0..b2e2ca9 100644 --- a/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java +++ b/connectors/camel-aws-secrets-manager-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanager/CamelAwssecretsmanagerSinkConnectorConfig.java @@ -36,7 +36,7 @@ public class CamelAwssecretsmanagerSinkConnectorConfig public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_DOC = "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. Bewa [...] public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false; public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation"; - public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]"; + public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]"; public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OPERATION_DEFAULT = null; public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint"; public static final String CAMEL_SINK_AWSSECRETSMANAGER_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option"; @@ -81,7 +81,7 @@ public class CamelAwssecretsmanagerSinkConnectorConfig public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_DOC = "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. Bew [...] public static final Boolean CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false; public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_CONF = "camel.component.aws-secrets-manager.operation"; - public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret]"; + public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret]"; public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OPERATION_DEFAULT = null; public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws-secrets-manager.overrideEndpoint"; public static final String CAMEL_SINK_AWSSECRETSMANAGER_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option"; diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json index 13ef2ce..0dc497c 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json +++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json @@ -133,9 +133,9 @@ }, "camel.source.endpoint.deleteIfFiltered": { "name": "camel.source.endpoint.deleteIfFiltered", - "description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.", + "description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.", "defaultValue": "true", - "priority": "LOW", + "priority": "MEDIUM", "required": "false" }, "camel.source.endpoint.extendMessageVisibility": { @@ -513,9 +513,9 @@ }, "camel.component.aws2-sqs.deleteIfFiltered": { "name": "camel.component.aws2-sqs.deleteIfFiltered", - "description": "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage.", + "description": "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true.", "defaultValue": "true", - "priority": "LOW", + "priority": "MEDIUM", "required": "false" }, "camel.component.aws2-sqs.extendMessageVisibility": { diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc index f913809..1f125b6 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc +++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc @@ -49,7 +49,7 @@ The camel-aws2-sqs source connector supports 93 options, which are listed below. | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM | *camel.source.endpoint.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM | *camel.source.endpoint.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM -| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | LOW +| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM | *camel.source.endpoint.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM | *camel.source.endpoint.kmsDataKeyReusePeriodSeconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM | *camel.source.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM @@ -104,7 +104,7 @@ The camel-aws2-sqs source connector supports 93 options, which are listed below. | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM | *camel.component.aws2-sqs.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM | *camel.component.aws2-sqs.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM -| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | LOW +| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM | *camel.component.aws2-sqs.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM | *camel.component.aws2-sqs.kmsDataKeyReusePeriod Seconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM | *camel.component.aws2-sqs.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java index 38b6c36..b2f40dc 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java +++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java @@ -81,7 +81,7 @@ public class CamelAws2sqsSourceConnectorConfig public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DOC = "Delete message from SQS after it has been read"; public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DEFAULT = true; public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_CONF = "camel.source.endpoint.deleteIfFiltered"; - public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage."; + public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true."; public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DEFAULT = true; public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_CONF = "camel.source.endpoint.extendMessageVisibility"; public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_DOC = "If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs."; @@ -246,7 +246,7 @@ public class CamelAws2sqsSourceConnectorConfig public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DOC = "Delete message from SQS after it has been read"; public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DEFAULT = true; public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_CONF = "camel.component.aws2-sqs.deleteIfFiltered"; - public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage."; + public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC = "Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true."; public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DEFAULT = true; public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_CONF = "camel.component.aws2-sqs.extendMessageVisibility"; public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_DOC = "If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs."; @@ -336,7 +336,7 @@ public class CamelAws2sqsSourceConnectorConfig conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_DEFAULT_VISIBILITY_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DEFAULT_VISIBILITY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DEFAULT_VISIBILITY_TIMEOUT_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_AFTER_READ_DOC); - conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC); + conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_DELETE_IF_FILTERED_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_EXTEND_MESSAGE_VISIBILITY_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_MASTER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_MASTER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_KMS_MASTER_KEY_ID_DOC); @@ -391,7 +391,7 @@ public class CamelAws2sqsSourceConnectorConfig conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_DEFAULT_VISIBILITY_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_DEFAULT_VISIBILITY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_DEFAULT_VISIBILITY_TIMEOUT_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_AFTER_READ_DOC); - conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC); + conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_DELETE_IF_FILTERED_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_EXTEND_MESSAGE_VISIBILITY_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_DATA_KEY_REUSE_PERIOD_SECONDS_DOC); conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_MASTER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_MASTER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_KMS_MASTER_KEY_ID_DOC); diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json index b3b495c..1a6a93c 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-sink.json @@ -113,6 +113,13 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.replyTimeout": { + "name": "camel.component.spring-rabbitmq.replyTimeout", + "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.", + "defaultValue": "5000L", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.autowiredEnabled": { "name": "camel.component.spring-rabbitmq.autowiredEnabled", "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.", diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json index 309945c..901ae4f 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/generated/resources/camel-spring-rabbitmq-source.json @@ -131,6 +131,13 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.maximumRetryAttempts": { + "name": "camel.source.endpoint.maximumRetryAttempts", + "description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message", + "defaultValue": "5", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.noLocal": { "name": "camel.source.endpoint.noLocal", "description": "Set to true for an no-local consumer", @@ -144,6 +151,20 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.rejectAndDontRequeue": { + "name": "camel.source.endpoint.rejectAndDontRequeue", + "description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.", + "defaultValue": "true", + "priority": "MEDIUM", + "required": "false" + }, + "camel.source.endpoint.retryDelay": { + "name": "camel.source.endpoint.retryDelay", + "description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process", + "defaultValue": "1000", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.concurrentConsumers": { "name": "camel.source.endpoint.concurrentConsumers", "description": "The number of consumers", @@ -190,6 +211,12 @@ "priority": "MEDIUM", "required": "false" }, + "camel.source.endpoint.retry": { + "name": "camel.source.endpoint.retry", + "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.", + "priority": "MEDIUM", + "required": "false" + }, "camel.source.endpoint.args": { "name": "camel.source.endpoint.args", "description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000", @@ -286,6 +313,27 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.maximumRetryAttempts": { + "name": "camel.component.spring-rabbitmq.maximumRetryAttempts", + "description": "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message", + "defaultValue": "5", + "priority": "MEDIUM", + "required": "false" + }, + "camel.component.spring-rabbitmq.rejectAndDontRequeue": { + "name": "camel.component.spring-rabbitmq.rejectAndDontRequeue", + "description": "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is so configured.", + "defaultValue": "true", + "priority": "MEDIUM", + "required": "false" + }, + "camel.component.spring-rabbitmq.retryDelay": { + "name": "camel.component.spring-rabbitmq.retryDelay", + "description": "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process", + "defaultValue": "1000", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.concurrentConsumers": { "name": "camel.component.spring-rabbitmq.concurrentConsumers", "description": "The number of consumers", @@ -329,6 +377,12 @@ "priority": "MEDIUM", "required": "false" }, + "camel.component.spring-rabbitmq.retry": { + "name": "camel.component.spring-rabbitmq.retry", + "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.", + "priority": "MEDIUM", + "required": "false" + }, "camel.component.spring-rabbitmq.shutdownTimeout": { "name": "camel.component.spring-rabbitmq.shutdownTimeout", "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 can finish within this timeout.", diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc index f9ff55f..9880b29 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit ---- -The camel-spring-rabbitmq sink connector supports 21 options, which are listed below. +The camel-spring-rabbitmq sink connector supports 22 options, which are listed below. @@ -47,6 +47,7 @@ The camel-spring-rabbitmq sink connector supports 21 options, which are listed b | *camel.component.spring-rabbitmq.connectionFactory* | The connection factory to be use. A connection factory must be configured either on the component or endpoint. | null | false | MEDIUM | *camel.component.spring-rabbitmq.testConnectionOn 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 | false | MEDIUM | *camel.component.spring-rabbitmq.lazyStartProducer* | 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 proces [...] +| *camel.component.spring-rabbitmq.replyTimeout* | 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. | 5000L | false | MEDIUM | *camel.component.spring-rabbitmq.autowiredEnabled* | 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 | false | MEDIUM | *camel.component.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM | *camel.component.spring-rabbitmq.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc index 467a171..58bb751 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/docs/camel-spring-rabbitmq-kafka-source-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit ---- -The camel-spring-rabbitmq source connector supports 50 options, which are listed below. +The camel-spring-rabbitmq source connector supports 58 options, which are listed below. @@ -47,14 +47,18 @@ The camel-spring-rabbitmq source connector supports 50 options, which are listed | *camel.source.endpoint.deadLetterRoutingKey* | The routing key for the dead letter exchange | null | false | MEDIUM | *camel.source.endpoint.exchangeType* | The type of the exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM | *camel.source.endpoint.exclusive* | Set to true for an exclusive consumer | false | false | MEDIUM +| *camel.source.endpoint.maximumRetryAttempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM | *camel.source.endpoint.noLocal* | Set to true for an no-local consumer | false | false | MEDIUM | *camel.source.endpoint.queues* | 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. | null | false | MEDIUM +| *camel.source.endpoint.rejectAndDontRequeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM +| *camel.source.endpoint.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM | *camel.source.endpoint.concurrentConsumers* | The number of consumers | null | false | MEDIUM | *camel.source.endpoint.exceptionHandler* | 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 exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM | *camel.source.endpoint.maxConcurrentConsumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM | *camel.source.endpoint.messageListenerContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM | *camel.source.endpoint.prefetchCount* | Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput. | null | false | MEDIUM +| *camel.source.endpoint.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM | *camel.source.endpoint.args* | Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000 | null | false | MEDIUM | *camel.source.endpoint.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM | *camel.source.endpoint.messagePropertiesConverter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. | null | false | MEDIUM @@ -69,12 +73,16 @@ The camel-spring-rabbitmq source connector supports 50 options, which are listed | *camel.component.spring-rabbitmq.deadLetterExchange Type* | The type of the dead letter exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM | *camel.component.spring-rabbitmq.deadLetterQueue* | The name of the dead letter queue | null | false | MEDIUM | *camel.component.spring-rabbitmq.deadLetterRouting Key* | The routing key for the dead letter exchange | null | false | MEDIUM +| *camel.component.spring-rabbitmq.maximumRetry Attempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM +| *camel.component.spring-rabbitmq.rejectAndDont Requeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM +| *camel.component.spring-rabbitmq.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM | *camel.component.spring-rabbitmq.concurrent Consumers* | The number of consumers | 1 | false | MEDIUM | *camel.component.spring-rabbitmq.errorHandler* | To use a custom ErrorHandler for handling exceptions from the message listener (consumer) | null | false | MEDIUM | *camel.component.spring-rabbitmq.listenerContainer Factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages | null | false | MEDIUM | *camel.component.spring-rabbitmq.maxConcurrent Consumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM | *camel.component.spring-rabbitmq.messageListener ContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM | *camel.component.spring-rabbitmq.prefetchCount* | 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 | false | MEDIUM +| *camel.component.spring-rabbitmq.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM | *camel.component.spring-rabbitmq.shutdownTimeout* | 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. | 5000L | false | MEDIUM | *camel.component.spring-rabbitmq.autowiredEnabled* | 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 | false | MEDIUM | *camel.component.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java index 3895783..619bfee 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSinkConnectorConfig.java @@ -74,6 +74,9 @@ public class CamelSpringrabbitmqSinkConnectorConfig public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.spring-rabbitmq.lazyStartProducer"; public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DOC = "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 [...] public static final Boolean CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false; + public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_CONF = "camel.component.spring-rabbitmq.replyTimeout"; + public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DOC = "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."; + public static final Long CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DEFAULT = 5000L; public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.spring-rabbitmq.autowiredEnabled"; public static final String CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "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."; public static final Boolean CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true; @@ -119,6 +122,7 @@ public class CamelSpringrabbitmqSinkConnectorConfig conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_CONNECTION_FACTORY_DOC); conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_TEST_CONNECTION_ON_STARTUP_DOC); conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_LAZY_START_PRODUCER_DOC); + conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_REPLY_TIMEOUT_DOC); conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DOC); conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DOC); conf.define(CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SPRINGRABBITMQ_COMPONENT_MESSAGE_CONVERTER_DOC); diff --git a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java index d6cb6c9..7f30c82 100644 --- a/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java +++ b/connectors/camel-spring-rabbitmq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/springrabbitmq/CamelSpringrabbitmqSourceConnectorConfig.java @@ -74,12 +74,21 @@ public class CamelSpringrabbitmqSourceConnectorConfig public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_CONF = "camel.source.endpoint.exclusive"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DOC = "Set to true for an exclusive consumer"; public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DEFAULT = false; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_CONF = "camel.source.endpoint.maximumRetryAttempts"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DOC = "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message"; + public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT = 5; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_CONF = "camel.source.endpoint.noLocal"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DOC = "Set to true for an no-local consumer"; public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DEFAULT = false; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_CONF = "camel.source.endpoint.queues"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DOC = "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."; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DEFAULT = null; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_CONF = "camel.source.endpoint.rejectAndDontRequeue"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DOC = "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured."; + public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DEFAULT = true; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_CONF = "camel.source.endpoint.retryDelay"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DOC = "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process"; + public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DEFAULT = 1000; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_CONF = "camel.source.endpoint.concurrentConsumers"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DOC = "The number of consumers"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT = null; @@ -98,6 +107,9 @@ public class CamelSpringrabbitmqSourceConnectorConfig public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_CONF = "camel.source.endpoint.prefetchCount"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DOC = "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput."; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DEFAULT = null; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_CONF = "camel.source.endpoint.retry"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DOC = "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use."; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DEFAULT = null; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_CONF = "camel.source.endpoint.args"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DOC = "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DEFAULT = null; @@ -140,6 +152,15 @@ public class CamelSpringrabbitmqSourceConnectorConfig public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_CONF = "camel.component.spring-rabbitmq.deadLetterRoutingKey"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DOC = "The routing key for the dead letter exchange"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DEFAULT = null; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_CONF = "camel.component.spring-rabbitmq.maximumRetryAttempts"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DOC = "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message"; + public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT = 5; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_CONF = "camel.component.spring-rabbitmq.rejectAndDontRequeue"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DOC = "Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured."; + public static final Boolean CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DEFAULT = true; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_CONF = "camel.component.spring-rabbitmq.retryDelay"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DOC = "Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process"; + public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DEFAULT = 1000; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_CONF = "camel.component.spring-rabbitmq.concurrentConsumers"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DOC = "The number of consumers"; public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT = 1; @@ -158,6 +179,9 @@ public class CamelSpringrabbitmqSourceConnectorConfig public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_CONF = "camel.component.spring-rabbitmq.prefetchCount"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DOC = "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."; public static final Integer CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DEFAULT = 250; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_CONF = "camel.component.spring-rabbitmq.retry"; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DOC = "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use."; + public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DEFAULT = null; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_CONF = "camel.component.spring-rabbitmq.shutdownTimeout"; public static final String CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DOC = "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."; public static final Long CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DEFAULT = 5000L; @@ -206,14 +230,18 @@ public class CamelSpringrabbitmqSourceConnectorConfig conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_DEAD_LETTER_ROUTING_KEY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_TYPE_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCLUSIVE_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAXIMUM_RETRY_ATTEMPTS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_NO_LOCAL_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_QUEUES_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_REJECT_AND_DONT_REQUEUE_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DELAY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCEPTION_HANDLER_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_EXCHANGE_PATTERN_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MAX_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_PREFETCH_COUNT_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_RETRY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_ARGS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_CONVERTER_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_ENDPOINT_MESSAGE_PROPERTIES_CONVERTER_DOC); @@ -228,12 +256,16 @@ public class CamelSpringrabbitmqSourceConnectorConfig conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_EXCHANGE_TYPE_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_QUEUE_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_DEAD_LETTER_ROUTING_KEY_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAXIMUM_RETRY_ATTEMPTS_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_REJECT_AND_DONT_REQUEUE_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DELAY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_ERROR_HANDLER_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_LISTENER_CONTAINER_FACTORY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MAX_CONCURRENT_CONSUMERS_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_MESSAGE_LISTENER_CONTAINER_TYPE_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_PREFETCH_COUNT_DOC); + conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_RETRY_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_SHUTDOWN_TIMEOUT_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_AUTOWIRED_ENABLED_DOC); conf.define(CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SPRINGRABBITMQ_COMPONENT_IGNORE_DECLARATION_EXCEPTIONS_DOC); diff --git a/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc index 91a9916..622d793 100644 --- a/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-aws-secrets-manager-kafka-sink-connector.adoc @@ -34,7 +34,7 @@ The camel-aws-secrets-manager sink connector supports 31 options, which are list | *camel.sink.path.label* | Logical name | null | true | HIGH | *camel.sink.endpoint.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM | *camel.sink.endpoint.lazyStartProducer* | 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 then cre [...] -| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] | null | true | HIGH +| *camel.sink.endpoint.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] | null | true | HIGH | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM @@ -49,7 +49,7 @@ The camel-aws-secrets-manager sink connector supports 31 options, which are list | *camel.component.aws-secrets-manager.binaryPayload* | Set if the secret is binary or not | false | false | MEDIUM | *camel.component.aws-secrets-manager.configuration* | Component configuration | null | false | MEDIUM | *camel.component.aws-secrets-manager.lazyStart 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 p [...] -| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] | null | true | HIGH +| *camel.component.aws-secrets-manager.operation* | The operation to perform One of: [listSecrets] [createSecret] [getSecret] [describeSecret] [deleteSecret] | null | true | HIGH | *camel.component.aws-secrets-manager.override Endpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM | *camel.component.aws-secrets-manager.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM | *camel.component.aws-secrets-manager.proxyHost* | To define a proxy host when instantiating the Secrets Manager client | null | false | MEDIUM diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc index f913809..1f125b6 100644 --- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc @@ -49,7 +49,7 @@ The camel-aws2-sqs source connector supports 93 options, which are listed below. | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM | *camel.source.endpoint.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM | *camel.source.endpoint.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM -| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | LOW +| *camel.source.endpoint.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM | *camel.source.endpoint.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM | *camel.source.endpoint.kmsDataKeyReusePeriodSeconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM | *camel.source.endpoint.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM @@ -104,7 +104,7 @@ The camel-aws2-sqs source connector supports 93 options, which are listed below. | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM | *camel.component.aws2-sqs.defaultVisibilityTimeout* | The default visibility timeout (in seconds) | null | false | MEDIUM | *camel.component.aws2-sqs.deleteAfterRead* | Delete message from SQS after it has been read | true | false | MEDIUM -| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | false | LOW +| *camel.component.aws2-sqs.deleteIfFiltered* | Whether or not to send the DeleteMessage to the SQS queue if the exchange has property with key Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. | true | false | MEDIUM | *camel.component.aws2-sqs.extendMessageVisibility* | If enabled then a scheduled background task will keep extending the message visibility on SQS. This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. See details at Amazon docs. | false | false | MEDIUM | *camel.component.aws2-sqs.kmsDataKeyReusePeriod Seconds* | The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5 minutes). | null | false | MEDIUM | *camel.component.aws2-sqs.kmsMasterKeyId* | The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. | null | false | MEDIUM diff --git a/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-sink-connector.adoc index f9ff55f..9880b29 100644 --- a/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit ---- -The camel-spring-rabbitmq sink connector supports 21 options, which are listed below. +The camel-spring-rabbitmq sink connector supports 22 options, which are listed below. @@ -47,6 +47,7 @@ The camel-spring-rabbitmq sink connector supports 21 options, which are listed b | *camel.component.spring-rabbitmq.connectionFactory* | The connection factory to be use. A connection factory must be configured either on the component or endpoint. | null | false | MEDIUM | *camel.component.spring-rabbitmq.testConnectionOn 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 | false | MEDIUM | *camel.component.spring-rabbitmq.lazyStartProducer* | 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 proces [...] +| *camel.component.spring-rabbitmq.replyTimeout* | 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. | 5000L | false | MEDIUM | *camel.component.spring-rabbitmq.autowiredEnabled* | 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 | false | MEDIUM | *camel.component.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM | *camel.component.spring-rabbitmq.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM diff --git a/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-source-connector.adoc index 467a171..58bb751 100644 --- a/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-source-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-spring-rabbitmq-kafka-source-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.springrabbitmq.CamelSpringrabbit ---- -The camel-spring-rabbitmq source connector supports 50 options, which are listed below. +The camel-spring-rabbitmq source connector supports 58 options, which are listed below. @@ -47,14 +47,18 @@ The camel-spring-rabbitmq source connector supports 50 options, which are listed | *camel.source.endpoint.deadLetterRoutingKey* | The routing key for the dead letter exchange | null | false | MEDIUM | *camel.source.endpoint.exchangeType* | The type of the exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM | *camel.source.endpoint.exclusive* | Set to true for an exclusive consumer | false | false | MEDIUM +| *camel.source.endpoint.maximumRetryAttempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM | *camel.source.endpoint.noLocal* | Set to true for an no-local consumer | false | false | MEDIUM | *camel.source.endpoint.queues* | 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. | null | false | MEDIUM +| *camel.source.endpoint.rejectAndDontRequeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM +| *camel.source.endpoint.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM | *camel.source.endpoint.concurrentConsumers* | The number of consumers | null | false | MEDIUM | *camel.source.endpoint.exceptionHandler* | 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 exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM | *camel.source.endpoint.maxConcurrentConsumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM | *camel.source.endpoint.messageListenerContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM | *camel.source.endpoint.prefetchCount* | Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput. | null | false | MEDIUM +| *camel.source.endpoint.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM | *camel.source.endpoint.args* | Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.binding. arg.dlq.exchange. arg.dlq.queue. arg.dlq.binding. For example to declare a queue with message ttl argument: args=arg.queue.x-message-ttl=60000 | null | false | MEDIUM | *camel.source.endpoint.messageConverter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. | null | false | MEDIUM | *camel.source.endpoint.messagePropertiesConverter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. | null | false | MEDIUM @@ -69,12 +73,16 @@ The camel-spring-rabbitmq source connector supports 50 options, which are listed | *camel.component.spring-rabbitmq.deadLetterExchange Type* | The type of the dead letter exchange One of: [direct] [fanout] [headers] [topic] | "direct" | false | MEDIUM | *camel.component.spring-rabbitmq.deadLetterQueue* | The name of the dead letter queue | null | false | MEDIUM | *camel.component.spring-rabbitmq.deadLetterRouting Key* | The routing key for the dead letter exchange | null | false | MEDIUM +| *camel.component.spring-rabbitmq.maximumRetry Attempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | false | MEDIUM +| *camel.component.spring-rabbitmq.rejectAndDont Requeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | false | MEDIUM +| *camel.component.spring-rabbitmq.retryDelay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | false | MEDIUM | *camel.component.spring-rabbitmq.concurrent Consumers* | The number of consumers | 1 | false | MEDIUM | *camel.component.spring-rabbitmq.errorHandler* | To use a custom ErrorHandler for handling exceptions from the message listener (consumer) | null | false | MEDIUM | *camel.component.spring-rabbitmq.listenerContainer Factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages | null | false | MEDIUM | *camel.component.spring-rabbitmq.maxConcurrent Consumers* | The maximum number of consumers (available only with SMLC) | null | false | MEDIUM | *camel.component.spring-rabbitmq.messageListener ContainerType* | The type of the MessageListenerContainer One of: [DMLC] [SMLC] | "DMLC" | false | MEDIUM | *camel.component.spring-rabbitmq.prefetchCount* | 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 | false | MEDIUM +| *camel.component.spring-rabbitmq.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. | null | false | MEDIUM | *camel.component.spring-rabbitmq.shutdownTimeout* | 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. | 5000L | false | MEDIUM | *camel.component.spring-rabbitmq.autowiredEnabled* | 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 | false | MEDIUM | *camel.component.spring-rabbitmq.ignoreDeclaration Exceptions* | Switch on ignore exceptions such as mismatched properties when declaring | false | false | MEDIUM