From b7db65863f195920b7aa3aee961cfab7bec7b27e Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 5 Dec 2014 12:23:02 -0700 Subject: [PATCH] rename FeignConfigurer to FeignConfiguration fixes gh-91 --- docs/src/main/asciidoc/spring-cloud-netflix.adoc | 2 +- .../feign/{FeignConfigurer.java => FeignConfiguration.java} | 2 +- .../springframework/cloud/netflix/feign/SpringDecoderTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/{FeignConfigurer.java => FeignConfiguration.java} (98%) diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 42154ff8..f56474fa 100644 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -416,7 +416,7 @@ Example spring boot app @ComponentScan @EnableAutoConfiguration @EnableEurekaClient -public class Application extends FeignConfigurer { +public class Application extends FeignConfiguration { @Bean public StoreClient storeClient() { //loadBalance plugs Feign into ribbon. feign() works without load balancing. diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfiguration.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfiguration.java index 5a6447ba..143625ab 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfiguration.java @@ -18,7 +18,7 @@ import java.net.URI; * @author Spencer Gibb */ @Configuration -public class FeignConfigurer { +public class FeignConfiguration { @Autowired ConfigurableEnvironmentConfiguration envConfig; //FIXME: howto enforce this? diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/SpringDecoderTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/SpringDecoderTests.java index 2552e866..4e594df8 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/SpringDecoderTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/SpringDecoderTests.java @@ -29,7 +29,7 @@ import java.util.List; @SpringApplicationConfiguration(classes = SpringDecoderTests.Application.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "spring.application.name=springdecodertest", "spring.jmx.enabled=true" }) -public class SpringDecoderTests extends FeignConfigurer { +public class SpringDecoderTests extends FeignConfiguration { @Value("${local.server.port}") private int port = 0;