From a1d089038da249774c569843e1e245b9b7be1469 Mon Sep 17 00:00:00 2001 From: pahli Date: Wed, 31 May 2017 23:55:17 +0200 Subject: [PATCH] make property injection optional --- .../cloud/netflix/ribbon/DefaultServerIntrospector.java | 8 ++++++-- .../cloud/netflix/ribbon/RibbonAutoConfiguration.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java index 7f37a3b3..b4180e34 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java @@ -30,8 +30,12 @@ import java.util.Map; */ public class DefaultServerIntrospector implements ServerIntrospector { - @Autowired - private ServerIntrospectorProperties serverIntrospectorProperties; + private ServerIntrospectorProperties serverIntrospectorProperties = new ServerIntrospectorProperties(); + + @Autowired(required = false) + public void setServerIntrospectorProperties(ServerIntrospectorProperties serverIntrospectorProperties){ + this.serverIntrospectorProperties = serverIntrospectorProperties; + } @Override public boolean isSecure(Server server) { diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java index 26b99997..8d03633c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java @@ -61,7 +61,7 @@ import com.netflix.ribbon.Ribbon; @RibbonClients @AutoConfigureAfter(name = "org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration") @AutoConfigureBefore({LoadBalancerAutoConfiguration.class, AsyncLoadBalancerAutoConfiguration.class}) -@EnableConfigurationProperties(RibbonEagerLoadProperties.class) +@EnableConfigurationProperties({RibbonEagerLoadProperties.class, ServerIntrospectorProperties.class}) public class RibbonAutoConfiguration { @Autowired(required = false)