adjust conditionalOnProperty annotation values

This commit is contained in:
Haytham Mohamed
2020-07-29 21:14:53 -05:00
parent 4985ab5450
commit 68da02e3a0

View File

@@ -48,10 +48,8 @@ import org.springframework.util.Assert;
* @author Nicolla Ferraro
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
value = { "spring.cloud.kubernetes.config.enabled",
"spring.cloud.kubernetes.enabled" },
matchIfMissing = true, havingValue = "true")
@ConditionalOnProperty(value = { "spring.cloud.kubernetes.config.enabled",
"spring.cloud.kubernetes.enabled" }, matchIfMissing = true)
@ConditionalOnClass(EndpointAutoConfiguration.class)
@AutoConfigureAfter({ InfoEndpointAutoConfiguration.class,
RefreshEndpointAutoConfiguration.class, RefreshAutoConfiguration.class })
@@ -62,11 +60,7 @@ public class ConfigReloadAutoConfiguration {
/**
* Configuration reload must be enabled explicitly.
*/
@ConditionalOnProperty(
value = { "spring.cloud.kubernetes.config.enabled",
"spring.cloud.kubernetes.reload.enabled" },
matchIfMissing = true, havingValue = "true")
// @ConditionalOnProperty("spring.cloud.kubernetes.reload.enabled")
@ConditionalOnProperty("spring.cloud.kubernetes.reload.enabled")
@ConditionalOnClass({ RestartEndpoint.class, ContextRefresher.class })
@EnableScheduling
@EnableAsync