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 ed2e6cf CAMEL-17701: camel-core-model - Add labels to EIP options
ed2e6cf is described below
commit ed2e6cf7afab9b011ccfd683f46f2ea6879e783f
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Feb 28 07:22:14 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../models/faultToleranceConfiguration.json | 26 +++++++++++-----------
.../org/apache/camel/catalog/models/filter.json | 2 +-
.../camel/model/faultToleranceConfiguration.json | 26 +++++++++++-----------
.../resources/org/apache/camel/model/filter.json | 2 +-
.../model/ExpressionSubElementDefinition.java | 1 +
.../model/FaultToleranceConfigurationCommon.java | 26 +++++++++++-----------
.../org/apache/camel/model/FilterDefinition.java | 1 +
.../org/apache/camel/model/FromDefinition.java | 8 ++++---
8 files changed, 48 insertions(+), 44 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
index b656bc9..ccb1a99 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
@@ -12,19 +12,19 @@
"output": false
},
"properties": {
- "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "circuitbreaker", "required": false, "type": "object", "javaType":
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "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 [...]
- "delay": { "kind": "attribute", "displayName": "Delay", "label":
"circuitbreaker", "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", "label": "circuitbreaker", "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", "label": "circuitbreaker", "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",
"label": "circuitbreaker", "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 [...]
- "timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled",
"label": "timeout", "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", "label": "timeout", "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", "label": "timeout", "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." },
- "timeoutScheduledExecutorService": { "kind": "attribute", "displayName":
"Timeout Scheduled Executor Service", "label": "timeout", "required": false,
"type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService",
"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", "label": "bulkhead", "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." },
- "bulkheadMaxConcurrentCalls": { "kind": "attribute", "displayName":
"Bulkhead Max Concurrent Calls", "label": "bulkhead", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10", "description":
"Configures the max amount of concurrent calls the bulkhead will support." },
- "bulkheadWaitingTaskQueue": { "kind": "attribute", "displayName":
"Bulkhead Waiting Task Queue", "label": "bulkhead", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10", "description": "Configures the
task queue size for holding waiting tasks to be processed by the bulkhead." },
- "bulkheadExecutorService": { "kind": "attribute", "displayName": "Bulkhead
Executor Service", "label": "bulkhead", "required": false, "type": "object",
"javaType": "java.util.concurrent.ExecutorService", "deprecated": false,
"autowired": false, "secret": false, "description": "References to a custom
thread pool to use when bulkhead is enabled." },
+ "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "advanced", "required": false, "type": "object", "javaType":
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "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": "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": "1000", "description": "Configures the thread execution
timeout. Default value is 1 second." },
+ "timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool
Size", "label": "advanced", "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." },
+ "timeoutScheduledExecutorService": { "kind": "attribute", "displayName":
"Timeout Scheduled Executor Service", "label": "advanced", "required": false,
"type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService",
"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." },
+ "bulkheadMaxConcurrentCalls": { "kind": "attribute", "displayName":
"Bulkhead Max Concurrent Calls", "label": "advanced", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10", "description":
"Configures the max amount of concurrent calls the bulkhead will support." },
+ "bulkheadWaitingTaskQueue": { "kind": "attribute", "displayName":
"Bulkhead Waiting Task Queue", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10", "description": "Configures the
task queue size for holding waiting tasks to be processed by the bulkhead." },
+ "bulkheadExecutorService": { "kind": "attribute", "displayName": "Bulkhead
Executor Service", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.concurrent.ExecutorService", "deprecated": false,
"autowired": false, "secret": false, "description": "References to a custom
thread pool to use when bulkhead is enabled." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/filter.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/filter.json
index 31cefd5..9176a20 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/filter.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/filter.json
@@ -13,7 +13,7 @@
},
"properties": {
"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
- "statusPropertyName": { "kind": "attribute", "displayName": "Status
Property Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of exchange property to use for storing the status of the
filtering. Setting this allows to know if the filter predicate evaluated as
true or false." },
+ "statusPropertyName": { "kind": "attribute", "displayName": "Status
Property Name", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of exchange property to use for storing
the status of the filtering. Setting this allows to know if the filter
predicate evaluated as true or false." },
"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"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
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 b656bc9..ccb1a99 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,19 +12,19 @@
"output": false
},
"properties": {
- "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "circuitbreaker", "required": false, "type": "object", "javaType":
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "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 [...]
- "delay": { "kind": "attribute", "displayName": "Delay", "label":
"circuitbreaker", "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", "label": "circuitbreaker", "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", "label": "circuitbreaker", "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",
"label": "circuitbreaker", "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 [...]
- "timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled",
"label": "timeout", "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", "label": "timeout", "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", "label": "timeout", "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." },
- "timeoutScheduledExecutorService": { "kind": "attribute", "displayName":
"Timeout Scheduled Executor Service", "label": "timeout", "required": false,
"type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService",
"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", "label": "bulkhead", "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." },
- "bulkheadMaxConcurrentCalls": { "kind": "attribute", "displayName":
"Bulkhead Max Concurrent Calls", "label": "bulkhead", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10", "description":
"Configures the max amount of concurrent calls the bulkhead will support." },
- "bulkheadWaitingTaskQueue": { "kind": "attribute", "displayName":
"Bulkhead Waiting Task Queue", "label": "bulkhead", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10", "description": "Configures the
task queue size for holding waiting tasks to be processed by the bulkhead." },
- "bulkheadExecutorService": { "kind": "attribute", "displayName": "Bulkhead
Executor Service", "label": "bulkhead", "required": false, "type": "object",
"javaType": "java.util.concurrent.ExecutorService", "deprecated": false,
"autowired": false, "secret": false, "description": "References to a custom
thread pool to use when bulkhead is enabled." },
+ "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "advanced", "required": false, "type": "object", "javaType":
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "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": "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": "1000", "description": "Configures the thread execution
timeout. Default value is 1 second." },
+ "timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool
Size", "label": "advanced", "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." },
+ "timeoutScheduledExecutorService": { "kind": "attribute", "displayName":
"Timeout Scheduled Executor Service", "label": "advanced", "required": false,
"type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService",
"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." },
+ "bulkheadMaxConcurrentCalls": { "kind": "attribute", "displayName":
"Bulkhead Max Concurrent Calls", "label": "advanced", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10", "description":
"Configures the max amount of concurrent calls the bulkhead will support." },
+ "bulkheadWaitingTaskQueue": { "kind": "attribute", "displayName":
"Bulkhead Waiting Task Queue", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10", "description": "Configures the
task queue size for holding waiting tasks to be processed by the bulkhead." },
+ "bulkheadExecutorService": { "kind": "attribute", "displayName": "Bulkhead
Executor Service", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.concurrent.ExecutorService", "deprecated": false,
"autowired": false, "secret": false, "description": "References to a custom
thread pool to use when bulkhead is enabled." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
index 31cefd5..9176a20 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
@@ -13,7 +13,7 @@
},
"properties": {
"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
- "statusPropertyName": { "kind": "attribute", "displayName": "Status
Property Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of exchange property to use for storing the status of the
filtering. Setting this allows to know if the filter predicate evaluated as
true or false." },
+ "statusPropertyName": { "kind": "attribute", "displayName": "Status
Property Name", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of exchange property to use for storing
the status of the filtering. Setting this allows to know if the filter
predicate evaluated as true or false." },
"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"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
index 85c21ca..92d532f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
@@ -31,6 +31,7 @@ import org.apache.camel.model.language.ExpressionDefinition;
@XmlRootElement(name = "expression") // must be named expression
@XmlAccessorType(XmlAccessType.FIELD)
public class ExpressionSubElementDefinition implements HasExpressionType {
+
@XmlElementRef
private ExpressionDefinition expressionType;
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 d1c9e89..a17421c 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
@@ -26,43 +26,43 @@ import org.apache.camel.spi.Metadata;
public class FaultToleranceConfigurationCommon extends IdentifiedType {
@XmlAttribute
- @Metadata(label = "circuitbreaker", javaType =
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker")
+ @Metadata(label = "advanced", javaType =
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker")
private String circuitBreaker;
@XmlAttribute
- @Metadata(label = "circuitbreaker", defaultValue = "5000", javaType =
"java.time.Duration")
+ @Metadata(defaultValue = "5000", javaType = "java.time.Duration")
private String delay;
@XmlAttribute
- @Metadata(label = "circuitbreaker", defaultValue = "1", javaType =
"java.lang.Integer")
+ @Metadata(defaultValue = "1", javaType = "java.lang.Integer")
private String successThreshold;
@XmlAttribute
- @Metadata(label = "circuitbreaker", defaultValue = "20", javaType =
"java.lang.Integer")
+ @Metadata(defaultValue = "20", javaType = "java.lang.Integer")
private String requestVolumeThreshold;
@XmlAttribute
- @Metadata(label = "circuitbreaker", defaultValue = "50", javaType =
"java.lang.Integer")
+ @Metadata(defaultValue = "50", javaType = "java.lang.Integer")
private String failureRatio;
@XmlAttribute
- @Metadata(label = "timeout", defaultValue = "false", javaType =
"java.lang.Boolean")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
private String timeoutEnabled;
@XmlAttribute
- @Metadata(label = "timeout", defaultValue = "1000", javaType =
"java.time.Duration")
+ @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
private String timeoutDuration;
@XmlAttribute
- @Metadata(label = "timeout", defaultValue = "10", javaType =
"java.lang.Integer")
+ @Metadata(label = "advanced", defaultValue = "10", javaType =
"java.lang.Integer")
private String timeoutPoolSize;
@XmlAttribute
- @Metadata(label = "timeout", javaType =
"java.util.concurrent.ScheduledExecutorService")
+ @Metadata(label = "advanced", javaType =
"java.util.concurrent.ScheduledExecutorService")
private String timeoutScheduledExecutorService;
@XmlAttribute
- @Metadata(label = "bulkhead", defaultValue = "false", javaType =
"java.lang.Boolean")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
private String bulkheadEnabled;
@XmlAttribute
- @Metadata(label = "bulkhead", defaultValue = "10", javaType =
"java.lang.Integer")
+ @Metadata(label = "advanced", defaultValue = "10", javaType =
"java.lang.Integer")
private String bulkheadMaxConcurrentCalls;
@XmlAttribute
- @Metadata(label = "bulkhead", defaultValue = "10", javaType =
"java.lang.Integer")
+ @Metadata(label = "advanced", defaultValue = "10", javaType =
"java.lang.Integer")
private String bulkheadWaitingTaskQueue;
@XmlAttribute
- @Metadata(label = "bulkhead", javaType =
"java.util.concurrent.ExecutorService")
+ @Metadata(label = "advanced", javaType =
"java.util.concurrent.ExecutorService")
private String bulkheadExecutorService;
// Getter/Setter
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
index 244339d..32f160e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.Metadata;
public class FilterDefinition extends OutputExpressionNode {
@XmlAttribute
+ @Metadata(label = "advanced")
private String statusPropertyName;
public FilterDefinition() {
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
index 94389c7..fe08df5 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -33,14 +33,16 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "from")
@XmlAccessorType(XmlAccessType.FIELD)
public class FromDefinition extends
OptionalIdentifiedDefinition<FromDefinition> implements
EndpointRequiredDefinition {
- @XmlAttribute
- @Metadata(required = true)
- private String uri;
+
@XmlTransient
private Endpoint endpoint;
@XmlTransient
private EndpointConsumerBuilder endpointConsumerBuilder;
+ @XmlAttribute
+ @Metadata(required = true)
+ private String uri;
+
public FromDefinition() {
}
