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 1b4cdc4 CAMEL-17701: camel-core-model - Add labels to EIP options
1b4cdc4 is described below
commit 1b4cdc40ca33054962af66b57287cb8621d0d69b
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Feb 28 11:31:59 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../main/camel-main-configuration-metadata.json | 12 +++++------
.../org/apache/camel/catalog/models/inputType.json | 4 ++--
.../catalog/models/interceptSendToEndpoint.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 4 ++--
.../org/apache/camel/model/inputType.json | 4 ++--
.../camel/model/interceptSendToEndpoint.json | 2 +-
.../apache/camel/model/GlobalOptionDefinition.java | 5 +++--
.../camel/model/GlobalOptionsDefinition.java | 1 +
.../org/apache/camel/model/HasExpressionType.java | 6 ++++++
.../org/apache/camel/model/IdentifiedType.java | 15 ++-----------
.../apache/camel/model/InputTypeDefinition.java | 25 ++++------------------
.../apache/camel/model/InterceptDefinition.java | 1 +
.../camel/model/InterceptFromDefinition.java | 1 +
.../model/InterceptSendToEndpointDefinition.java | 1 +
14 files changed, 33 insertions(+), 50 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 4e177c0..6b352f8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -121,10 +121,10 @@
{ "name": "camel.main.useMdcLogging", "description": "To turn on MDC
logging", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
"type": "boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.uuidGenerator", "description": "UUID generator to
use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple
(long incrementing counter), off (turned off for exchanges - only intended for
performance profiling)", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "defaultValue": "default", "enum": [ "classic",
"default", "short", "simple", "off" ] },
{ "name": "camel.faulttolerance.bulkheadEnabled", "description": "Whether
bulkhead is enabled or not on the circuit breaker. Default is false.",
"sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties",
"type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false },
- { "name": "camel.faulttolerance.bulkheadExecutorServiceRef",
"description": "References to a custom thread pool to use when bulkhead is
enabled.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
+ { "name": "camel.faulttolerance.bulkheadExecutorService", "description":
"References to a custom thread pool to use when bulkhead is enabled.",
"sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties",
"type": "string", "javaType": "java.lang.String" },
{ "name": "camel.faulttolerance.bulkheadMaxConcurrentCalls",
"description": "Configures the max amount of concurrent calls the bulkhead will
support. Default value is 10.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue": 10 },
{ "name": "camel.faulttolerance.bulkheadWaitingTaskQueue", "description":
"Configures the task queue size for holding waiting tasks to be processed by
the bulkhead. Default value is 10.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue": 10 },
- { "name": "camel.faulttolerance.circuitBreakerRef", "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.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
+ { "name": "camel.faulttolerance.circuitBreaker", "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.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.faulttolerance.delay", "description": "Control how long
the circuit breaker stays open. The value are in seconds and the default is 5
seconds.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Long", "defaultValue": 5 },
{ "name": "camel.faulttolerance.failureRatio", "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. Default value is 50 percentage.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue [...]
{ "name": "camel.faulttolerance.requestVolumeThreshold", "description":
"Controls the size of the rolling window used when the circuit breaker is
closed Default value is 20.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue": 20 },
@@ -132,7 +132,7 @@
{ "name": "camel.faulttolerance.timeoutDuration", "description":
"Configures the thread execution timeout. Default value is 1000 milliseconds.",
"sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties",
"type": "integer", "javaType": "java.lang.Long", "defaultValue": 1000 },
{ "name": "camel.faulttolerance.timeoutEnabled", "description": "Whether
timeout is enabled or not on the circuit breaker. Default is false.",
"sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties",
"type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false },
{ "name": "camel.faulttolerance.timeoutPoolSize", "description":
"Configures the pool size of the thread pool when timeout is enabled. Default
value is 10.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue": 10 },
- { "name": "camel.faulttolerance.timeoutScheduledExecutorServiceRef",
"description": "References to a custom thread pool to use when timeout is
enabled", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
+ { "name": "camel.faulttolerance.timeoutScheduledExecutorService",
"description": "References to a custom thread pool to use when timeout is
enabled", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.health.consumersEnabled", "description": "Whether
consumers health check is enabled", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.health.enabled", "description": "Whether health check is
enabled globally", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.health.excludePattern", "description": "Pattern to
exclude health checks from being invoked by Camel when checking healths.
Multiple patterns can be separated by comma.", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
@@ -178,8 +178,8 @@
{ "name": "camel.resilience4j.bulkheadEnabled", "description": "Whether
bulkhead is enabled or not on the circuit breaker.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": false },
{ "name": "camel.resilience4j.bulkheadMaxConcurrentCalls", "description":
"Configures the max amount of concurrent calls the bulkhead will support.",
"sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties",
"type": "integer", "javaType": "java.lang.Integer" },
{ "name": "camel.resilience4j.bulkheadMaxWaitDuration", "description":
"Configures a maximum amount of time which the calling thread will wait to
enter the bulkhead. If bulkhead has space available, entry is guaranteed and
immediate. If bulkhead is full, calling threads will contest for space, if it
becomes available. maxWaitDuration can be set to 0. Note: for threads running
on an event-loop or equivalent (rx computation pool, etc), setting
maxWaitDuration to 0 is highly recommended [...]
- { "name": "camel.resilience4j.circuitBreakerRef", "description": "Refers
to an existing io.github.resilience4j.circuitbreaker.CircuitBreaker instance to
lookup and use from the registry. When using this, then any other circuit
breaker options are not in use.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
- { "name": "camel.resilience4j.configRef", "description": "Refers to an
existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to
lookup and use from the registry.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
+ { "name": "camel.resilience4j.circuitBreaker", "description": "Refers to
an existing io.github.resilience4j.circuitbreaker.CircuitBreaker instance to
lookup and use from the registry. When using this, then any other circuit
breaker options are not in use.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
+ { "name": "camel.resilience4j.config", "description": "Refers to an
existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to
lookup and use from the registry.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.resilience4j.failureRateThreshold", "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. Default value is 50 percentage.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "number",
"javaType": "java.lang.Float", "defaultValu [...]
{ "name": "camel.resilience4j.minimumNumberOfCalls", "description":
"Configures configures the minimum number of calls which are required (per
sliding window period) before the CircuitBreaker can calculate the error rate.
For example, if minimumNumberOfCalls is 10, then at least 10 calls must be
recorded, before the failure rate can be calculated. If only 9 calls have been
recorded the CircuitBreaker will not transition to open even if all 9 calls
have failed. Default minimumNumberOf [...]
{ "name": "camel.resilience4j.permittedNumberOfCallsInHalfOpenState",
"description": "Configures the number of permitted calls when the
CircuitBreaker is half open. The size must be greater than 0. Default size is
10.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "integer",
"javaType": "java.lang.Integer", "defaultValue": 10 },
@@ -190,7 +190,7 @@
{ "name": "camel.resilience4j.timeoutCancelRunningFuture", "description":
"Configures whether cancel is called on the running future. Defaults to true.",
"sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties",
"type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.resilience4j.timeoutDuration", "description": "Configures
the thread execution timeout (millis). Default value is 1000 millis (1
second).", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "integer",
"javaType": "java.lang.Integer", "defaultValue": 1000 },
{ "name": "camel.resilience4j.timeoutEnabled", "description": "Whether
timeout is enabled or not on the circuit breaker. Default is false.",
"sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties",
"type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false },
- { "name": "camel.resilience4j.timeoutExecutorServiceRef", "description":
"References to a custom thread pool to use when timeout is enabled (uses
ForkJoinPool#commonPool() by default)", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
+ { "name": "camel.resilience4j.timeoutExecutorService", "description":
"References to a custom thread pool to use when timeout is enabled (uses
ForkJoinPool#commonPool() by default)", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.resilience4j.waitDurationInOpenState", "description":
"Configures the wait duration (in seconds) which specifies how long the
CircuitBreaker should stay open, before it switches to half open. Default value
is 60 seconds.", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "integer",
"javaType": "java.lang.Integer", "defaultValue": 60 },
{ "name": "camel.resilience4j.writableStackTraceEnabled", "description":
"Enables writable stack traces. When set to false, Exception.getStackTrace
returns a zero length array. This may be used to reduce log spam when the
circuit breaker is open as the cause of the exceptions is already known (the
circuit breaker is short-circuiting calls).", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": [...]
{ "name": "camel.rest.apiComponent", "description": "Sets the name of the
Camel component to use as the REST API (such as swagger or openapi)",
"sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string",
"javaType": "java.lang.String" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/inputType.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/inputType.json
index d0b904f..9b8a941 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/inputType.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/inputType.json
@@ -12,8 +12,8 @@
"output": false
},
"properties": {
- "urn": { "kind": "attribute", "displayName": "Urn", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set input type URN." },
- "validate": { "kind": "attribute", "displayName": "Validate", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Set
if validation is required for this input type." },
+ "urn": { "kind": "attribute", "displayName": "Urn", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The input type URN." },
+ "validate": { "kind": "attribute", "displayName": "Validate", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether if validation is required for this input type." },
"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/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 8f858d6..13cc78e 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
@@ -14,7 +14,7 @@
"properties": {
"uri": { "kind": "attribute", "displayName": "Uri", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Intercept sending to the
uri or uri pattern." },
"skipSendToOriginalEndpoint": { "kind": "attribute", "displayName": "Skip
Send To Original Endpoint", "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": { "kind": "attribute", "displayName": "After Uri", "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."
},
+ "afterUri": { "kind": "attribute", "displayName": "After Uri", "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." },
"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/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 44df95f..be9a1f8 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
@@ -5200,14 +5200,14 @@ Sets the uri of the endpoint to send to.
<xs:attribute name="urn" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Set input type URN.
+The input type URN.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="validate" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Set if validation is required for this input type. Default value: false
+Whether if validation is required for this input type. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
index d0b904f..9b8a941 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
@@ -12,8 +12,8 @@
"output": false
},
"properties": {
- "urn": { "kind": "attribute", "displayName": "Urn", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set input type URN." },
- "validate": { "kind": "attribute", "displayName": "Validate", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Set
if validation is required for this input type." },
+ "urn": { "kind": "attribute", "displayName": "Urn", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The input type URN." },
+ "validate": { "kind": "attribute", "displayName": "Validate", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether if validation is required for this input type." },
"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/interceptSendToEndpoint.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
index 8f858d6..13cc78e 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
@@ -14,7 +14,7 @@
"properties": {
"uri": { "kind": "attribute", "displayName": "Uri", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Intercept sending to the
uri or uri pattern." },
"skipSendToOriginalEndpoint": { "kind": "attribute", "displayName": "Skip
Send To Original Endpoint", "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": { "kind": "attribute", "displayName": "After Uri", "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."
},
+ "afterUri": { "kind": "attribute", "displayName": "After Uri", "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." },
"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/GlobalOptionDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
index c3b212c..a4bac8c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
@@ -30,10 +30,11 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "globalOption")
@XmlAccessorType(XmlAccessType.FIELD)
public class GlobalOptionDefinition {
+
@XmlAttribute(required = true)
- String key;
+ private String key;
@XmlAttribute(required = true)
- String value;
+ private String value;
public GlobalOptionDefinition() {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
index a7f5c42..782bb7e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "globalOptions")
@XmlAccessorType(XmlAccessType.FIELD)
public class GlobalOptionsDefinition {
+
@XmlElement(name = "globalOption")
private List<GlobalOptionDefinition> globalOptions;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/HasExpressionType.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/HasExpressionType.java
index 39a8a9c..60d0bb8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/HasExpressionType.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/HasExpressionType.java
@@ -23,7 +23,13 @@ import org.apache.camel.model.language.ExpressionDefinition;
*/
public interface HasExpressionType {
+ /**
+ * Gets the expression definition
+ */
ExpressionDefinition getExpressionType();
+ /**
+ * Sets the expression definition
+ */
void setExpressionType(ExpressionDefinition expressionType);
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
index 5cffb86..08cadff 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
@@ -25,23 +25,12 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.camel.spi.Metadata;
/**
- * The unique identifier for a bean. The scope of the identifier is the
enclosing bean factory.
- * <p>
- * The following schema fragment specifies the expected content contained
within this class.
- *
- * <pre>
- * <complexType name="identifiedType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
+ * The unique identifier for an EIP.
*/
@XmlType(name = "identifiedType")
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class IdentifiedType {
+
@XmlAttribute
@XmlID
@Metadata(description = "The id of this node")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
index b06a317..d50835f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
@@ -30,19 +30,18 @@ import org.apache.camel.spi.Metadata;
* qualified class name. For example {@code java:java.lang.String}, {@code
json:ABCOrder}. It's also possible to specify
* only scheme part, so that it works like a wildcard. If only 'xml' is
specified, all the XML message matches. It's
* handy to add only one transformer/validator for all the transformation
from/to XML.
- *
- * @see {@link OutputTypeDefinition} {@link Transformer} {@link Validator}
*/
@Metadata(label = "configuration")
@XmlRootElement(name = "inputType")
@XmlAccessorType(XmlAccessType.FIELD)
public class InputTypeDefinition extends
OptionalIdentifiedDefinition<InputTypeDefinition> {
+
@XmlAttribute
@Metadata(required = true)
private String urn;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "false")
- private String validate = "false";
+ private String validate;
public InputTypeDefinition() {
}
@@ -62,19 +61,12 @@ public class InputTypeDefinition extends
OptionalIdentifiedDefinition<InputTypeD
return this;
}
- /**
- * Get input type URN.
- *
- * @return input type URN
- */
public String getUrn() {
return urn;
}
/**
- * Set input type URN.
- *
- * @param urn input type URN
+ * The input type URN.
*/
public void setUrn(String urn) {
this.urn = urn;
@@ -82,26 +74,17 @@ public class InputTypeDefinition extends
OptionalIdentifiedDefinition<InputTypeD
/**
* Set input type via Java Class.
- *
- * @param clazz Java Class
*/
public void setJavaClass(Class<?> clazz) {
this.urn = "java:" + clazz.getName();
}
- /**
- * Get if validation is required for this input type.
- *
- * @return true if validate
- */
public String getValidate() {
return this.validate;
}
/**
- * Set if validation is required for this input type.
- *
- * @param validate true if validate
+ * Whether if validation is required for this input type.
*/
public void setValidate(String validate) {
this.validate = validate;
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 d08573c..3761add 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
@@ -37,6 +37,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "intercept")
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptDefinition extends OutputDefinition<InterceptDefinition>
{
+
@XmlTransient
protected final List<Processor> intercepted = new ArrayList<>();
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
index c062d56..8695a1d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "interceptFrom")
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptFromDefinition extends InterceptDefinition {
+
@XmlAttribute
protected String uri;
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 af9380c..f63d39b 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
@@ -41,6 +41,7 @@ public class InterceptSendToEndpointDefinition extends
OutputDefinition<Intercep
@XmlAttribute
private String skipSendToOriginalEndpoint;
@XmlAttribute
+ @Metadata(label = "advanced")
private String afterUri;
public InterceptSendToEndpointDefinition() {
