Merge branch '3.1.x' into 4.0.x
This commit is contained in:
@@ -94,7 +94,7 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali
|
||||
// ConfigServerInstanceProvider.Function
|
||||
// which would result in a ClassNotFoundException when Spring Cloud Config is not
|
||||
// on the classpath
|
||||
registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, ConsulFunction::new);
|
||||
registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, ConsulFunction::create);
|
||||
}
|
||||
|
||||
private BindHandler getBindHandler(org.springframework.boot.BootstrapContext context) {
|
||||
@@ -127,6 +127,10 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
public static ConsulFunction create(BootstrapContext context) {
|
||||
return new ConsulFunction(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ServiceInstance> apply(String serviceId) {
|
||||
return apply(serviceId, null, null, null);
|
||||
|
||||
Reference in New Issue
Block a user