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

Only get curator from the bootstrap registry

Browse Source
This commit is contained in:
spencergibb
2020-09-09 16:51:23 -04:00
parent b689acbaef
commit 62df7aa2d7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java
View File

@@ -52,13 +52,14 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe
}
@Override
public List<ZookeeperConfigDataLocation> resolve(ConfigDataLocationResolverContext context, String location, boolean optional) throws ConfigDataLocationNotFoundException {
public List<ZookeeperConfigDataLocation> resolve(ConfigDataLocationResolverContext context, String location,
boolean optional) throws ConfigDataLocationNotFoundException {
return Collections.emptyList();
}
@Override
public List<ZookeeperConfigDataLocation> resolveProfileSpecific(ConfigDataLocationResolverContext context, String location, boolean optional, Profiles profiles) throws ConfigDataLocationNotFoundException {
CuratorFramework curator = curatorFramework(optional, loadProperties(context, location));
public List<ZookeeperConfigDataLocation> resolveProfileSpecific(ConfigDataLocationResolverContext context,
String location, boolean optional, Profiles profiles) throws ConfigDataLocationNotFoundException {
String appName = context.getBinder().bind("spring.application.name", String.class).orElse("application");
@@ -80,7 +81,8 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe
Collections.reverse(contexts);
context.getBootstrapRegistry().register(CuratorFramework.class, () -> curator)
context.getBootstrapRegistry()
.register(CuratorFramework.class, () -> curatorFramework(optional, loadProperties(context, location)))
.onApplicationContextPrepared((ctxt, curatorFramework) -> {
ctxt.getBeanFactory().registerSingleton("configDataCuratorFramework", curatorFramework);
HashMap<String, Object> source = new HashMap<>();
@@ -142,9 +144,9 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe
properties.getMaxSleepMs());
}
private ZookeeperProperties loadProperties(ConfigDataLocationResolverContext context, String location) {
ZookeeperProperties properties = context.getBinder().bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class))
ZookeeperProperties properties = context.getBinder()
.bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class))
.orElse(new ZookeeperProperties());
String connectString = location.substring("zookeeper:".length());
@@ -152,7 +154,7 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe
properties.setConnectString(connectString);
}
//TODO: support ZookeeperConfigProperties.root
// TODO: support ZookeeperConfigProperties.root
return properties;
}