From 235ccb7ad731885be769c47f748f78c8179e1f0e Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 30 Jul 2015 11:32:50 -0600 Subject: [PATCH] two more spring.cloud prefixes --- .../cloud/zookeeper/ZookeeperAutoConfiguration.java | 2 +- .../discovery/watcher/DependencyWatcherAutoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java index b5c1326b..fcb3235a 100644 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java @@ -18,7 +18,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb */ @Configuration -@ConditionalOnProperty(value = "zookeeper.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.zookeeper.enabled", matchIfMissing = true) @EnableConfigurationProperties public class ZookeeperAutoConfiguration { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java index d4b2042c..b10613ac 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @EnableConfigurationProperties @Conditional(DependenciesPassedCondition.class) -@ConditionalOnProperty(value = "zookeeper.dependencies.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.zookeeper.dependencies.enabled", matchIfMissing = true) @AutoConfigureAfter(ZookeeperDependenciesAutoConfiguration.class) public class DependencyWatcherAutoConfiguration {