[camel] branch master updated: Camel-core-engine: Fixed CS

[ac...@apache.org]

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

acosentino 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 950268a  Camel-core-engine: Fixed CS
950268a is described below

commit 950268a43f12a13a9b5a2005ac9056cf402304b5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 7 10:08:01 2020 +0200

    Camel-core-engine: Fixed CS
---
 .../eips/pages/faultToleranceConfiguration-eip.adoc   | 19 +++++--------------
 .../org/apache/camel/impl/DefaultCamelContext.java    |  2 +-
 .../main/java/org/apache/camel/impl/DefaultModel.java |  2 +-
 .../apache/camel/impl/lw/LightweightCamelContext.java |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

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 aa7ea32..16365f0 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,24 +3,15 @@
 
 
 // eip options: START
-The Fault Tolerance Configuration EIP supports 13 options which are listed below:
+The Fault Tolerance Configuration EIP supports 5 options which are listed below:
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *circuitBreakerRef* | 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. |  | String
-| *delay* | Control how long the circuit breaker stays open. The value are in seconds and the default is 5 seconds. | 5 | long
-| *successThreshold* | Controls the number of trial calls which are allowed when the circuit breaker is half-open. | 1 | int
-| *requestVolumeThreshold* | Controls the size of the rolling window used when the circuit breaker is closed. | 20 | int
-| *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 | int
-| *timeoutEnabled* | Whether timeout is enabled or not on the circuit breaker. | false | boolean
-| *timeoutDuration* | Configures the thread execution timeout. Default value is 1 second. | 1000 | int
-| *timeoutPoolSize* | Configures the pool size of the thread pool when timeout is enabled. Default value is 10. | 10 | int
-| *timeoutScheduledExecutorServiceRef* | References to a custom thread pool to use when timeout is enabled | | String
-| *bulkheadEnabled* | Whether bulkhead is enabled or not on the circuit breaker. | false | boolean
-| *bulkheadMaxConcurrentCalls* | Configures the max amount of concurrent calls the bulkhead will support. | 10 | int
-| *bulkheadWaitingTaskQueue* | Configures the task queue size for holding waiting tasks to be processed by the bulkhead. | 10 | int
-| *bulkheadExecutorServiceRef* | References to a custom thread pool to use when bulkhead is enabled. |  | String
-
+| *delay* | Control how long the circuit breaker stays open. The value are in seconds and the default is 5 seconds. | 5 | Long
+| *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
 |===
 // eip options: END
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index f14f5b5..a53f472 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -35,8 +35,8 @@ import org.apache.camel.impl.engine.SimpleCamelContext;
 import org.apache.camel.impl.transformer.TransformerKey;
 import org.apache.camel.impl.validator.ValidatorKey;
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.FaultToleranceConfigurationDefinition;
+import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.ProcessorDefinition;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
index 9bb0672..3145fdc 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
@@ -29,8 +29,8 @@ import java.util.function.Function;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.FaultToleranceConfigurationDefinition;
+import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.ProcessorDefinition;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index 8a943e0..9aff7dd 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -56,8 +56,8 @@ import org.apache.camel.catalog.RuntimeCamelCatalog;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.DefaultRoute;
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.FaultToleranceConfigurationDefinition;
+import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.Resilience4jConfigurationDefinition;