From 43c647e153f841b2d894ba82dd3e486c7edf991a Mon Sep 17 00:00:00 2001 From: shollander Date: Thu, 21 May 2020 20:12:17 +0000 Subject: [PATCH] Add ConditionalOnMissingBean to SimpleDiscoveryProperties. The makes SimpleDiscoveryClientAutoConfiguration less invasive. Fixes spring-cloud/spring-cloud-commons#759 --- .../simple/SimpleDiscoveryClientAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java index 31d32ba60..170dff85d 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.cloud.client.CommonsClientAutoConfiguration; @@ -57,6 +58,7 @@ public class SimpleDiscoveryClientAutoConfiguration private SimpleDiscoveryProperties simple = new SimpleDiscoveryProperties(); @Bean + @ConditionalOnMissingBean public SimpleDiscoveryProperties simpleDiscoveryProperties() { simple.getLocal().setServiceId(this.serviceId); simple.getLocal()