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 2020/12/04 14:52:51 UTC
[camel] branch master updated: CAMEL-15917: Resilience4j Property
Component doesn't work for configurationRef (#4721)
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 1b8f013 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721)
1b8f013 is described below
commit 1b8f013acbf1a143612717ee70178d23bbd739dc
Author: Liroyd <al...@yahoo.com>
AuthorDate: Fri Dec 4 16:52:32 2020 +0200
CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721)
Support property placeholder for ResilienceReifier and FaultToleranceReifier circuit breaker configurationRef in routes definitions
---
.../component/microprofile/faulttolerance/FaultToleranceReifier.java | 2 +-
.../java/org/apache/camel/component/resilience4j/ResilienceReifier.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
index 338a373..ee7411d 100644
--- a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
+++ b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
@@ -148,7 +148,7 @@ public class FaultToleranceReifier extends ProcessorReifier<CircuitBreakerDefini
// Extract properties from referenced configuration, the one configured
// on camel context takes the precedence over those in the registry
if (definition.getConfigurationRef() != null) {
- final String ref = definition.getConfigurationRef();
+ final String ref = parseString(definition.getConfigurationRef());
loadProperties(properties, Suppliers.firstNotNull(
() -> camelContext.getExtension(Model.class).getFaultToleranceConfiguration(ref),
diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
index 1782d16..76c9597 100644
--- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
+++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
@@ -180,7 +180,7 @@ public class ResilienceReifier extends ProcessorReifier<CircuitBreakerDefinition
// Extract properties from referenced configuration, the one configured
// on camel context takes the precedence over those in the registry
if (definition.getConfigurationRef() != null) {
- final String ref = definition.getConfigurationRef();
+ final String ref = parseString(definition.getConfigurationRef());
loadProperties(properties, Suppliers.firstNotNull(
() -> camelContext.getExtension(Model.class).getResilience4jConfiguration(ref),