(camel-spring-boot) 01/02: Make Jasypt beans conditional so that can be overridden

[fmariani]

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

fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 7fd41b1c5bc68a45eed476acb131608177bc1165
Author: Croway <federico.mariani.1...@gmail.com>
AuthorDate: Mon May 6 09:03:41 2024 +0200

    Make Jasypt beans conditional so that can be overridden
---
 .../jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
 
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
index 7e7482463bd..5b7dacec7bf 100644
--- 
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
+++ 
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
@@ -58,6 +58,7 @@ import static 
org.springframework.core.annotation.AnnotationUtils.findAnnotation
 public class JasyptEncryptedPropertiesAutoconfiguration {
 
     @Bean
+    @ConditionalOnMissingBean(JasyptEncryptedPropertiesConfiguration.class)
     public JasyptEncryptedPropertiesConfiguration 
JasyptEncryptedPropertiesAutoconfiguration(
             final ConfigurableEnvironment environment) {
         JasyptEncryptedPropertiesConfiguration config = new 
JasyptEncryptedPropertiesConfiguration();
@@ -98,6 +99,7 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
     }
 
     @Bean
+    
@ConditionalOnMissingBean(EncryptablePropertySourcesPlaceholderConfigurer.class)
     public EncryptablePropertySourcesPlaceholderConfigurer 
propertyConfigurer(StringEncryptor stringEncryptor) {
         return new 
EncryptablePropertySourcesPlaceholderConfigurer(stringEncryptor);
     }
@@ -107,6 +109,7 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
      * properties inside the camel context.
      */
     @Bean
+    @ConditionalOnMissingBean(PropertiesParser.class)
     public PropertiesParser encryptedPropertiesParser(PropertyResolver 
propertyResolver,
             StringEncryptor stringEncryptor) {
         return new JasyptSpringEncryptedPropertiesParser(propertyResolver, 
stringEncryptor);