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 69f7671ea65 CAMEL-21630: Mark inheritErrorHandler in DSL as advanced
69f7671ea65 is described below
commit 69f7671ea65c6a7950cb36604eb960f27343a481
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Jan 19 09:09:37 2025 +0100
CAMEL-21630: Mark inheritErrorHandler in DSL as advanced
---
.../resources/org/apache/camel/catalog/models/loadBalance.json | 2 +-
.../resources/META-INF/org/apache/camel/model/loadBalance.json | 2 +-
.../src/main/java/org/apache/camel/model/ProcessorDefinition.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
index c8634078610..9a164dfebc9 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
@@ -17,6 +17,6 @@
"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." },
"loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load
Balancer Type", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [
"customLoadBalancer", "failoverLoadBalancer", "randomLoadBalancer",
"roundRobinLoadBalancer", "stickyLoadBalancer", "topicLoadBalancer",
"weightedLoadBalancer" ], "deprecated": false, "autowired": false, "secret":
false, "description": "The load balancer to be used" },
"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 [...]
- "inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName":
"Inherit Error Handler", "group": "common", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Sets whether or
not to inherit the configured error handler. The default value is true. You can
use this to disable using the inherited error handler for a given DSL such as a
load balancer where you wan [...]
+ "inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName":
"Inherit Error Handler", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Sets whether or not to inherit the configured error handler. The default value
is true. You can use this to disable using the inherited error handler for a
given DSL such as a load [...]
}
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
index c8634078610..9a164dfebc9 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
@@ -17,6 +17,6 @@
"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." },
"loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load
Balancer Type", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [
"customLoadBalancer", "failoverLoadBalancer", "randomLoadBalancer",
"roundRobinLoadBalancer", "stickyLoadBalancer", "topicLoadBalancer",
"weightedLoadBalancer" ], "deprecated": false, "autowired": false, "secret":
false, "description": "The load balancer to be used" },
"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 [...]
- "inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName":
"Inherit Error Handler", "group": "common", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Sets whether or
not to inherit the configured error handler. The default value is true. You can
use this to disable using the inherited error handler for a given DSL such as a
load balancer where you wan [...]
+ "inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName":
"Inherit Error Handler", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Sets whether or not to inherit the configured error handler. The default value
is true. You can use this to disable using the inherited error handler for a
given DSL such as a load [...]
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 95c6046c0ec..ae630e0ef09 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -86,6 +86,7 @@ public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
protected String disabled;
@XmlAttribute
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
protected Boolean inheritErrorHandler;
@XmlTransient
private final Deque<Block> blocks = new LinkedList<>();