From a237eb74665b407326b4cc886b1111dd5e3ee64c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 3 Feb 2020 20:17:22 -0500 Subject: [PATCH] plainTextEncrypt property should be true. Fixes #1541 --- .../config/server/config/ResourceEncryptorConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceEncryptorConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceEncryptorConfiguration.java index 50b31189..7ae92bcc 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceEncryptorConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceEncryptorConfiguration.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.cloud.config.server.encryption.CipherResourceJsonEncryptor; import org.springframework.cloud.config.server.encryption.CipherResourcePropertiesEncryptor; @@ -39,7 +40,8 @@ import org.springframework.context.annotation.Configuration; * @author Sean Stiglitz */ @Configuration -@ConditionalOnExpression("${spring.cloud.config.server.encrypt.enabled:true} && ${spring.cloud.config.server.encrypt.plainTextEncrypt:false}") +@ConditionalOnExpression("${spring.cloud.config.server.encrypt.enabled:true} && ${spring.cloud.config.server.encrypt.plainTextEncrypt:true}") +@ConditionalOnBean(TextEncryptorLocator.class) public class ResourceEncryptorConfiguration { @Autowired