From c69a3eed70e7511fde53579ed5568153018bdaeb Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 18 Mar 2020 18:20:38 -0400 Subject: [PATCH] Makes springClientFactory conditional on missing bean --- .../cloud/netflix/ribbon/RibbonAutoConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java index 3755b8750..008898357 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java @@ -79,6 +79,7 @@ public class RibbonAutoConfiguration { } @Bean + @ConditionalOnMissingBean public SpringClientFactory springClientFactory() { SpringClientFactory factory = new SpringClientFactory(); factory.setConfigurations(this.configurations);