[camel] branch main updated: CAMEL-18600: properties component - Allow to turn off nested placeholders

[nfilotto]

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

nfilotto 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 71854cbd2cd CAMEL-18600: properties component - Allow to turn off 
nested placeholders
71854cbd2cd is described below

commit 71854cbd2cdb71b453e01d7d750be0232268ba8f
Author: Nicolas Filotto <nfilo...@talend.com>
AuthorDate: Tue Oct 11 11:48:17 2022 +0200

    CAMEL-18600: properties component - Allow to turn off nested placeholders
---
 .../spring/spi/BridgePropertyPlaceholderConfigurer.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
index ee5e99b357e..753c35d348f 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
@@ -85,10 +85,12 @@ public class BridgePropertyPlaceholderConfigurer extends 
PropertyPlaceholderConf
     }
 
     @Override
-    public String parseUri(String text, PropertiesLookup properties, boolean 
fallback, boolean keepUnresolvedOptional)
+    public String parseUri(
+            String text, PropertiesLookup properties, boolean fallback, 
boolean keepUnresolvedOptional,
+            boolean nestedPlaceholder)
             throws IllegalArgumentException {
         // first let Camel parse the text as it may contain Camel placeholders
-        String answer = parser.parseUri(text, properties, fallback, 
keepUnresolvedOptional);
+        String answer = parser.parseUri(text, properties, fallback, 
keepUnresolvedOptional, nestedPlaceholder);
 
         // then let Spring parse it to resolve any Spring placeholders
         if (answer != null) {
@@ -198,16 +200,18 @@ public class BridgePropertyPlaceholderConfigurer extends 
PropertyPlaceholderConf
         }
 
         @Override
-        public String parseUri(String text, PropertiesLookup properties, 
boolean fallback, boolean keepUnresolvedOptional)
+        public String parseUri(
+                String text, PropertiesLookup properties, boolean fallback, 
boolean keepUnresolvedOptional,
+                boolean nestedPlaceholder)
                 throws IllegalArgumentException {
             String answer = null;
             if (delegate != null) {
-                answer = delegate.parseUri(text, properties, fallback, 
keepUnresolvedOptional);
+                answer = delegate.parseUri(text, properties, fallback, 
keepUnresolvedOptional, nestedPlaceholder);
             }
             if (answer != null) {
                 text = answer;
             }
-            return parser.parseUri(text, properties, fallback, 
keepUnresolvedOptional);
+            return parser.parseUri(text, properties, fallback, 
keepUnresolvedOptional, nestedPlaceholder);
         }
 
         @Override