From 4985ab54509b43fb4dde23e50d09ae4cc69af23d Mon Sep 17 00:00:00 2001 From: Haytham Mohamed Date: Wed, 29 Jul 2020 21:14:38 -0500 Subject: [PATCH] adjust conditionalOnProperty annotation values --- .../reload/ConfigReloadAutoConfiguration.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java index 3141c161..62cb04c8 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java @@ -48,8 +48,10 @@ import org.springframework.util.Assert; * @author Nicolla Ferraro */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(name = "spring.cloud.kubernetes.config.enabled", - havingValue = "true") +@ConditionalOnProperty( + value = { "spring.cloud.kubernetes.config.enabled", + "spring.cloud.kubernetes.enabled" }, + matchIfMissing = true, havingValue = "true") @ConditionalOnClass(EndpointAutoConfiguration.class) @AutoConfigureAfter({ InfoEndpointAutoConfiguration.class, RefreshEndpointAutoConfiguration.class, RefreshAutoConfiguration.class }) @@ -60,8 +62,11 @@ public class ConfigReloadAutoConfiguration { /** * Configuration reload must be enabled explicitly. */ - @ConditionalOnProperty(name = "spring.cloud.kubernetes.reload.enabled", - havingValue = "true") + @ConditionalOnProperty( + value = { "spring.cloud.kubernetes.config.enabled", + "spring.cloud.kubernetes.reload.enabled" }, + matchIfMissing = true, havingValue = "true") + // @ConditionalOnProperty("spring.cloud.kubernetes.reload.enabled") @ConditionalOnClass({ RestartEndpoint.class, ContextRefresher.class }) @EnableScheduling @EnableAsync