[camel] branch main updated: CAMEL-17638: EIP model options with old fashioned naming xxxRef style should be made modern style.

[davsclaus]

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 5d4b771  CAMEL-17638: EIP model options with old fashioned naming 
xxxRef style should be made modern style.
5d4b771 is described below

commit 5d4b77197c94fa5a83a54b16a5911418b07c9c63
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Feb 25 15:29:59 2022 +0100

    CAMEL-17638: EIP model options with old fashioned naming xxxRef style 
should be made modern style.
---
 .../camel/component/hystrix/processor/HystrixCircuitOpenTest.java       | 2 ++
 .../component/hystrix/processor/SpringHystrixRouteConfigRefTest.xml     | 2 +-
 .../hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.xml      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
 
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
index 43fdf8b..eb0d763 100644
--- 
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
+++ 
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
@@ -25,10 +25,12 @@ import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.CircuitBreakerConstants;
 import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Disabled("Flaky test")
 public class HystrixCircuitOpenTest extends CamelTestSupport {
     public static final Integer REQUEST_VOLUME_THRESHOLD = 4;
     private static final Logger LOG = 
LoggerFactory.getLogger(HystrixCircuitOpenTest.class);
diff --git 
a/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.xml
 
b/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.xml
index 40cdf25..a6b0acb 100644
--- 
a/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.xml
+++ 
b/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.xml
@@ -29,7 +29,7 @@
 
     <route>
       <from uri="direct:start"/>
-      <circuitBreaker configurationRef="hysConfig">
+      <circuitBreaker configuration="hysConfig">
         <to uri="direct:foo"/>
         <onFallback>
           <transform>
diff --git 
a/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.xml
 
b/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.xml
index 2378bf2..f406d1d 100644
--- 
a/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.xml
+++ 
b/components/camel-hystrix/src/test/resources/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.xml
@@ -30,7 +30,7 @@
 
     <route id="hystrix-route">
       <from uri="direct:start"/>
-      <circuitBreaker configurationRef="ref-hystrix">
+      <circuitBreaker configuration="ref-hystrix">
         <hystrixConfiguration groupKey="local-conf-group-key" 
requestLogEnabled="false"/>
         <to uri="direct:foo"/>
         <onFallback>