From e132e8e9e58931d41ca263d546f89260d87f901e Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 12 Nov 2014 15:54:53 +0000 Subject: [PATCH] Add support for spring.cloud.config.enabled=false --- .../config/PropertySourceBootstrapConfiguration.java | 2 ++ .../cloud/config/client/ConfigClientProperties.java | 10 ++++++++++ 2 files changed, 12 insertions(+) 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 876e5084..81f5d09b 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,6 +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.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.BootstrapApplicationListener; import org.springframework.cloud.config.client.ConfigClientProperties; @@ -95,6 +96,7 @@ public class PropertySourceBootstrapConfiguration implements } @Configuration + @ConditionalOnProperty("spring.cloud.config.enabled") protected static class PropertySourceLocatorConfiguration { @Autowired diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java index b4afa326..905ca51a 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java @@ -34,6 +34,8 @@ import org.springframework.web.util.UriComponentsBuilder; public class ConfigClientProperties { public static final String PREFIX = "spring.cloud.config"; + + private boolean enabled = true; private String env = "default"; @@ -61,6 +63,14 @@ public class ConfigClientProperties { this.setEnv(StringUtils.arrayToCommaDelimitedString(profiles)); } + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public String getUri() { return extractCredentials()[2]; }