SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust conditionalOnProperty annotation values

Browse Source
This commit is contained in:
Haytham Mohamed
2020-07-29 21:14:38 -05:00
parent 6f9190164d
commit 4985ab5450
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java
View File

@@ -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