You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/11/15 10:33:08 UTC

[camel] branch CAMEL-14182 updated: CAMEL-14182: Make Hystrix EIP general as Circuit Breaker EIP and allow to plugin other implementations.

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

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


The following commit(s) were added to refs/heads/CAMEL-14182 by this push:
     new edb137e  CAMEL-14182: Make Hystrix EIP general as Circuit Breaker EIP and allow to plugin other implementations.
edb137e is described below

commit edb137e97f103e8a80330de36b372e8cc0e5ca3a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Nov 15 11:32:53 2019 +0100

    CAMEL-14182: Make Hystrix EIP general as Circuit Breaker EIP and allow to plugin other implementations.
---
 .../main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java | 2 +-
 .../hystrix/processor/HystrixHierarchicalConfigurationTest.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java
index 26d35f0..35477eb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java
@@ -40,7 +40,7 @@ import org.apache.camel.spi.RouteContext;
  * to the name of the {@link ProcessorFactory} the Camel component implement, which gets called for creating
  * the {@link Processor}s for the EIP.
  * <p/>
- * The Hystrix EIP is such an example where {@link org.apache.camel.model.HystrixDefinition} is implemented
+ * The Hystrix EIP is such an example where the circuit breaker EIP (CircuitBreakerDefinition) is implemented
  * in the <tt>camel-hystrix</tt> component.
  */
 public class DefaultProcessorFactory implements ProcessorFactory {
diff --git a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
index e3126aa..8adf5ea 100644
--- a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
+++ b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
@@ -73,7 +73,7 @@ public class HystrixHierarchicalConfigurationTest {
             .filter(CircuitBreakerDefinition.class::isInstance)
             .map(CircuitBreakerDefinition.class::cast)
             .findFirst()
-            .orElseThrow(() -> new IllegalStateException("Unable to find a HystrixDefinition"));
+            .orElseThrow(() -> new IllegalStateException("Unable to find a CircuitBreakerDefinition"));
     }
 }