You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2024/05/06 08:58:54 UTC
(camel-spring-boot) 02/02: Avoid clashes with default parser defined in CamelAutoConfiguration
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 3432a2a24fa317ed1b7812c0c6516cb15c1ace73
Author: Croway <fe...@gmail.com>
AuthorDate: Mon May 6 09:33:37 2024 +0200
Avoid clashes with default parser defined in CamelAutoConfiguration
---
.../JasyptEncryptedPropertiesAutoconfiguration.java | 5 +++--
.../springboot/JasyptSpringEncryptedPropertiesParser.java | 11 ++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
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 5b7dacec7bf..9f59f4f7833 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
@@ -39,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.ResolvableType;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertyResolver;
@@ -111,8 +112,8 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
@Bean
@ConditionalOnMissingBean(PropertiesParser.class)
public PropertiesParser encryptedPropertiesParser(PropertyResolver propertyResolver,
- StringEncryptor stringEncryptor) {
- return new JasyptSpringEncryptedPropertiesParser(propertyResolver, stringEncryptor);
+ StringEncryptor stringEncryptor, Environment env) {
+ return new JasyptSpringEncryptedPropertiesParser(propertyResolver, stringEncryptor, env);
}
public SaltGenerator getSaltGenerator(JasyptEncryptedPropertiesConfiguration configuration) {
diff --git a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
index e836ff7de25..c827784064b 100644
--- a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
+++ b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
@@ -16,23 +16,28 @@
*/
package org.apache.camel.component.jasypt.springboot;
-import org.apache.camel.component.properties.DefaultPropertiesParser;
import org.apache.camel.component.properties.PropertiesLookup;
+import org.apache.camel.spring.boot.SpringPropertiesParser;
import org.jasypt.encryption.StringEncryptor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertyResolver;
import static org.jasypt.properties.PropertyValueEncryptionUtils.isEncryptedValue;
import static org.jasypt.properties.PropertyValueEncryptionUtils.decrypt;
-public class JasyptSpringEncryptedPropertiesParser extends DefaultPropertiesParser {
+public class JasyptSpringEncryptedPropertiesParser extends SpringPropertiesParser {
private PropertyResolver propertyResolver;
private StringEncryptor stringEncryptor;
@Autowired
- public JasyptSpringEncryptedPropertiesParser(PropertyResolver propertyResolver, StringEncryptor stringEncryptor) {
+ public JasyptSpringEncryptedPropertiesParser(
+ PropertyResolver propertyResolver,
+ StringEncryptor stringEncryptor,
+ Environment env) {
+ super(env);
this.propertyResolver = propertyResolver;
this.stringEncryptor = stringEncryptor;
}