From 62e41f63c058cd024bb800fd973b3fab941ddefe Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 12 Nov 2014 14:33:27 -0700 Subject: [PATCH] change spring.cloud.config.enabled to @ConditionalOnExpression --- .../config/PropertySourceBootstrapConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java index 81f5d09b..8f5c52df 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.BootstrapApplicationListener; import org.springframework.cloud.config.client.ConfigClientProperties; @@ -96,7 +96,7 @@ public class PropertySourceBootstrapConfiguration implements } @Configuration - @ConditionalOnProperty("spring.cloud.config.enabled") + @ConditionalOnExpression("${spring.cloud.config.enabled:true}") protected static class PropertySourceLocatorConfiguration { @Autowired