From 241468ab7a67978c29508fe5152cd19f74480420 Mon Sep 17 00:00:00 2001 From: saga Date: Thu, 11 Jan 2018 20:47:54 +0800 Subject: [PATCH] Remove redundant default parameter (#2635) --- .../cloud/netflix/feign/FeignClientsConfiguration.java | 2 +- .../cloud/netflix/ribbon/RibbonAutoConfiguration.java | 2 +- .../cloud/netflix/zuul/ZuulServerAutoConfiguration.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java index bcfb8eeb..a2feabdb 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java @@ -100,7 +100,7 @@ public class FeignClientsConfiguration { @Bean @Scope("prototype") @ConditionalOnMissingBean - @ConditionalOnProperty(name = "feign.hystrix.enabled", matchIfMissing = false) + @ConditionalOnProperty(name = "feign.hystrix.enabled") public Feign.Builder feignHystrixBuilder() { return HystrixFeign.builder(); } 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 6c9bff20..e4ad0bb3 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 @@ -115,7 +115,7 @@ public class RibbonAutoConfiguration { } @Bean - @ConditionalOnProperty(value = "ribbon.eager-load.enabled", matchIfMissing = false) + @ConditionalOnProperty(value = "ribbon.eager-load.enabled") public RibbonApplicationContextInitializer ribbonApplicationContextInitializer() { return new RibbonApplicationContextInitializer(springClientFactory(), ribbonEagerLoadProperties.getClients()); diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java index 6fbfb494..20939a07 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java @@ -175,7 +175,7 @@ public class ZuulServerAutoConfiguration { } @Bean - @ConditionalOnProperty(value = "zuul.ribbon.eager-load.enabled", matchIfMissing = false) + @ConditionalOnProperty(value = "zuul.ribbon.eager-load.enabled") public ZuulRouteApplicationContextInitializer zuulRoutesApplicationContextInitiazer( SpringClientFactory springClientFactory) { return new ZuulRouteApplicationContextInitializer(springClientFactory,