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 2b8701b CAMEL-17070: Default values for duration types in EIP model
changed to use numeric values only, which is more tooling friendly.
2b8701b is described below
commit 2b8701b70c0ee8394b6c129d860080b5e4ee555b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 14 10:50:09 2021 +0200
CAMEL-17070: Default values for duration types in EIP model changed to use
numeric values only, which is more tooling friendly.
---
.../src/generated/resources/org/apache/camel/model/aggregate.json | 2 +-
.../resources/org/apache/camel/model/config/batch-config.json | 2 +-
.../resources/org/apache/camel/model/config/stream-config.json | 4 ++--
.../resources/org/apache/camel/model/faultToleranceConfiguration.json | 4 ++--
.../resources/org/apache/camel/model/optimisticLockRetryPolicy.json | 4 ++--
.../src/generated/resources/org/apache/camel/model/sample.json | 2 +-
.../src/main/java/org/apache/camel/model/AggregateDefinition.java | 4 ++--
.../org/apache/camel/model/FaultToleranceConfigurationCommon.java | 4 ++--
.../org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java | 4 ++--
.../src/main/java/org/apache/camel/model/SamplingDefinition.java | 2 +-
.../java/org/apache/camel/model/config/BatchResequencerConfig.java | 2 +-
.../java/org/apache/camel/model/config/StreamResequencerConfig.java | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
index 995e850..8bfcb98 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
@@ -27,7 +27,7 @@
"completionSize": { "kind": "attribute", "displayName": "Completion Size",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "description":
"Number of messages aggregated before the aggregation is complete. This option
can be set as either a fixed value or using an Expression which allows you to
evaluate a size dynamically - will use Integer as result. If both are set Camel
will fallback to use the fixed v [...]
"completionInterval": { "kind": "attribute", "displayName": "Completion
Interval", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "A repeating period in millis by which the aggregator will
complete all current aggregated exchanges. Camel has a background task which is
triggered every period. You cannot use this option together with
completionTimeout, only one of them can be used." },
"completionTimeout": { "kind": "attribute", "displayName": "Completion
Timeout", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Time in millis that an aggregated exchange should be inactive
before its complete (timeout). This option can be set as either a fixed value
or using an Expression which allows you to evaluate a timeout dynamically -
will use Long as result. If both are set Camel [...]
- "completionTimeoutCheckerInterval": { "kind": "attribute", "displayName":
"Completion Timeout Checker Interval", "required": false, "type": "duration",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1s", "description": "Interval in millis that
is used by the background task that checks for timeouts (
org.apache.camel.TimeoutMap ). By default the timeout checker runs every
second. The timeout is an approximation and there is [...]
+ "completionTimeoutCheckerInterval": { "kind": "attribute", "displayName":
"Completion Timeout Checker Interval", "required": false, "type": "duration",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "description": "Interval in millis
that is used by the background task that checks for timeouts (
org.apache.camel.TimeoutMap ). By default the timeout checker runs every
second. The timeout is an approximation and there i [...]
"completionFromBatchConsumer": { "kind": "attribute", "displayName":
"Completion From Batch Consumer", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Enables the batch
completion mode where we aggregate from a org.apache.camel.BatchConsumer and
aggregate the total number of exchanges the org.apache.camel.BatchConsumer has
reported as total by checking the exchange [...]
"completionOnNewCorrelationGroup": { "kind": "attribute", "displayName":
"Completion On New Correlation Group", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Enables completion on
all previous groups when a new incoming correlation group. This can for example
be used to complete groups with same correlation keys when they are in
consecutive order. Notice when this [...]
"eagerCheckCompletion": { "kind": "attribute", "displayName": "Eager Check
Completion", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Use eager completion checking which
means that the completionPredicate will use the incoming Exchange. As opposed
to without eager completion checking the completionPredicate will use the
aggregated Exchange." },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
index 57137fc..74b2bb3 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
@@ -12,7 +12,7 @@
},
"properties": {
"batchSize": { "kind": "attribute", "displayName": "Batch Size",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"100", "description": "Sets the size of the batch to be re-ordered. The default
size is 100." },
- "batchTimeout": { "kind": "attribute", "displayName": "Batch Timeout",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "1s",
"description": "Sets the timeout for collecting elements to be re-ordered. The
default timeout is 1000 msec." },
+ "batchTimeout": { "kind": "attribute", "displayName": "Batch Timeout",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"1000", "description": "Sets the timeout for collecting elements to be
re-ordered. The default timeout is 1000 msec." },
"allowDuplicates": { "kind": "attribute", "displayName": "Allow
Duplicates", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to allow duplicates." },
"reverse": { "kind": "attribute", "displayName": "Reverse", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to reverse the ordering." },
"ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore
Invalid Exchanges", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to ignore invalid exchanges" }
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
index 7204003..fd3a95c 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
@@ -12,8 +12,8 @@
},
"properties": {
"capacity": { "kind": "attribute", "displayName": "Capacity", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1000", "description":
"Sets the capacity of the resequencer inbound queue." },
- "timeout": { "kind": "attribute", "displayName": "Timeout", "required":
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1s", "description": "Sets
minimum time (milliseconds) to wait for missing elements (messages)." },
- "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery
Attempt Interval", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1s", "description": "Sets the interval in milliseconds the
stream resequencer will at most wait while waiting for condition of being able
to deliver." },
+ "timeout": { "kind": "attribute", "displayName": "Timeout", "required":
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1000", "description":
"Sets minimum time (milliseconds) to wait for missing elements (messages)." },
+ "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery
Attempt Interval", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1000", "description": "Sets the interval in milliseconds the
stream resequencer will at most wait while waiting for condition of being able
to deliver." },
"ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore
Invalid Exchanges", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to ignore invalid exchanges" },
"comparatorRef": { "kind": "attribute", "displayName": "Comparator Ref",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type." },
"rejectOld": { "kind": "attribute", "displayName": "Reject Old",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If true, throws an exception when messages older than
the last delivered message are processed" }
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
index 5d009e5..e9b63e3 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
@@ -12,12 +12,12 @@
},
"properties": {
"circuitBreakerRef": { "kind": "attribute", "displayName": "Circuit
Breaker Ref", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to an existing
io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to
lookup and use from the registry. When using this, then any other circuit
breaker options are not in use." },
- "delay": { "kind": "attribute", "displayName": "Delay", "required": false,
"type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "5s", "description":
"Control how long the circuit breaker stays open. The default is 5 seconds." },
+ "delay": { "kind": "attribute", "displayName": "Delay", "required": false,
"type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "5000", "description":
"Control how long the circuit breaker stays open. The default is 5 seconds." },
"successThreshold": { "kind": "attribute", "displayName": "Success
Threshold", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1", "description": "Controls the number of trial calls which
are allowed when the circuit breaker is half-open" },
"requestVolumeThreshold": { "kind": "attribute", "displayName": "Request
Volume Threshold", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "20", "description": "Controls the size of the rolling window
used when the circuit breaker is closed" },
"failureRatio": { "kind": "attribute", "displayName": "Failure Ratio",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "50",
"description": "Configures the failure rate threshold in percentage. If the
failure rate is equal or greater than the threshold the CircuitBreaker
transitions to open and starts short-circuiting calls. The threshold must be
greater than 0 and not greater than 100. D [...]
"timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether timeout is enabled or not on the circuit
breaker. Default is false." },
- "timeoutDuration": { "kind": "attribute", "displayName": "Timeout
Duration", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1s", "description": "Configures the thread execution timeout.
Default value is 1 second." },
+ "timeoutDuration": { "kind": "attribute", "displayName": "Timeout
Duration", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1000", "description": "Configures the thread execution
timeout. Default value is 1 second." },
"timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool
Size", "required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "10",
"description": "Configures the pool size of the thread pool when timeout is
enabled. Default value is 10." },
"timeoutScheduledExecutorServiceRef": { "kind": "attribute",
"displayName": "Timeout Scheduled Executor Service Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "References to a custom
thread pool to use when timeout is enabled" },
"bulkheadEnabled": { "kind": "attribute", "displayName": "Bulkhead
Enabled", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether bulkhead is enabled or not on
the circuit breaker. Default is false." },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
index 7584afd..db839af 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
@@ -12,8 +12,8 @@
},
"properties": {
"maximumRetries": { "kind": "attribute", "displayName": "Maximum Retries",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the maximum number of retries" },
- "retryDelay": { "kind": "attribute", "displayName": "Retry Delay",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"50ms", "description": "Sets the delay in millis between retries" },
- "maximumRetryDelay": { "kind": "attribute", "displayName": "Maximum Retry
Delay", "required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "1s",
"description": "Sets the upper value of retry in millis between retries, when
using exponential or random backoff" },
+ "retryDelay": { "kind": "attribute", "displayName": "Retry Delay",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "50",
"description": "Sets the delay in millis between retries" },
+ "maximumRetryDelay": { "kind": "attribute", "displayName": "Maximum Retry
Delay", "required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"1000", "description": "Sets the upper value of retry in millis between
retries, when using exponential or random backoff" },
"exponentialBackOff": { "kind": "attribute", "displayName": "Exponential
Back Off", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Enable exponential backoff" },
"randomBackOff": { "kind": "attribute", "displayName": "Random Back Off",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Enables random backoff" }
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
index 3477688..9fd68fa 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
@@ -11,7 +11,7 @@
"output": false
},
"properties": {
- "samplePeriod": { "kind": "attribute", "displayName": "Sample Period",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "1s",
"description": "Sets the sample period during which only a single Exchange will
pass through." },
+ "samplePeriod": { "kind": "attribute", "displayName": "Sample Period",
"required": false, "type": "duration", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"1000", "description": "Sets the sample period during which only a single
Exchange will pass through." },
"messageFrequency": { "kind": "attribute", "displayName": "Message
Frequency", "required": false, "type": "integer", "javaType": "java.lang.Long",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the sample message count which only a single Exchange will pass through after
this many received." },
"units": { "kind": "attribute", "displayName": "Units", "required": false,
"type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "DAYS",
"HOURS", "MICROSECONDS", "MILLISECONDS", "MINUTES", "NANOSECONDS", "SECONDS" ],
"deprecated": true, "deprecationNote": "Use samplePeriod extended syntax
instead", "autowired": false, "secret": false, "defaultValue": "SECONDS",
"description": "Sets the time units for the sample period, defaulting to
seconds." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
index f8d1470..f7422ef 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -103,8 +103,8 @@ public class AggregateDefinition extends
OutputDefinition<AggregateDefinition>
@Metadata(javaType = "java.time.Duration")
private String completionTimeout;
@XmlAttribute
- @Metadata(defaultValue = "1s", javaType = "java.time.Duration")
- private String completionTimeoutCheckerInterval = "1s";
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
+ private String completionTimeoutCheckerInterval = "1000";
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
private String completionFromBatchConsumer;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
index 16b2636..922fbe4 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
@@ -29,7 +29,7 @@ public class FaultToleranceConfigurationCommon extends
IdentifiedType {
@Metadata(label = "circuitbreaker")
private String circuitBreakerRef;
@XmlAttribute
- @Metadata(label = "circuitbreaker", defaultValue = "5s", javaType =
"java.time.Duration")
+ @Metadata(label = "circuitbreaker", defaultValue = "5000", javaType =
"java.time.Duration")
private String delay;
@XmlAttribute
@Metadata(label = "circuitbreaker", defaultValue = "1", javaType =
"java.lang.Integer")
@@ -44,7 +44,7 @@ public class FaultToleranceConfigurationCommon extends
IdentifiedType {
@Metadata(label = "timeout", defaultValue = "false", javaType =
"java.lang.Boolean")
private String timeoutEnabled;
@XmlAttribute
- @Metadata(label = "timeout", defaultValue = "1s", javaType =
"java.time.Duration")
+ @Metadata(label = "timeout", defaultValue = "1000", javaType =
"java.time.Duration")
private String timeoutDuration;
@XmlAttribute
@Metadata(label = "timeout", defaultValue = "10", javaType =
"java.lang.Integer")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
index 4cb5566..d0418609 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
@@ -34,10 +34,10 @@ public class OptimisticLockRetryPolicyDefinition {
@Metadata(javaType = "java.lang.Integer")
private String maximumRetries;
@XmlAttribute
- @Metadata(javaType = "java.time.Duration", defaultValue = "50ms")
+ @Metadata(javaType = "java.time.Duration", defaultValue = "50")
private String retryDelay;
@XmlAttribute
- @Metadata(javaType = "java.time.Duration", defaultValue = "1s")
+ @Metadata(javaType = "java.time.Duration", defaultValue = "1000")
private String maximumRetryDelay;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "true")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
index 9fd6cb8..4304f12 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.TimeUtils;
public class SamplingDefinition extends NoOutputDefinition<SamplingDefinition>
{
@XmlAttribute
- @Metadata(defaultValue = "1s", javaType = "java.time.Duration")
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
private String samplePeriod;
@XmlAttribute
@Metadata(javaType = "java.lang.Long")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
index aabaff1..4c7cb95 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
@@ -34,7 +34,7 @@ public class BatchResequencerConfig extends ResequencerConfig
{
@Metadata(defaultValue = "100", javaType = "java.lang.Integer")
private String batchSize;
@XmlAttribute
- @Metadata(defaultValue = "1s", javaType = "java.time.Duration")
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
private String batchTimeout;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
index 1e95ef5..c60b7b6 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
@@ -36,10 +36,10 @@ public class StreamResequencerConfig extends
ResequencerConfig {
@Metadata(defaultValue = "1000", javaType = "java.lang.Integer")
private String capacity;
@XmlAttribute
- @Metadata(defaultValue = "1s", javaType = "java.time.Duration")
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
private String timeout;
@XmlAttribute
- @Metadata(defaultValue = "1s", javaType = "java.time.Duration")
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
private String deliveryAttemptInterval;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
