This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 28640d83f66 CAMEL-19008: Regen
28640d83f66 is described below
commit 28640d83f66fc959c0677dbc92a12485505bc259
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 9 07:06:57 2023 +0100
CAMEL-19008: Regen
---
.../org/apache/camel/catalog/components/spring-rabbitmq.json | 4 ++--
.../org/apache/camel/component/springrabbit/spring-rabbitmq.json | 4 ++--
.../camel/component/springrabbit/SpringRabbitMQEndpoint.java | 7 +++----
.../builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java | 7 ++++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
index b11bbef4c2f..093007336a6 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
@@ -76,7 +76,7 @@
"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, "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." },
"rejectAndDontRequeue": { "kind": "parameter", "displayName": "Reject And
Dont Requeue", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "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." },
- "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in msec a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
+ "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in millis a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"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 [...]
@@ -85,7 +85,7 @@
"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." },
"retry": { "kind": "parameter", "displayName": "Retry", "group": "consumer
(advanced)", "label": "consumer,advanced", "required": false, "type": "object",
"javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor",
"deprecated": false, "autowired": false, "secret": false, "description":
"Custom retry configuration to use. If this is configured then the other
settings such as maximumRetryAttempts for retry are not in use." },
- "confirm": { "kind": "parameter", "displayName": "Confirm", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ],
"deprecated": false, "autowired": false, "secret": false, "description":
"Controls whether to wait for confirms. The connection factory must be
configured for publisher confirms and this method.auto = Camel detects if the
connection factory uses confirms or not. disabled = [...]
+ "confirm": { "kind": "parameter", "displayName": "Confirm", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Controls whether to wait for confirms. The connection
factory must be configured for publisher confirms and this method. auto = Camel
detects if the connection factory uses con [...]
"confirmTimeout": { "kind": "parameter", "displayName": "Confirm 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 message sent to be confirmed by
RabbitMQ when doing send only messaging (InOnly). The default value is 5
seconds. A negative value indicates an inde [...]
"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 (InOut) messaging. The default value is 5 seconds. A negative
value indicates an indefinite timeout." },
"usePublisherConnection": { "kind": "parameter", "displayName": "Use
Publisher Connection", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Use
a separate connection for publishers and consumers" },
diff --git
a/components/camel-spring-rabbitmq/src/generated/resources/org/apache/camel/component/springrabbit/spring-rabbitmq.json
b/components/camel-spring-rabbitmq/src/generated/resources/org/apache/camel/component/springrabbit/spring-rabbitmq.json
index b11bbef4c2f..093007336a6 100644
---
a/components/camel-spring-rabbitmq/src/generated/resources/org/apache/camel/component/springrabbit/spring-rabbitmq.json
+++
b/components/camel-spring-rabbitmq/src/generated/resources/org/apache/camel/component/springrabbit/spring-rabbitmq.json
@@ -76,7 +76,7 @@
"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, "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." },
"rejectAndDontRequeue": { "kind": "parameter", "displayName": "Reject And
Dont Requeue", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "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." },
- "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in msec a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
+ "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in millis a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"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 [...]
@@ -85,7 +85,7 @@
"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." },
"retry": { "kind": "parameter", "displayName": "Retry", "group": "consumer
(advanced)", "label": "consumer,advanced", "required": false, "type": "object",
"javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor",
"deprecated": false, "autowired": false, "secret": false, "description":
"Custom retry configuration to use. If this is configured then the other
settings such as maximumRetryAttempts for retry are not in use." },
- "confirm": { "kind": "parameter", "displayName": "Confirm", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ],
"deprecated": false, "autowired": false, "secret": false, "description":
"Controls whether to wait for confirms. The connection factory must be
configured for publisher confirms and this method.auto = Camel detects if the
connection factory uses confirms or not. disabled = [...]
+ "confirm": { "kind": "parameter", "displayName": "Confirm", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Controls whether to wait for confirms. The connection
factory must be configured for publisher confirms and this method. auto = Camel
detects if the connection factory uses con [...]
"confirmTimeout": { "kind": "parameter", "displayName": "Confirm 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 message sent to be confirmed by
RabbitMQ when doing send only messaging (InOnly). The default value is 5
seconds. A negative value indicates an inde [...]
"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 (InOut) messaging. The default value is 5 seconds. A negative
value indicates an indefinite timeout." },
"usePublisherConnection": { "kind": "parameter", "displayName": "Use
Publisher Connection", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Use
a separate connection for publishers and consumers" },
diff --git
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
index 1a9caa5107e..25304e0d215 100644
---
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
+++
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
@@ -154,10 +154,9 @@ public class SpringRabbitMQEndpoint extends
DefaultEndpoint implements AsyncEndp
description = "Specify the timeout in milliseconds to be used
when waiting for a message sent to be confirmed by RabbitMQ when doing send
only messaging (InOnly)."
+ " The default value is 5 seconds. A negative
value indicates an indefinite timeout.")
private long confirmTimeout = 5000;
- @UriParam(label = "producer", enums = "auto,enabled,disabled",
+ @UriParam(label = "producer", enums = "auto,enabled,disabled",
defaultValue = "auto",
description = "Controls whether to wait for confirms. The
connection factory must be configured for publisher confirms and this method."
- +
- "auto = Camel detects if the connection factory
uses confirms or not. disabled = Confirms is disabled. enabled = Confirms is
enabled.")
+ + " auto = Camel detects if the connection factory
uses confirms or not. disabled = Confirms is disabled. enabled = Confirms is
enabled.")
private String confirm = "auto";
@UriParam(label = "producer", defaultValue = "false",
description = "Use a separate connection for publishers and
consumers")
@@ -182,7 +181,7 @@ public class SpringRabbitMQEndpoint extends DefaultEndpoint
implements AsyncEndp
description = "How many times a Rabbitmq consumer will retry the
same message if Camel failed to process the message")
private int maximumRetryAttempts = 5;
@UriParam(label = "consumer", defaultValue = "1000",
- description = "Delay in msec a Rabbitmq consumer will wait
before redelivering a message that Camel failed to process")
+ description = "Delay in millis a Rabbitmq consumer will wait
before redelivering a message that Camel failed to process")
private int retryDelay = 1000;
@UriParam(label = "consumer", defaultValue = "true",
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.")
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java
index aa8eb5f9896..7a74ef7bb4a 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java
@@ -584,7 +584,7 @@ public interface SpringRabbitMQEndpointBuilderFactory {
return this;
}
/**
- * Delay in msec a Rabbitmq consumer will wait before redelivering a
+ * Delay in millis a Rabbitmq consumer will wait before redelivering a
* message that Camel failed to process.
*
* The option is a: <code>int</code> type.
@@ -600,7 +600,7 @@ public interface SpringRabbitMQEndpointBuilderFactory {
return this;
}
/**
- * Delay in msec a Rabbitmq consumer will wait before redelivering a
+ * Delay in millis a Rabbitmq consumer will wait before redelivering a
* message that Camel failed to process.
*
* The option will be converted to a <code>int</code> type.
@@ -1187,12 +1187,13 @@ public interface SpringRabbitMQEndpointBuilderFactory {
}
/**
* Controls whether to wait for confirms. The connection factory must
be
- * configured for publisher confirms and this method.auto = Camel
+ * configured for publisher confirms and this method. auto = Camel
* detects if the connection factory uses confirms or not. disabled =
* Confirms is disabled. enabled = Confirms is enabled.
*
* The option is a: <code>java.lang.String</code> type.
*
+ * Default: auto
* Group: producer
*
* @param confirm the value to set
