[camel] branch master updated: CAMEL-14179: Fixed xml dsl and docs

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d99a35  CAMEL-14179: Fixed xml dsl and docs
2d99a35 is described below

commit 2d99a35ceaa892924336fd4408c905507c342340
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 7 16:54:24 2020 +0200

    CAMEL-14179: Fixed xml dsl and docs
---
 .../org/apache/camel/model/faultToleranceConfiguration.json    |  8 ++++++++
 .../modules/eips/pages/faultToleranceConfiguration-eip.adoc    | 10 +++++++++-
 .../apache/camel/model/FaultToleranceConfigurationCommon.java  |  8 ++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
index 6732593..b5ba8bc 100644
--- a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
+++ b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
@@ -16,6 +16,14 @@
     "successThreshold": { "kind": "attribute", "displayName": "Success Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": 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, "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, "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. Default value is 50 p [...]
+    "timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": 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": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Configures the thread execution timeout. Default value is 1 second." },
+    "timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the pool size of the thread pool when timeout is enabled. Default value is 10." },
+    "timeoutScheduledExecutorServiceRef": { "kind": "attribute", "displayName": "Timeout Scheduled Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "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, "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", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": 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", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the task queue size for holding waiting tasks to be processed by the bulkhead." },
+    "bulkheadExecutorServiceRef": { "kind": "attribute", "displayName": "Bulkhead Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": 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, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
index 16365f0..f02d211 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
@@ -3,7 +3,7 @@
 
 
 // eip options: START
-The Fault Tolerance Configuration EIP supports 5 options which are listed below:
+The Fault Tolerance Configuration EIP supports 13 options which are listed below:
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
@@ -13,5 +13,13 @@ The Fault Tolerance Configuration EIP supports 5 options which are listed below:
 | *successThreshold* | Controls the number of trial calls which are allowed when the circuit breaker is half-open | 1 | Integer
 | *requestVolumeThreshold* | Controls the size of the rolling window used when the circuit breaker is closed | 20 | Integer
 | *failureRatio* | 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. | 50 | Integer
+| *timeoutEnabled* | Whether timeout is enabled or not on the circuit breaker. Default is false. | false | Boolean
+| *timeoutDuration* | Configures the thread execution timeout. Default value is 1 second. | 1000 | Long
+| *timeoutPoolSize* | Configures the pool size of the thread pool when timeout is enabled. Default value is 10. | 10 | Integer
+| *timeoutScheduledExecutor ServiceRef* | References to a custom thread pool to use when timeout is enabled |  | String
+| *bulkheadEnabled* | Whether bulkhead is enabled or not on the circuit breaker. Default is false. | false | Boolean
+| *bulkheadMaxConcurrentCalls* | Configures the max amount of concurrent calls the bulkhead will support. | 10 | Integer
+| *bulkheadWaitingTaskQueue* | Configures the task queue size for holding waiting tasks to be processed by the bulkhead. | 10 | Integer
+| *bulkheadExecutorServiceRef* | References to a custom thread pool to use when bulkhead is enabled. |  | String
 |===
 // eip options: END
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
index 563c092..c931e34 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
@@ -40,20 +40,28 @@ public class FaultToleranceConfigurationCommon extends IdentifiedType {
     @XmlAttribute
     @Metadata(label = "circuitbreaker", defaultValue = "50", javaType = "java.lang.Integer")
     private String failureRatio;
+    @XmlAttribute
     @Metadata(label = "timeout", defaultValue = "false", javaType = "java.lang.Boolean")
     private String timeoutEnabled;
+    @XmlAttribute
     @Metadata(label = "timeout", defaultValue = "1000", javaType = "java.lang.Long")
     private String timeoutDuration;
+    @XmlAttribute
     @Metadata(label = "timeout", defaultValue = "10", javaType = "java.lang.Integer")
     private String timeoutPoolSize;
+    @XmlAttribute
     @Metadata(label = "timeout")
     private String timeoutScheduledExecutorServiceRef;
+    @XmlAttribute
     @Metadata(label = "bulkhead", defaultValue = "false", javaType = "java.lang.Boolean")
     private String bulkheadEnabled;
+    @XmlAttribute
     @Metadata(label = "bulkhead", defaultValue = "10", javaType = "java.lang.Integer")
     private String bulkheadMaxConcurrentCalls;
+    @XmlAttribute
     @Metadata(label = "bulkhead", defaultValue = "10", javaType = "java.lang.Integer")
     private String bulkheadWaitingTaskQueue;
+    @XmlAttribute
     @Metadata(label = "bulkhead")
     private String bulkheadExecutorServiceRef;