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 a3ac64fd642 Polished
a3ac64fd642 is described below
commit a3ac64fd642466429ae1a5181f50d90921631448
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 18 08:53:18 2025 +0100
Polished
---
.../resources/org/apache/camel/catalog/models/doCatch.json | 2 +-
.../org/apache/camel/catalog/models/intercept.json | 2 +-
.../org/apache/camel/catalog/models/interceptFrom.json | 2 +-
.../camel/catalog/models/interceptSendToEndpoint.json | 2 +-
.../org/apache/camel/catalog/models/onCompletion.json | 2 +-
.../org/apache/camel/catalog/models/onException.json | 2 +-
.../resources/org/apache/camel/catalog/models/onWhen.json | 4 ++--
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../resources/META-INF/org/apache/camel/model/doCatch.json | 2 +-
.../META-INF/org/apache/camel/model/intercept.json | 2 +-
.../META-INF/org/apache/camel/model/interceptFrom.json | 2 +-
.../org/apache/camel/model/interceptSendToEndpoint.json | 2 +-
.../META-INF/org/apache/camel/model/onCompletion.json | 2 +-
.../META-INF/org/apache/camel/model/onException.json | 2 +-
.../resources/META-INF/org/apache/camel/model/onWhen.json | 4 ++--
.../main/java/org/apache/camel/model/CatchDefinition.java | 1 +
.../java/org/apache/camel/model/InterceptDefinition.java | 1 +
.../camel/model/InterceptSendToEndpointDefinition.java | 1 +
.../org/apache/camel/model/OnCompletionDefinition.java | 1 +
.../java/org/apache/camel/model/OnExceptionDefinition.java | 1 +
.../main/java/org/apache/camel/model/OnWhenDefinition.java | 4 ++--
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 14 +++++++-------
.../src/generated/resources/schema/camelYamlDsl.json | 14 +++++++-------
23 files changed, 38 insertions(+), 33 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doCatch.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doCatch.json
index d248dbeaa11..de41eafe631 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doCatch.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doCatch.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"exception": { "index": 3, "kind": "element", "displayName": "Exception",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "The exception(s) to catch." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onCatch is triggered. To be used for
fine grained controlling whether a thrown exception should be intercepted by
this exception type or not." },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Used for
triggering doCatch in specific situations" },
"outputs": { "index": 5, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
index 34db2a70836..d40e3711a15 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
@@ -15,7 +15,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
- "onWhen": { "index": 3, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 3, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting in specific situations" },
"outputs": { "index": 4, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
index a5a7f2b09d4..3b4c57b949e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"uri": { "index": 3, "kind": "attribute", "displayName": "Uri", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Intercept incoming messages from the uri or uri pattern. If this option is not
configured, then all incoming messages is intercepted." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting in specific situations" },
"outputs": { "index": 5, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
index afccd09612a..aa27dcb67a4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
@@ -18,7 +18,7 @@
"uri": { "index": 3, "kind": "attribute", "displayName": "Uri", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Intercept sending to the uri or uri pattern." },
"skipSendToOriginalEndpoint": { "index": 4, "kind": "attribute",
"displayName": "Skip Send To Original Endpoint", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "If set to true then the
message is not sent to the original endpoint. By default (false) the message is
both intercepted and then sent to the original endpoint." },
"afterUri": { "index": 5, "kind": "attribute", "displayName": "After Uri",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "After sending to the endpoint then send the
message to this uri which allows to process its result." },
- "onWhen": { "index": 6, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 6, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting sending to an endpoint in specific
situations" },
"outputs": { "index": 7, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onCompletion.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onCompletion.json
index 6da39205fa9..267bda03ee1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onCompletion.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onCompletion.json
@@ -21,7 +21,7 @@
"parallelProcessing": { "index": 6, "kind": "attribute", "displayName":
"Parallel Processing", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
enabled then the on completion process will run asynchronously by a separate
thread from a thread pool. By default this is false, meaning the on completion
process will run synchro [...]
"executorService": { "index": 7, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom Thread Pool to be used for parallel processing. Notice if you set
this option, then parallel processing is automatic implied, and you do not have
to enable that option as well." },
"useOriginalMessage": { "index": 8, "kind": "attribute", "displayName":
"Use Original Message", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Will use the original input message body when an org.apache.camel.Exchange for
this on completion. The original input message is defensively copied, and the
copied message body is co [...]
- "onWhen": { "index": 9, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onCompletion is triggered. To be used
for fine grained controlling whether a completion callback should be invoked or
not" },
+ "onWhen": { "index": 9, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger routing this completion steps in specific
situations" },
"outputs": { "index": 10, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "ma [...]
},
"exchangeProperties": {
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
index 4f8f09c3ec0..0d6d669321a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"exception": { "index": 3, "kind": "element", "displayName": "Exception",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "A set of exceptions to react upon." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onException is triggered. To be used
for fine grained controlling whether a thrown exception should be intercepted
by this exception type or not." },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger this in specific situations" },
"retryWhile": { "index": 5, "kind": "expression", "displayName": "Retry
While", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition",
"oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy",
"header", "hl7terser", "java", "joor", "jq", "js", "jsonpath", "language",
"method", "mvel", "ognl", "python", "ref", "simple", "spel", "tokenize",
"variable", "wasm", "xpath", "xque [...]
"redeliveryPolicy": { "index": 6, "kind": "element", "displayName":
"Redelivery Policy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.model.RedeliveryPolicyDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Used for
configuring redelivery options" },
"redeliveryPolicyRef": { "index": 7, "kind": "attribute", "displayName":
"Redelivery Policy Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets a reference to a
redelivery policy to lookup in the org.apache.camel.spi.Registry to be used." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
index a0c3582824c..523f46a9056 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
@@ -3,9 +3,9 @@
"kind": "model",
"name": "onWhen",
"title": "On When",
- "description": "Used for triggering doCatch in specific situations.",
+ "description": "To use a predicate to determine when to trigger this.",
"deprecated": false,
- "label": "error",
+ "label": "configuration",
"javaType": "org.apache.camel.model.OnWhenDefinition",
"abstract": false,
"input": false,
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 a8e4e88eacb..d90060852aa 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
@@ -1077,7 +1077,7 @@ Route to be executed when Circuit Breaker EIP executes
fallback
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Used for triggering doCatch in specific situations.
+To use a predicate to determine when to trigger this.
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doCatch.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doCatch.json
index d248dbeaa11..de41eafe631 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doCatch.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doCatch.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"exception": { "index": 3, "kind": "element", "displayName": "Exception",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "The exception(s) to catch." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onCatch is triggered. To be used for
fine grained controlling whether a thrown exception should be intercepted by
this exception type or not." },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Used for
triggering doCatch in specific situations" },
"outputs": { "index": 5, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
index 34db2a70836..d40e3711a15 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
@@ -15,7 +15,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
- "onWhen": { "index": 3, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 3, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting in specific situations" },
"outputs": { "index": 4, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
}
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
index a5a7f2b09d4..3b4c57b949e 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"uri": { "index": 3, "kind": "attribute", "displayName": "Uri", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Intercept incoming messages from the uri or uri pattern. If this option is not
configured, then all incoming messages is intercepted." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting in specific situations" },
"outputs": { "index": 5, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
index afccd09612a..aa27dcb67a4 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
@@ -18,7 +18,7 @@
"uri": { "index": 3, "kind": "attribute", "displayName": "Uri", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Intercept sending to the uri or uri pattern." },
"skipSendToOriginalEndpoint": { "index": 4, "kind": "attribute",
"displayName": "Skip Send To Original Endpoint", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "If set to true then the
message is not sent to the original endpoint. By default (false) the message is
both intercepted and then sent to the original endpoint." },
"afterUri": { "index": 5, "kind": "attribute", "displayName": "After Uri",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "After sending to the endpoint then send the
message to this uri which allows to process its result." },
- "onWhen": { "index": 6, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Applies this
interceptor only if the given predicate is true" },
+ "onWhen": { "index": 6, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger intercepting sending to an endpoint in specific
situations" },
"outputs": { "index": 7, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "mar [...]
},
"exchangeProperties": {
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onCompletion.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onCompletion.json
index 6da39205fa9..267bda03ee1 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onCompletion.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onCompletion.json
@@ -21,7 +21,7 @@
"parallelProcessing": { "index": 6, "kind": "attribute", "displayName":
"Parallel Processing", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
enabled then the on completion process will run asynchronously by a separate
thread from a thread pool. By default this is false, meaning the on completion
process will run synchro [...]
"executorService": { "index": 7, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom Thread Pool to be used for parallel processing. Notice if you set
this option, then parallel processing is automatic implied, and you do not have
to enable that option as well." },
"useOriginalMessage": { "index": 8, "kind": "attribute", "displayName":
"Use Original Message", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Will use the original input message body when an org.apache.camel.Exchange for
this on completion. The original input message is defensively copied, and the
copied message body is co [...]
- "onWhen": { "index": 9, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onCompletion is triggered. To be used
for fine grained controlling whether a completion callback should be invoked or
not" },
+ "onWhen": { "index": 9, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger routing this completion steps in specific
situations" },
"outputs": { "index": 10, "kind": "element", "displayName": "Outputs",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker",
"claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay",
"doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter",
"idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint",
"kamelet", "loadBalance", "log", "loop", "ma [...]
},
"exchangeProperties": {
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onException.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onException.json
index 4f8f09c3ec0..0d6d669321a 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onException.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onException.json
@@ -16,7 +16,7 @@
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to disable this
EIP from the route during build time. Once an EIP has been disabled then it
cannot be enabled later at runtime." },
"exception": { "index": 3, "kind": "element", "displayName": "Exception",
"group": "common", "required": true, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "A set of exceptions to react upon." },
- "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "Sets an additional
predicate that should be true before the onException is triggered. To be used
for fine grained controlling whether a thrown exception should be intercepted
by this exception type or not." },
+ "onWhen": { "index": 4, "kind": "element", "displayName": "On When",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OnWhenDefinition", "deprecated": false, "autowired":
false, "secret": false, "asPredicate": true, "description": "To use an
expression to only trigger this in specific situations" },
"retryWhile": { "index": 5, "kind": "expression", "displayName": "Retry
While", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition",
"oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy",
"header", "hl7terser", "java", "joor", "jq", "js", "jsonpath", "language",
"method", "mvel", "ognl", "python", "ref", "simple", "spel", "tokenize",
"variable", "wasm", "xpath", "xque [...]
"redeliveryPolicy": { "index": 6, "kind": "element", "displayName":
"Redelivery Policy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.model.RedeliveryPolicyDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Used for
configuring redelivery options" },
"redeliveryPolicyRef": { "index": 7, "kind": "attribute", "displayName":
"Redelivery Policy Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets a reference to a
redelivery policy to lookup in the org.apache.camel.spi.Registry to be used." },
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
index a0c3582824c..523f46a9056 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
@@ -3,9 +3,9 @@
"kind": "model",
"name": "onWhen",
"title": "On When",
- "description": "Used for triggering doCatch in specific situations.",
+ "description": "To use a predicate to determine when to trigger this.",
"deprecated": false,
- "label": "error",
+ "label": "configuration",
"javaType": "org.apache.camel.model.OnWhenDefinition",
"abstract": false,
"input": false,
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
index 2b6f711d1c3..10173bd5ee5 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -45,6 +45,7 @@ public class CatchDefinition extends
OutputDefinition<CatchDefinition> {
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<>();
+ @Metadata(description = "Used for triggering doCatch in specific
situations")
@XmlElement
@AsPredicate
private OnWhenDefinition onWhen;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
index 023300259da..774f5447ad5 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptDefinition extends OutputDefinition<InterceptDefinition>
{
+ @Metadata(description = "To use an expression to only trigger intercepting
in specific situations")
@XmlElement
@AsPredicate
private OnWhenDefinition onWhen;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
index 577443d7f2b..fef777a540d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
@@ -44,6 +44,7 @@ public class InterceptSendToEndpointDefinition extends
OutputDefinition<Intercep
@XmlAttribute
@Metadata(label = "advanced")
private String afterUri;
+ @Metadata(description = "To use an expression to only trigger intercepting
sending to an endpoint in specific situations")
@XmlElement
@AsPredicate
private OnWhenDefinition onWhen;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index 8e6751d709b..2a30286bfca 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -66,6 +66,7 @@ public class OnCompletionDefinition extends
OutputDefinition<OnCompletionDefinit
@XmlAttribute(name = "useOriginalMessage")
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String useOriginalMessage;
+ @Metadata(description = "To use an expression to only trigger routing this
completion steps in specific situations")
@XmlElement
@AsPredicate
private OnWhenDefinition onWhen;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 3600e1ff66c..4e8bf850637 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -60,6 +60,7 @@ public class OnExceptionDefinition extends
OutputDefinition<OnExceptionDefinitio
@XmlElement(name = "exception", required = true)
private List<String> exceptions = new ArrayList<>();
+ @Metadata(description = "To use an expression to only trigger this in
specific situations")
@XmlElement
@AsPredicate
private OnWhenDefinition onWhen;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
index 4827560abe2..2a52d8c3495 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
@@ -30,9 +30,9 @@ import org.apache.camel.spi.AsPredicate;
import org.apache.camel.spi.Metadata;
/**
- * Used for triggering doCatch in specific situations.
+ * To use a predicate to determine when to trigger this.
*/
-@Metadata(label = "error")
+@Metadata(label = "configuration")
@AsPredicate
@XmlRootElement(name = "onWhen")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 983b7aa6576..38aae8eb0f2 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -1914,7 +1914,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "exception", type = "array:string",
description = "The exception(s) to catch.", displayName = "Exception"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Sets an
additional predicate that should be true before the onCatch is triggered. To be
used for fine grained controlling whether a thrown exception should be
intercepted by this exception type or not.", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Used for
triggering doCatch in specific situations", displayName = "On When"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition")
}
)
@@ -7415,7 +7415,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "disabled", type = "boolean",
description = "Whether to disable this EIP from the route during build time.
Once an EIP has been disabled then it cannot be enabled later at runtime.",
displayName = "Disabled"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Applies this
interceptor only if the given predicate is true", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "To use an
expression to only trigger intercepting in specific situations", displayName =
"On When"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition")
}
)
@@ -7488,7 +7488,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "disabled", type = "boolean",
description = "Whether to disable this EIP from the route during build time.
Once an EIP has been disabled then it cannot be enabled later at runtime.",
displayName = "Disabled"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Applies this
interceptor only if the given predicate is true", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "To use an
expression to only trigger intercepting in specific situations", displayName =
"On When"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@YamlProperty(name = "uri", type = "string", description =
"Intercept incoming messages from the uri or uri pattern. If this option is not
configured, then all incoming messages is intercepted.", displayName = "Uri")
}
@@ -7573,7 +7573,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "disabled", type = "boolean",
description = "Whether to disable this EIP from the route during build time.
Once an EIP has been disabled then it cannot be enabled later at runtime.",
displayName = "Disabled"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Applies this
interceptor only if the given predicate is true", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "To use an
expression to only trigger intercepting sending to an endpoint in specific
situations", displayName = "On When"),
@YamlProperty(name = "skipSendToOriginalEndpoint", type =
"string", description = "If set to true then the message is not sent to the
original endpoint. By default (false) the message is both intercepted and then
sent to the original endpoint.", displayName = "Skip Send To Original
Endpoint"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@YamlProperty(name = "uri", type = "string", required =
true, description = "Intercept sending to the uri or uri pattern.", displayName
= "Uri")
@@ -10694,7 +10694,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "mode", type =
"enum:AfterConsumer,BeforeConsumer", defaultValue = "AfterConsumer",
description = "Sets the on completion mode. The default value is
AfterConsumer", displayName = "Mode"),
@YamlProperty(name = "onCompleteOnly", type = "boolean",
description = "Will only synchronize when the org.apache.camel.Exchange
completed successfully (no errors).", displayName = "On Complete Only"),
@YamlProperty(name = "onFailureOnly", type = "boolean",
description = "Will only synchronize when the org.apache.camel.Exchange ended
with failure (exception or FAULT message).", displayName = "On Failure Only"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Sets an
additional predicate that should be true before the onCompletion is triggered.
To be used for fine grained controlling whether a completion callback should be
invoked or not", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "To use an
expression to only trigger routing this completion steps in specific
situations", displayName = "On When"),
@YamlProperty(name = "parallelProcessing", type =
"boolean", description = "If enabled then the on completion process will run
asynchronously by a separate thread from a thread pool. By default this is
false, meaning the on completion process will run synchronously using the same
caller thread as from the route.", displayName = "Parallel Processing"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@YamlProperty(name = "useOriginalMessage", type =
"boolean", description = "Will use the original input message body when an
org.apache.camel.Exchange for this on completion. The original input message is
defensively copied, and the copied message body is converted to
org.apache.camel.StreamCache if possible (stream caching is enabled, can be
disabled globally or on the original route), to ensure the body can be read
when the original message is being used later. If t [...]
@@ -10803,7 +10803,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
@YamlProperty(name = "onExceptionOccurredRef", type =
"string", description = "Sets a reference to a processor that should be
processed just after an exception occurred. Can be used to perform custom
logging about the occurred exception at the exact time it happened. Important:
Any exception thrown from this processor will be ignored.", displayName = "On
Exception Occurred Ref"),
@YamlProperty(name = "onRedeliveryRef", type = "string",
description = "Sets a reference to a processor that should be processed before
a redelivery attempt. Can be used to change the org.apache.camel.Exchange
before its being redelivered.", displayName = "On Redelivery Ref"),
- @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "Sets an
additional predicate that should be true before the onException is triggered.
To be used for fine grained controlling whether a thrown exception should be
intercepted by this exception type or not.", displayName = "On When"),
+ @YamlProperty(name = "onWhen", type =
"object:org.apache.camel.model.OnWhenDefinition", description = "To use an
expression to only trigger this in specific situations", displayName = "On
When"),
@YamlProperty(name = "redeliveryPolicy", type =
"object:org.apache.camel.model.RedeliveryPolicyDefinition", description = "Used
for configuring redelivery options", displayName = "Redelivery Policy"),
@YamlProperty(name = "redeliveryPolicyRef", type =
"string", description = "Sets a reference to a redelivery policy to lookup in
the org.apache.camel.spi.Registry to be used.", displayName = "Redelivery
Policy Ref"),
@YamlProperty(name = "retryWhile", type =
"object:org.apache.camel.model.ExpressionSubElementDefinition", description =
"Sets the retry while predicate. Will continue retrying until predicate returns
false.", displayName = "Retry While"),
@@ -10981,7 +10981,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
types = org.apache.camel.model.OnWhenDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
displayName = "On When",
- description = "Used for triggering doCatch in specific
situations.",
+ description = "To use a predicate to determine when to trigger
this.",
deprecated = false,
properties = {
@YamlProperty(name = "__extends", type =
"object:org.apache.camel.model.language.ExpressionDefinition", oneOf =
"expression"),
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index c898a371fef..e18c176e128 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -674,7 +674,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Sets an additional predicate that should be true
before the onCatch is triggered. To be used for fine grained controlling
whether a thrown exception should be intercepted by this exception type or
not.",
+ "description" : "Used for triggering doCatch in specific
situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"steps" : {
@@ -2362,7 +2362,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Applies this interceptor only if the given
predicate is true",
+ "description" : "To use an expression to only trigger intercepting
in specific situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"steps" : {
@@ -2399,7 +2399,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Applies this interceptor only if the given
predicate is true",
+ "description" : "To use an expression to only trigger
intercepting in specific situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"steps" : {
@@ -2447,7 +2447,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Applies this interceptor only if the given
predicate is true",
+ "description" : "To use an expression to only trigger
intercepting sending to an endpoint in specific situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"skipSendToOriginalEndpoint" : {
@@ -3464,7 +3464,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Sets an additional predicate that should be true
before the onCompletion is triggered. To be used for fine grained controlling
whether a completion callback should be invoked or not",
+ "description" : "To use an expression to only trigger routing this
completion steps in specific situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"parallelProcessing" : {
@@ -3536,7 +3536,7 @@
},
"onWhen" : {
"title" : "On When",
- "description" : "Sets an additional predicate that should be true
before the onException is triggered. To be used for fine grained controlling
whether a thrown exception should be intercepted by this exception type or
not.",
+ "description" : "To use an expression to only trigger this in
specific situations",
"$ref" :
"#/items/definitions/org.apache.camel.model.OnWhenDefinition"
},
"redeliveryPolicy" : {
@@ -3603,7 +3603,7 @@
},
"org.apache.camel.model.OnWhenDefinition" : {
"title" : "On When",
- "description" : "Used for triggering doCatch in specific situations.",
+ "description" : "To use a predicate to determine when to trigger
this.",
"type" : "object",
"additionalProperties" : false,
"anyOf" : [ {
