diff --git a/.gitignore b/.gitignore index 8a860b40..727dacbd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ _site/ *.swo .vscode/ .flattened-pom.xml +.sdkmanrc diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index 52137690..81376a2b 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -301,7 +301,7 @@ class FooController { ---- NOTE: In the above example `FeignClientsConfiguration.class` is the default configuration -provided by Spring Cloud Netflix. +provided by Spring Cloud OpenFeign. NOTE: `PROD-SVC` is the name of the service the Clients will be making requests to. @@ -384,7 +384,7 @@ WARNING: There is a limitation with the implementation of fallbacks in Feign and === Feign and `@Primary` -When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud Netflix marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false. +When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false. [source,java,indent=0] ----