From 3796133980716645eabfeac189a87748ccc9349c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 15 Jan 2015 14:07:45 +0000 Subject: [PATCH] Use @ConditionalOnProperty where possible --- .../autoconfigure/EnvironmentEndpointAutoConfiguration.java | 4 ++-- .../cloud/autoconfigure/RefreshAutoConfiguration.java | 4 ++-- .../config/PropertySourceBootstrapConfiguration.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/EnvironmentEndpointAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/EnvironmentEndpointAutoConfiguration.java index 4c944f5a..75a7e3cf 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/EnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/EnvironmentEndpointAutoConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.cloud.config.client.RefreshEndpoint; @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(EnvironmentEndpoint.class) -@ConditionalOnExpression("${endpoints.env.enabled:true}") +@ConditionalOnProperty(value = "endpoints.env.enabled", matchIfMissing = true) @ConditionalOnWebApplication @ConditionalOnBean({ EnvironmentEndpoint.class, RefreshEndpoint.class }) @AutoConfigureAfter({ WebMvcAutoConfiguration.class, EndpointAutoConfiguration.class }) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 408ddd64..ab54312f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -27,9 +27,9 @@ import org.springframework.boot.actuate.endpoint.InfoEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -173,7 +173,7 @@ public class RefreshAutoConfiguration { } @Configuration - @ConditionalOnExpression("${endpoints.refresh.enabled:true}") + @ConditionalOnProperty(value = "endpoints.refresh.enabled", matchIfMissing = true) @ConditionalOnBean(PropertySourceBootstrapConfiguration.class) protected static class RefreshEndpointConfiguration { 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 be6ae159..5eddcad5 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 @@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +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; @@ -104,7 +104,7 @@ public class PropertySourceBootstrapConfiguration implements } @Configuration - @ConditionalOnExpression("${spring.cloud.config.enabled:true}") + @ConditionalOnProperty(value = "spring.cloud.config.enabled", matchIfMissing = true) protected static class PropertySourceLocatorConfiguration { @Autowired @@ -127,7 +127,7 @@ public class PropertySourceBootstrapConfiguration implements @Configuration @ConditionalOnClass(HealthIndicator.class) - @ConditionalOnExpression("${spring.cloud.config.enabled:true}") + @ConditionalOnProperty(value = "spring.cloud.config.enabled", matchIfMissing = true) protected static class ConfigServerHealthIndicatorConfiguration { @Autowired