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 52f6e028d03 camel-resilience4j - Upgrade to 2.x (#9094)
52f6e028d03 is described below
commit 52f6e028d03311e02aaa1af70380c11334ac85b2
Author: Anthony Defraine <[email protected]>
AuthorDate: Fri Jan 13 16:04:32 2023 +0100
camel-resilience4j - Upgrade to 2.x (#9094)
Co-authored-by: Anthony Defraine <[email protected]>
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/component/resilience4j/ResilienceProcessor.java | 3 ++-
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 331f267cd4c..ef06b025332 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -448,7 +448,7 @@
<reactor-version>3.5.1</reactor-version>
<reactor-netty-version>1.1.1</reactor-netty-version>
<redisson-version>3.16.7</redisson-version>
- <resilience4j-version>1.7.1</resilience4j-version>
+ <resilience4j-version>2.0.2</resilience4j-version>
<rest-assured-version>4.5.1</rest-assured-version>
<roaster-version>2.26.0.Final</roaster-version>
<robotframework-version>4.1.2</robotframework-version>
diff --git
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
index 0acf20d903e..04d755d1e07 100644
---
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
+++
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.resilience4j;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
@@ -386,7 +387,7 @@ public class ResilienceProcessor extends
AsyncProcessorSupport
@ManagedAttribute
public long getCircuitBreakerWaitDurationInOpenState() {
- return circuitBreakerConfig.getWaitDurationInOpenState().getSeconds();
+ return
Duration.ofMillis(circuitBreakerConfig.getWaitIntervalFunctionInOpenState().apply(1)).getSeconds();
}
@ManagedAttribute
diff --git a/parent/pom.xml b/parent/pom.xml
index a78ee03db5f..3a15b19bf5f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -443,7 +443,7 @@
<reactor-version>3.5.1</reactor-version>
<reactor-netty-version>1.1.1</reactor-netty-version>
<redisson-version>3.16.7</redisson-version>
- <resilience4j-version>1.7.1</resilience4j-version>
+ <resilience4j-version>2.0.2</resilience4j-version>
<rest-assured-version>4.5.1</rest-assured-version>
<roaster-version>2.26.0.Final</roaster-version>
<robotframework-version>4.1.2</robotframework-version>