From 8b81eb8b2c0f638e2ee09fb2f1ab0a7d08a2ce5e Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 23 Feb 2015 17:23:05 +0000 Subject: [PATCH] Tweak autoconfig for feign It doesn't make sense to @EnableFeignClients in autoconfig because the user needs to specify a package to scan. It does make sense (sort of) to set up the encoder/decoder/logger etc. See gh-226 --- .../cloud/netflix/feign/FeignAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java index 37f99bd94..e207c254c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java @@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import feign.Feign; @@ -30,7 +31,7 @@ import feign.Feign; @Configuration @ConditionalOnClass(Feign.class) @AutoConfigureAfter(ArchaiusAutoConfiguration.class) -@EnableFeignClients +@Import(FeignClientsConfiguration.class) public class FeignAutoConfiguration { }