This is an automated email from the ASF dual-hosted git repository.
pascalschumacher 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 071bcca RedeliveryPolicyDefinition: Fix/improve javadoc
071bcca is described below
commit 071bccadce16c9d94c102171abba7cb85b5de2f4
Author: PascalSchumacher <[email protected]>
AuthorDate: Mon Feb 14 20:50:28 2022 +0100
RedeliveryPolicyDefinition: Fix/improve javadoc
---
.../resources/org/apache/camel/catalog/models/redeliveryPolicy.json | 4 ++--
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 4 ++--
.../resources/org/apache/camel/model/redeliveryPolicy.json | 4 ++--
.../java/org/apache/camel/model/RedeliveryPolicyDefinition.java | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
index 93a2660..1bfb5e9 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
@@ -14,13 +14,13 @@
"properties": {
"maximumRedeliveries": { "kind": "attribute", "displayName": "Maximum
Redeliveries", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum redeliveries x = redeliver at most x times 0 =
no redeliveries -1 = redeliver forever" },
"redeliveryDelay": { "kind": "attribute", "displayName": "Redelivery
Delay", "required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the initial redelivery delay" },
- "asyncDelayedRedelivery": { "kind": "attribute", "displayName": "Async
Delayed Redelivery", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allow synchronous delayed redelivery.
The route, in particular the consumer's component, must support the
Asynchronous Routing Engine (e.g. seda)." },
+ "asyncDelayedRedelivery": { "kind": "attribute", "displayName": "Async
Delayed Redelivery", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allow asynchronous delayed redelivery.
The route, in particular the consumer's component, must support the
Asynchronous Routing Engine (e.g. seda)." },
"backOffMultiplier": { "kind": "attribute", "displayName": "Back Off
Multiplier", "required": false, "type": "number", "javaType":
"java.lang.Double", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the back off multiplier" },
"useExponentialBackOff": { "kind": "attribute", "displayName": "Use
Exponential Back Off", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Turn on exponential backk off" },
"collisionAvoidanceFactor": { "kind": "attribute", "displayName":
"Collision Avoidance Factor", "required": false, "type": "number", "javaType":
"java.lang.Double", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the collision avoidance factor" },
"useCollisionAvoidance": { "kind": "attribute", "displayName": "Use
Collision Avoidance", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Turn on collision avoidance." },
"maximumRedeliveryDelay": { "kind": "attribute", "displayName": "Maximum
Redelivery Delay", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum delay between redelivery" },
- "retriesExhaustedLogLevel": { "kind": "attribute", "displayName": "Retries
Exhausted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use when retries has
exhausted" },
+ "retriesExhaustedLogLevel": { "kind": "attribute", "displayName": "Retries
Exhausted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use when retries
have been exhausted" },
"retryAttemptedLogLevel": { "kind": "attribute", "displayName": "Retry
Attempted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use for logging
retry attempts" },
"retryAttemptedLogInterval": { "kind": "attribute", "displayName": "Retry
Attempted Log Interval", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the interval to use for logging retry attempts" },
"logRetryAttempted": { "kind": "attribute", "displayName": "Log Retry
Attempted", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Sets whether retry attempts should be
logged or not. Can be used to include or reduce verbose." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 421155f..59c7ab3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -9446,7 +9446,7 @@ Sets the initial redelivery delay.
<xs:attribute name="asyncDelayedRedelivery" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Allow synchronous delayed redelivery. The route, in particular the consumer's
+Allow asynchronous delayed redelivery. The route, in particular the consumer's
component, must support the Asynchronous Routing Engine (e.g. seda). Default
value: false
]]></xs:documentation>
@@ -9490,7 +9490,7 @@ Sets the maximum delay between redelivery.
<xs:attribute name="retriesExhaustedLogLevel" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Sets the logging level to use when retries has exhausted.
+Sets the logging level to use when retries have been exhausted.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
index 93a2660..1bfb5e9 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
@@ -14,13 +14,13 @@
"properties": {
"maximumRedeliveries": { "kind": "attribute", "displayName": "Maximum
Redeliveries", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum redeliveries x = redeliver at most x times 0 =
no redeliveries -1 = redeliver forever" },
"redeliveryDelay": { "kind": "attribute", "displayName": "Redelivery
Delay", "required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the initial redelivery delay" },
- "asyncDelayedRedelivery": { "kind": "attribute", "displayName": "Async
Delayed Redelivery", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allow synchronous delayed redelivery.
The route, in particular the consumer's component, must support the
Asynchronous Routing Engine (e.g. seda)." },
+ "asyncDelayedRedelivery": { "kind": "attribute", "displayName": "Async
Delayed Redelivery", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allow asynchronous delayed redelivery.
The route, in particular the consumer's component, must support the
Asynchronous Routing Engine (e.g. seda)." },
"backOffMultiplier": { "kind": "attribute", "displayName": "Back Off
Multiplier", "required": false, "type": "number", "javaType":
"java.lang.Double", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the back off multiplier" },
"useExponentialBackOff": { "kind": "attribute", "displayName": "Use
Exponential Back Off", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Turn on exponential backk off" },
"collisionAvoidanceFactor": { "kind": "attribute", "displayName":
"Collision Avoidance Factor", "required": false, "type": "number", "javaType":
"java.lang.Double", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the collision avoidance factor" },
"useCollisionAvoidance": { "kind": "attribute", "displayName": "Use
Collision Avoidance", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Turn on collision avoidance." },
"maximumRedeliveryDelay": { "kind": "attribute", "displayName": "Maximum
Redelivery Delay", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum delay between redelivery" },
- "retriesExhaustedLogLevel": { "kind": "attribute", "displayName": "Retries
Exhausted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use when retries has
exhausted" },
+ "retriesExhaustedLogLevel": { "kind": "attribute", "displayName": "Retries
Exhausted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use when retries
have been exhausted" },
"retryAttemptedLogLevel": { "kind": "attribute", "displayName": "Retry
Attempted Log Level", "required": false, "type": "object", "javaType":
"org.apache.camel.LoggingLevel", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the logging level to use for logging
retry attempts" },
"retryAttemptedLogInterval": { "kind": "attribute", "displayName": "Retry
Attempted Log Interval", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the interval to use for logging retry attempts" },
"logRetryAttempted": { "kind": "attribute", "displayName": "Log Retry
Attempted", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Sets whether retry attempts should be
logged or not. Can be used to include or reduce verbose." },
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
index 23e5fc6..30d002e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
@@ -111,7 +111,7 @@ public class RedeliveryPolicyDefinition {
//
-------------------------------------------------------------------------
/**
- * Allow synchronous delayed redelivery. The route, in particular the
consumer's component, must support the
+ * Allow asynchronous delayed redelivery. The route, in particular the
consumer's component, must support the
* Asynchronous Routing Engine (e.g. seda).
*
* @return the builder
@@ -217,7 +217,7 @@ public class RedeliveryPolicyDefinition {
}
/**
- * Sets the logging level to use when retries has exhausted
+ * Sets the logging level to use when retries have been exhausted
*
* @param retriesExhaustedLogLevel the logging level
* @return the builder
@@ -227,7 +227,7 @@ public class RedeliveryPolicyDefinition {
}
/**
- * Sets the logging level to use when retries has exhausted
+ * Sets the logging level to use when retries have been exhausted
*
* @param retriesExhaustedLogLevel the logging level
* @return the builder
