From b828877611539623048dfbddf4e403eadcf80abb Mon Sep 17 00:00:00 2001
From: shollander <shollander1@gmail.com>
Date: Thu, 21 May 2020 20:12:17 +0000
Subject: [PATCH] Adds ConditionalOnMissingBean to SimpleDiscoveryProperties.

Fixes gh-759
Fixes gh-762
---
 .../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 31d32ba6..170dff85 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 java.net.URI;
 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()