Bumping versions to 2.1.6.BUILD-SNAPSHOT after release

Going back to snapshots
Update SNAPSHOT to 2.1.5.RELEASE
2020-01-31 21:53:12 +00:00 · 2020-01-31 21:53:12 +00:00 · 2020-01-31 21:52:25 +00:00
124 changed files with 4763 additions and 3326 deletions
@@ -1,17 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-Please provide details of the problem, including the version of Spring Cloud that you
-are using. 
-
-**Sample**
-If possible, please provide a test case or sample application that reproduces
-the problem. This makes it much easier for us to diagnose the problem and to verify that
-we have fixed it.
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
@@ -18,6 +18,3 @@ _site/
 .shelf
 *.swp
 *.swo
-.vscode/
-.flattened-pom.xml
-
@@ -10,23 +10,6 @@ image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/gr

 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]

-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud OpenFeign
-:all: {asterisk}{asterisk}
-
 This project provides OpenFeign integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms.

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0.M1</version>
+		<version>2.1.6.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -15,15 +15,8 @@
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
-		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
+		<docs.whitelisted.branches>2.0.x,2.1.x</docs.whitelisted.branches>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
-	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -39,33 +32,28 @@
 			<id>docs</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<inherited>false</inherited>
+					</plugin>
+					<plugin>
+						<groupId>com.agilejava.docbkx</groupId>
+						<artifactId>docbkx-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<inherited>false</inherited>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>
@@ -4,8 +4,6 @@ image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/gr

 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]

-include::_attributes.adoc[]
-
 include::intro.adoc[]

 == Features
@@ -1,16 +0,0 @@
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud OpenFeign
-:all: {asterisk}{asterisk}
@@ -1,24 +0,0 @@
-|===
-|Name | Default | Description
-
-|feign.client.config |  | 
-|feign.client.default-config | default | 
-|feign.client.default-to-properties | true | 
-|feign.compression.request.enabled | false | Enables the request sent by Feign to be compressed.
-|feign.compression.request.mime-types | [text/xml, application/xml, application/json] | The list of supported mime types.
-|feign.compression.request.min-request-size | 2048 | The minimum threshold content size.
-|feign.compression.response.enabled | false | Enables the response from Feign to be compressed.
-|feign.compression.response.useGzipDecoder | false | Enables the default gzip decoder to be used.
-|feign.httpclient.connection-timeout | 2000 | 
-|feign.httpclient.connection-timer-repeat | 3000 | 
-|feign.httpclient.disable-ssl-validation | false | 
-|feign.httpclient.enabled | true | Enables the use of the Apache HTTP Client by Feign.
-|feign.httpclient.follow-redirects | true | 
-|feign.httpclient.max-connections | 200 | 
-|feign.httpclient.max-connections-per-route | 50 | 
-|feign.httpclient.time-to-live | 900 | 
-|feign.httpclient.time-to-live-unit |  | 
-|feign.hystrix.enabled | false | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
-|feign.okhttp.enabled | false | Enables the use of the OK HTTP Client by Feign.
-
-|===
@@ -40,7 +40,7 @@ function check_if_anything_to_sync() {

 function retrieve_current_branch() {
    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
    # If there is a branch already passed will reuse it - otherwise will try to find it
    CURRENT_BRANCH=${BRANCH}
    if [[ -z "${CURRENT_BRANCH}" ]] ; then
@@ -147,7 +147,7 @@ function copy_docs_for_current_version() {
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
@@ -1,26 +0,0 @@
-This project provides https://github.com/OpenFeign/feign[OpenFeign] integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms.
-
-## Features
-
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
-
-## Getting Started
-
-
-```java
-@SpringBootApplication
-@EnableFeignClients
-public class WebApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(WebApplication.class, args);
-	}
-
-	@FeignClient("name")
-	static interface NameService {
-		@RequestMapping("/")
-		public String getName();
-	}
-}
-
-```
@@ -1,5 +1,11 @@
+:github-tag: master
+:github-repo: spring-cloud/spring-cloud-openfeign
+:github-raw: https://raw.github.com/{github-repo}/{github-tag}
+:github-code: https://github.com/{github-repo}/tree/{github-tag}
+:all: {asterisk}{asterisk}
+:nofooter:
+:branch: master
 = Spring Cloud OpenFeign
-include::_attributes.adoc[]

 *{spring-cloud-version}*

@@ -9,13 +15,7 @@ include::intro.adoc[]
 [[spring-cloud-feign]]
 == Declarative REST Client: Feign

-https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
-It makes writing web service clients easier.
-To use Feign create an interface and annotate it.
-It has pluggable annotation support including Feign annotations and JAX-RS annotations.
-Feign also supports pluggable encoders and decoders.
-Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
-Spring Cloud integrates Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
+https://github.com/Netflix/feign[Feign] is a declarative web service client.  It makes writing web service clients easier.  To use Feign create an interface and annotate it.  It has pluggable annotation support including Feign annotations and JAX-RS annotations. Feign also supports pluggable encoders and decoders.  Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.  Spring Cloud integrates Ribbon and Eureka to provide a load balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -52,18 +52,21 @@ public interface StoreClient {
 }
 ----

-In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create a https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java[Spring Cloud LoadBalancer client].
-You can also specify a URL using the `url` attribute
+In the `@FeignClient` annotation the String value ("stores" above) is
+an arbitrary client name, which is used to create a Ribbon load
+balancer (see <<spring-cloud-ribbon,below for details of Ribbon
+support>>). You can also specify a URL using the `url` attribute
 (absolute value or just a hostname). The name of the bean in the
 application context is the fully qualified name of the interface.
 To specify your own alias value you can use the `qualifier` value
 of the `@FeignClient` annotation.

-The load-balancer client above will want to discover the physical addresses
+The Ribbon client above will want to discover the physical addresses
 for the "stores" service. If your application is a Eureka client then
 it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
-in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
+in your external configuration (see
+<<spring-cloud-ribbon-without-eureka,above for example>>).

 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
@@ -105,18 +108,17 @@ public interface StoreClient {
 }
 ----

-Spring Cloud OpenFeign provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
+Spring Cloud Netflix provides the following beans by default for feign (`BeanType` beanName: `ClassName`):

 * `Decoder` feignDecoder: `ResponseEntityDecoder` (which wraps a `SpringDecoder`)
 * `Encoder` feignEncoder: `SpringEncoder`
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Client` feignClient: if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
-If none of them is in the classpath, the default feign client is used.
+* `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used.

 The OkHttpClient and ApacheHttpClient feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` to `true`, respectively, and having them on the classpath.
-You can customize the HTTP client used by providing a bean of either `org.apache.http.impl.client.CloseableHttpClient` when using Apache or `okhttp3.OkHttpClient` when using OK HTTP.
+You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `OkHttpClient` when using OK HTTP.

 Spring Cloud Netflix _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:

@@ -126,7 +128,6 @@ Spring Cloud Netflix _does not_ provide the following beans by default for feign
 * `Request.Options`
 * `Collection<RequestInterceptor>`
 * `SetterFactory`
-* `QueryMapEncoder`

 Creating a bean of one of those type and placing it in a `@FeignClient` configuration (such as `FooConfiguration` above) allows you to override each one of the beans described.  Example:

@@ -256,14 +257,14 @@ class FooController {
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "https://PROD-SVC");
+				.target(FooClient.class, "http://PROD-SVC");

 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "https://PROD-SVC");
+				.target(FooClient.class, "http://PROD-SVC");
    }
 }
 ----
@@ -422,14 +423,6 @@ feign.compression.request.min-request-size=2048

 These properties allow you to be selective about the compressed media types and minimum request threshold length.

-For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
-
-[source,java]
----
-feign.compression.response.enabled=true
-feign.compression.response.useGzipDecoder=true
----
-
 === Feign logging

 A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
@@ -488,66 +481,13 @@ The following feign client uses the `Params` class by using the `@SpringQueryMap
 [source,java,indent=0]
 ----
@FeignClient("demo")
-public interface DemoTemplate {
+public class DemoTemplate {

    @GetMapping(path = "/demo")
    String demoEndpoint(@SpringQueryMap Params params);
 }
 ----

-If you need more control over the generated query parameter map, you can implement a custom `QueryMapEncoder` bean.
-
-=== HATEOAS support
-
-Spring provides some APIs to create REST representations that follow the https://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle, https://spring.io/projects/spring-hateoas[Spring Hateoas] and https://spring.io/projects/spring-data-rest[Spring Data REST].
-
-If your project use the `org.springframework.boot:spring-boot-starter-hateoas` starter
-or the `org.springframework.boot:spring-boot-starter-data-rest` starter, Feign HATEOAS support is enabled by default.
-
-When HATEOAS support is enabled, Feign clients are allowed to serialize
-and deserialize HATEOAS representation models: https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/EntityModel.html[EntityModel], https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/CollectionModel.html[CollectionModel] and https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/PagedModel.html[PagedModel].
-
-[source,java,indent=0]
----
-@FeignClient("demo")
-public interface DemoTemplate {
-
-    @GetMapping(path = "/stores")
-    CollectionModel<Store> getStores();
-}
----
-
-=== Spring @MatrixVariable Support
-
-Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.
-
-If a map is passed as the method argument, the `@MatrixVariable` path segment is created by joining key-value pairs from the map with a `=`.
-
-If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is
-joined with the provided method argument using `=`.
-
-IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Sprig Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name.
-
-For example:
-
-[source,java,indent=0]
----
-@GetMapping("/objects/links/{matrixVars}")
-Map<String, List<String>> getObjects(@MatrixVariable Map<String, List<String>> matrixVars);
----
-Note that both variable name and the path segment placeholder are called `matrixVars`.
-
-[source,java,indent=0]
----
-@FeignClient("demo")
-public interface DemoTemplate {
-
-    @GetMapping(path = "/stores")
-    CollectionModel<Store> getStores();
-}
----
-
-
 === Troubleshooting

 ==== Early Initialization Errors
@@ -560,7 +500,3 @@ To work around this problem you can use an `ObjectProvider` when autowiring your
@Autowired
 ObjectProvider<TestFeginClient> testFeginClient;
 ----
-
-== Configuration properties
-
-To see the list of all Sleuth related configuration properties please check link:appendix.html[the Appendix page].
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.0.0.M1</version>
+	<version>2.1.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0.M1</version>
+		<version>2.1.11.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>3.0.0.M1</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>3.0.0.M1</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.1.6.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.1.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -39,13 +39,15 @@
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec
 		</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
+
+		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
+		<maven-checkstyle-plugin.failsOnViolation>true
+		</maven-checkstyle-plugin.failsOnViolation>
+		<maven-checkstyle-plugin.includeTestSourceDirectory>true
+		</maven-checkstyle-plugin.includeTestSourceDirectory>
 	</properties>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0.M1</version>
+		<version>2.1.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -21,6 +21,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-ribbon</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -46,11 +50,6 @@
 			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hateoas</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
@@ -85,6 +84,11 @@
 			<artifactId>spring-cloud-context</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-core</artifactId>
@@ -104,11 +108,51 @@
 			<artifactId>feign-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-hystrix</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-java8</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-serialization</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-metrics-event-stream</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-javanica</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-httpclient</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
@@ -117,6 +161,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
+			<version>4.1.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -150,8 +195,13 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -172,17 +222,6 @@
 			<version>0.10.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>pl.pragmatists</groupId>
-			<artifactId>JUnitParams</artifactId>
-			<version>1.1.1</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -38,6 +38,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.actuator.HasFeatures;
@@ -45,21 +46,18 @@ import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionMa
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;

 /**
 * @author Spencer Gibb
 * @author Julien Roy
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@ConditionalOnClass(Feign.class)
@EnableConfigurationProperties({ FeignClientProperties.class,
 		FeignHttpClientProperties.class })
-@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {

 	@Autowired(required = false)
@@ -77,7 +75,20 @@ public class FeignAutoConfiguration {
 		return context;
 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
+	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
+	protected static class HystrixFeignTargeterConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean
+		public Targeter feignTargeter() {
+			return new HystrixTargeter();
+		}
+
+	}
+
+	@Configuration
+	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
 	protected static class DefaultFeignTargeterConfiguration {

 		@Bean
@@ -89,11 +100,12 @@ public class FeignAutoConfiguration {
 	}

 	// the following configuration is for alternate feign clients if
-	// SC loadbalancer is not on the class path.
+	// ribbon is not on the class path.
 	// see corresponding configurations in FeignRibbonClientAutoConfiguration
-	// for load-balanced clients.
-	@Configuration(proxyBeanMethods = false)
+	// for load balanced ribbon clients.
+	@Configuration
 	@ConditionalOnClass(ApacheHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 	protected static class HttpClientFeignConfiguration {
@@ -157,8 +169,9 @@ public class FeignAutoConfiguration {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnClass(OkHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {
@@ -26,9 +26,9 @@ import org.springframework.core.annotation.AliasFor;

 /**
 * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If SC LoadBalancer is available
- * it will be used to load balance the backend requests, and the load balancer can be
- * configured using the same name (i.e. value) as the feign client.
+ * created (e.g. for autowiring into another component). If ribbon is available it will be
+ * used to load balance the backend requests, and the load balancer can be configured
+ * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
 *
 * @author Spencer Gibb
 * @author Venil Noronha
@@ -85,7 +85,7 @@ public @interface FeignClient {
 	boolean decode404() default false;

 	/**
-	 * A custom configuration class for the feign client. Can contain override
+	 * A custom <code>@Configuration</code> for the feign client. Can contain override
 	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
 	 *
@@ -112,7 +112,8 @@ public @interface FeignClient {
 	Class<?> fallbackFactory() default void.class;

 	/**
-	 * @return path prefix to be used by all method-level mappings.
+	 * @return path prefix to be used by all method-level mappings. Can be used with or
+	 * without <code>@RibbonClient</code>.
 	 */
 	String path() default "";

@@ -57,39 +57,47 @@ public class FeignClientBuilder {
 			this.feignClientFactoryBean.setContextId(FeignClientsRegistrar.getName(name));
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
-			this.url("").path("").decode404(false);
+			this.url("").path("").decode404(false).fallback(void.class)
+					.fallbackFactory(void.class);
 		}

-		public Builder<T> url(final String url) {
+		public Builder url(final String url) {
 			this.feignClientFactoryBean.setUrl(FeignClientsRegistrar.getUrl(url));
 			return this;
 		}

-		public Builder<T> contextId(final String contextId) {
+		public Builder contextId(final String contextId) {
 			this.feignClientFactoryBean.setContextId(contextId);
 			return this;
 		}

-		public Builder<T> path(final String path) {
+		public Builder path(final String path) {
 			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
 			return this;
 		}

-		public Builder<T> decode404(final boolean decode404) {
+		public Builder decode404(final boolean decode404) {
 			this.feignClientFactoryBean.setDecode404(decode404);
 			return this;
 		}

-		public Builder<T> fallback(final Class<? extends T> fallback) {
+		public Builder fallback(final Class<T> fallback) {
 			FeignClientsRegistrar.validateFallback(fallback);
 			this.feignClientFactoryBean.setFallback(fallback);
 			return this;
 		}

+		public Builder fallbackFactory(final Class<T> fallbackFactory) {
+			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
+			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
+			return this;
+		}
+
 		/**
+		 * @param <T> the target type of the Feign client to be created
 		 * @return the created Feign client
 		 */
-		public T build() {
+		public <T> T build() {
 			return this.feignClientFactoryBean.getTarget();
 		}

@@ -21,10 +21,8 @@ import java.util.Objects;

 import feign.Client;
 import feign.Contract;
-import feign.ExceptionPropagationPolicy;
 import feign.Feign;
 import feign.Logger;
-import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -38,7 +36,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
@@ -77,7 +75,7 @@ class FeignClientFactoryBean
 	private Class<?> fallbackFactory = void.class;

 	@Override
-	public void afterPropertiesSet() {
+	public void afterPropertiesSet() throws Exception {
 		Assert.hasText(this.contextId, "Context id must be set");
 		Assert.hasText(this.name, "Name must be set");
 	}
@@ -140,14 +138,6 @@ class FeignClientFactoryBean
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
-		else {
-			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
-					FeignErrorDecoderFactory.class);
-			if (errorDecoderFactory != null) {
-				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(this.type);
-				builder.errorDecoder(factoryErrorDecoder);
-			}
-		}
 		Request.Options options = getOptional(context, Request.Options.class);
 		if (options != null) {
 			builder.options(options);
@@ -157,18 +147,10 @@ class FeignClientFactoryBean
 		if (requestInterceptors != null) {
 			builder.requestInterceptors(requestInterceptors.values());
 		}
-		QueryMapEncoder queryMapEncoder = getOptional(context, QueryMapEncoder.class);
-		if (queryMapEncoder != null) {
-			builder.queryMapEncoder(queryMapEncoder);
-		}
+
 		if (this.decode404) {
 			builder.decode404();
 		}
-		ExceptionPropagationPolicy exceptionPropagationPolicy = getOptional(context,
-				ExceptionPropagationPolicy.class);
-		if (exceptionPropagationPolicy != null) {
-			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
-		}
 	}

 	protected void configureUsingProperties(
@@ -223,10 +205,6 @@ class FeignClientFactoryBean
 		if (Objects.nonNull(config.getContract())) {
 			builder.contract(getOrInstantiate(config.getContract()));
 		}
-
-		if (Objects.nonNull(config.getExceptionPropagationPolicy())) {
-			builder.exceptionPropagationPolicy(config.getExceptionPropagationPolicy());
-		}
 	}

 	private <T> T getOrInstantiate(Class<T> tClass) {
@@ -261,11 +239,11 @@ class FeignClientFactoryBean
 		}

 		throw new IllegalStateException(
-				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-loadbalancer?");
+				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon?");
 	}

 	@Override
-	public Object getObject() {
+	public Object getObject() throws Exception {
 		return getTarget();
 	}

@@ -295,10 +273,10 @@ class FeignClientFactoryBean
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
-			if (client instanceof FeignBlockingLoadBalancerClient) {
+			if (client instanceof LoadBalancerFeignClient) {
 				// not load balancing because we have a url,
-				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
-				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
+				// but ribbon is on the classpath, so unwrap
+				client = ((LoadBalancerFeignClient) client).getDelegate();
 			}
 			builder.client(client);
 		}
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Objects;

 import feign.Contract;
-import feign.ExceptionPropagationPolicy;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -112,8 +111,6 @@ public class FeignClientProperties {

 		private Class<Contract> contract;

-		private ExceptionPropagationPolicy exceptionPropagationPolicy;
-
 		public Logger.Level getLoggerLevel() {
 			return this.loggerLevel;
 		}
@@ -195,15 +192,6 @@ public class FeignClientProperties {
 			this.contract = contract;
 		}

-		public ExceptionPropagationPolicy getExceptionPropagationPolicy() {
-			return exceptionPropagationPolicy;
-		}
-
-		public void setExceptionPropagationPolicy(
-				ExceptionPropagationPolicy exceptionPropagationPolicy) {
-			this.exceptionPropagationPolicy = exceptionPropagationPolicy;
-		}
-
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -222,17 +210,14 @@ public class FeignClientProperties {
 					&& Objects.equals(this.decode404, that.decode404)
 					&& Objects.equals(this.encoder, that.encoder)
 					&& Objects.equals(this.decoder, that.decoder)
-					&& Objects.equals(this.contract, that.contract)
-					&& Objects.equals(this.exceptionPropagationPolicy,
-							that.exceptionPropagationPolicy);
+					&& Objects.equals(this.contract, that.contract);
 		}

 		@Override
 		public int hashCode() {
 			return Objects.hash(this.loggerLevel, this.connectTimeout, this.readTimeout,
 					this.retryer, this.errorDecoder, this.requestInterceptors,
-					this.decode404, this.encoder, this.decoder, this.contract,
-					this.exceptionPropagationPolicy);
+					this.decode404, this.encoder, this.decoder, this.contract);
 		}

 	}
@@ -20,12 +20,14 @@ import java.util.ArrayList;
 import java.util.List;

 import com.fasterxml.jackson.databind.Module;
+import com.netflix.hystrix.HystrixCommand;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
+import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;

 import org.springframework.beans.factory.ObjectFactory;
@@ -33,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
@@ -52,7 +54,7 @@ import org.springframework.format.support.FormattingConversionService;
 * @author Dave Syer
 * @author Venil Noronha
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
 public class FeignClientsConfiguration {

 	@Autowired
@@ -67,9 +69,6 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private Logger logger;

-	@Autowired(required = false)
-	private SpringDataWebProperties springDataWebProperties;
-
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
@@ -88,17 +87,7 @@ public class FeignClientsConfiguration {
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public Encoder feignEncoderPageable() {
-		PageableSpringEncoder encoder = new PageableSpringEncoder(
-				new SpringEncoder(this.messageConverters));
-		if (springDataWebProperties != null) {
-			encoder.setPageParameter(
-					springDataWebProperties.getPageable().getPageParameter());
-			encoder.setSizeParameter(
-					springDataWebProperties.getPageable().getSizeParameter());
-			encoder.setSortParameter(
-					springDataWebProperties.getSort().getSortParameter());
-		}
-		return encoder;
+		return new PageableSpringEncoder(new SpringEncoder(this.messageConverters));
 	}

 	@Bean
@@ -141,4 +130,18 @@ public class FeignClientsConfiguration {
 		return new PageJacksonModule();
 	}

+	@Configuration
+	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
+	protected static class HystrixFeignConfiguration {
+
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean
+		@ConditionalOnProperty(name = "feign.hystrix.enabled")
+		public Feign.Builder feignHystrixBuilder() {
+			return HystrixFeign.builder();
+		}
+
+	}
+
 }
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.codec.ErrorDecoder;
-
-/**
- * Allows an application to use a custom Feign {@link feign.codec.ErrorDecoder}.
- *
- * @author Michael Cramer
- */
-public interface FeignErrorDecoderFactory {
-
-	/**
-	 * Factory method to provide a {@link feign.codec.ErrorDecoder} for a given
-	 * {@link Class}.
-	 * @param type the {@link Class} for which a {@link feign.codec.ErrorDecoder} instance
-	 * is to be created
-	 * @return a {@link feign.codec.ErrorDecoder} instance
-	 */
-	ErrorDecoder create(Class<?> type);
-
-}
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import feign.Feign;
+import feign.Target;
+import feign.hystrix.FallbackFactory;
+import feign.hystrix.HystrixFeign;
+import feign.hystrix.SetterFactory;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Spencer Gibb
+ * @author Erik Kringen
+ */
+@SuppressWarnings("unchecked")
+class HystrixTargeter implements Targeter {
+
+	@Override
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target) {
+		if (!(feign instanceof feign.hystrix.HystrixFeign.Builder)) {
+			return feign.target(target);
+		}
+		feign.hystrix.HystrixFeign.Builder builder = (feign.hystrix.HystrixFeign.Builder) feign;
+		String name = StringUtils.isEmpty(factory.getContextId()) ? factory.getName()
+				: factory.getContextId();
+		SetterFactory setterFactory = getOptional(name, context, SetterFactory.class);
+		if (setterFactory != null) {
+			builder.setterFactory(setterFactory);
+		}
+		Class<?> fallback = factory.getFallback();
+		if (fallback != void.class) {
+			return targetWithFallback(name, context, target, builder, fallback);
+		}
+		Class<?> fallbackFactory = factory.getFallbackFactory();
+		if (fallbackFactory != void.class) {
+			return targetWithFallbackFactory(name, context, target, builder,
+					fallbackFactory);
+		}
+
+		return feign.target(target);
+	}
+
+	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
+			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
+			Class<?> fallbackFactoryClass) {
+		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext(
+				"fallbackFactory", feignClientName, context, fallbackFactoryClass,
+				FallbackFactory.class);
+		return builder.target(target, fallbackFactory);
+	}
+
+	private <T> T targetWithFallback(String feignClientName, FeignContext context,
+			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
+			Class<?> fallback) {
+		T fallbackInstance = getFromContext("fallback", feignClientName, context,
+				fallback, target.type());
+		return builder.target(target, fallbackInstance);
+	}
+
+	private <T> T getFromContext(String fallbackMechanism, String feignClientName,
+			FeignContext context, Class<?> beanType, Class<T> targetType) {
+		Object fallbackInstance = context.getInstance(feignClientName, beanType);
+		if (fallbackInstance == null) {
+			throw new IllegalStateException(String.format(
+					"No " + fallbackMechanism
+							+ " instance of type %s found for feign client %s",
+					beanType, feignClientName));
+		}
+
+		if (!targetType.isAssignableFrom(beanType)) {
+			throw new IllegalStateException(String.format("Incompatible "
+					+ fallbackMechanism
+					+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
+					beanType, targetType, feignClientName));
+		}
+		return (T) fallbackInstance;
+	}
+
+	private <T> T getOptional(String feignClientName, FeignContext context,
+			Class<T> beanType) {
+		return context.getInstance(feignClientName, beanType);
+	}
+
+}
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import feign.MethodMetadata;
-
-import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.web.bind.annotation.MatrixVariable;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * {@link MatrixVariable} annotation processor.
- *
- * Can expand maps or single objects. Values are assigned from the objects
- * {@code toString()} method.
- *
- * @author Matt King
- * @see AnnotatedParameterProcessor
- */
-public class MatrixVariableParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<MatrixVariable> ANNOTATION = MatrixVariable.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context,
-			Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
-		MethodMetadata data = context.getMethodMetadata();
-		String name = ANNOTATION.cast(annotation).value();
-
-		checkState(emptyToNull(name) != null,
-				"MatrixVariable annotation was empty on param %s.",
-				context.getParameterIndex());
-
-		context.setParameterName(name);
-
-		if (Map.class.isAssignableFrom(parameterType)) {
-			data.indexToExpander().put(parameterIndex, this::expandMap);
-		}
-		else {
-			data.indexToExpander().put(parameterIndex,
-					object -> ";" + name + "=" + object.toString());
-		}
-
-		return true;
-	}
-
-	private String expandMap(Object object) {
-		Map<String, Object> paramMap = (Map) object;
-
-		return paramMap.keySet().stream()
-				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
-				.collect(Collectors.joining());
-	}
-
-}
@@ -1,64 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-import feign.MethodMetadata;
-
-import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.web.bind.annotation.RequestPart;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * {@link RequestPart} parameter processor.
- *
- * @author Aaron Whiteside
- * @see AnnotatedParameterProcessor
- */
-public class RequestPartParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<RequestPart> ANNOTATION = RequestPart.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context,
-			Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		MethodMetadata data = context.getMethodMetadata();
-
-		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
-				"RequestPart.value() was empty on parameter %s", parameterIndex);
-		context.setParameterName(name);
-
-		data.formParams().add(name);
-		Collection<String> names = context.setTemplateParameter(name,
-				data.indexToName().get(parameterIndex));
-		data.indexToName().put(parameterIndex, names);
-		return true;
-	}
-
-}
@@ -1,123 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.clientconfig;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import javax.annotation.PreDestroy;
-
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Default configuration for {@link CloseableHttpClient}.
- *
- * @author Ryan Baxter
- * @author Marcin Grzejszczak
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(CloseableHttpClient.class)
-public class HttpClientFeignConfiguration {
-
-	private final Timer connectionManagerTimer = new Timer(
-			"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
-
-	private CloseableHttpClient httpClient;
-
-	@Autowired(required = false)
-	private RegistryBuilder registryBuilder;
-
-	@Bean
-	@ConditionalOnMissingBean(HttpClientConnectionManager.class)
-	public HttpClientConnectionManager connectionManager(
-			ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
-			FeignHttpClientProperties httpClientProperties) {
-		final HttpClientConnectionManager connectionManager = connectionManagerFactory
-				.newConnectionManager(httpClientProperties.isDisableSslValidation(),
-						httpClientProperties.getMaxConnections(),
-						httpClientProperties.getMaxConnectionsPerRoute(),
-						httpClientProperties.getTimeToLive(),
-						httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
-		this.connectionManagerTimer.schedule(new TimerTask() {
-			@Override
-			public void run() {
-				connectionManager.closeExpiredConnections();
-			}
-		}, 30000, httpClientProperties.getConnectionTimerRepeat());
-		return connectionManager;
-	}
-
-	@Bean
-	@ConditionalOnProperty(value = "feign.compression.response.enabled",
-			havingValue = "true")
-	public CloseableHttpClient customHttpClient(
-			HttpClientConnectionManager httpClientConnectionManager,
-			FeignHttpClientProperties httpClientProperties) {
-		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement()
-				.useSystemProperties();
-		this.httpClient = createClient(builder, httpClientConnectionManager,
-				httpClientProperties);
-		return this.httpClient;
-	}
-
-	@Bean
-	@ConditionalOnProperty(value = "feign.compression.response.enabled",
-			havingValue = "false", matchIfMissing = true)
-	public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
-			HttpClientConnectionManager httpClientConnectionManager,
-			FeignHttpClientProperties httpClientProperties) {
-		this.httpClient = createClient(httpClientFactory.createBuilder(),
-				httpClientConnectionManager, httpClientProperties);
-		return this.httpClient;
-	}
-
-	private CloseableHttpClient createClient(HttpClientBuilder builder,
-			HttpClientConnectionManager httpClientConnectionManager,
-			FeignHttpClientProperties httpClientProperties) {
-		RequestConfig defaultRequestConfig = RequestConfig.custom()
-				.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-				.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
-		CloseableHttpClient httpClient = builder
-				.setDefaultRequestConfig(defaultRequestConfig)
-				.setConnectionManager(httpClientConnectionManager).build();
-		return httpClient;
-	}
-
-	@PreDestroy
-	public void destroy() throws Exception {
-		this.connectionManagerTimer.cancel();
-		if (this.httpClient != null) {
-			this.httpClient.close();
-		}
-	}
-
-}
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.clientconfig;
-
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PreDestroy;
-
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Defualt configuration for {@link OkHttpClient}.
- *
- * @author Ryan Baxter
- * @author Marcin Grzejszczak
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-public class OkHttpFeignConfiguration {
-
-	private okhttp3.OkHttpClient okHttpClient;
-
-	@Bean
-	@ConditionalOnMissingBean(ConnectionPool.class)
-	public ConnectionPool httpClientConnectionPool(
-			FeignHttpClientProperties httpClientProperties,
-			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-		Integer maxTotalConnections = httpClientProperties.getMaxConnections();
-		Long timeToLive = httpClientProperties.getTimeToLive();
-		TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
-		return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
-	}
-
-	@Bean
-	public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
-			ConnectionPool connectionPool,
-			FeignHttpClientProperties httpClientProperties) {
-		Boolean followRedirects = httpClientProperties.isFollowRedirects();
-		Integer connectTimeout = httpClientProperties.getConnectionTimeout();
-		this.okHttpClient = httpClientFactory
-				.createBuilder(httpClientProperties.isDisableSslValidation())
-				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-				.followRedirects(followRedirects).connectionPool(connectionPool).build();
-		return this.okHttpClient;
-	}
-
-	@PreDestroy
-	public void destroy() {
-		if (this.okHttpClient != null) {
-			this.okHttpClient.dispatcher().executorService().shutdown();
-			this.okHttpClient.connectionPool().evictAll();
-		}
-	}
-
-}
@@ -35,12 +35,11 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignAcceptGzipEncodingInterceptor
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled",
-		matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@@ -35,15 +35,14 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignContentGzipEncodingInterceptor
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
 // The OK HTTP client uses "transparent" compression.
 // If the content-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty(value = "feign.compression.request.enabled",
-		matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false)
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {

@@ -1,96 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
-import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.hateoas.RepresentationModel;
-import org.springframework.hateoas.mediatype.MessageResolver;
-import org.springframework.hateoas.mediatype.hal.CurieProvider;
-import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider;
-import org.springframework.hateoas.mediatype.hal.HalConfiguration;
-import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
-import org.springframework.hateoas.server.LinkRelationProvider;
-import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
-
-import static org.springframework.hateoas.MediaTypes.HAL_JSON;
-
-/**
- * @author Hector Espert
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnWebApplication
-@ConditionalOnClass(RepresentationModel.class)
-@AutoConfigureAfter({ JacksonAutoConfiguration.class,
-		HttpMessageConvertersAutoConfiguration.class,
-		RepositoryRestMvcAutoConfiguration.class })
-@AutoConfigureBefore(HypermediaAutoConfiguration.class)
-public class FeignHalAutoConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
-			ObjectProvider<ObjectMapper> objectMapper,
-			ObjectProvider<HalConfiguration> halConfiguration,
-			ObjectProvider<MessageResolver> messageResolver,
-			ObjectProvider<CurieProvider> curieProvider,
-			ObjectProvider<LinkRelationProvider> linkRelationProvider) {
-
-		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
-		mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-		HalConfiguration configuration = halConfiguration
-				.getIfAvailable(HalConfiguration::new);
-
-		CurieProvider curieProviderInstance = curieProvider
-				.getIfAvailable(() -> new DefaultCurieProvider(Collections.emptyMap()));
-
-		Jackson2HalModule.HalHandlerInstantiator halHandlerInstantiator = new Jackson2HalModule.HalHandlerInstantiator(
-				linkRelationProvider.getIfAvailable(), curieProviderInstance,
-				messageResolver.getIfAvailable(), configuration);
-
-		mapper.setHandlerInstantiator(halHandlerInstantiator);
-
-		if (!Jackson2HalModule.isAlreadyRegisteredIn(mapper)) {
-			Jackson2HalModule halModule = new Jackson2HalModule();
-			mapper.registerModule(halModule);
-		}
-
-		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
-				RepresentationModel.class);
-		converter.setSupportedMediaTypes(Arrays.asList(HAL_JSON));
-		converter.setObjectMapper(mapper);
-		return converter;
-	}
-
-}
@@ -1,86 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.http.HttpStatus;
-import org.springframework.util.Assert;
-
-/**
- * A {@link Client} implementation that uses {@link LoadBalancerClient} to select a
- * {@link ServiceInstance} to use while resolving the request host.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.0
- */
-public class FeignBlockingLoadBalancerClient implements Client {
-
-	private static final Log LOG = LogFactory
-			.getLog(FeignBlockingLoadBalancerClient.class);
-
-	private final Client delegate;
-
-	private final LoadBalancerClient loadBalancerClient;
-
-	public FeignBlockingLoadBalancerClient(Client delegate,
-			LoadBalancerClient loadBalancerClient) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
-	}
-
-	@Override
-	public Response execute(Request request, Request.Options options) throws IOException {
-		final URI originalUri = URI.create(request.url());
-		String serviceId = originalUri.getHost();
-		Assert.state(serviceId != null,
-				"Request URI does not contain a valid hostname: " + originalUri);
-		ServiceInstance instance = loadBalancerClient.choose(serviceId);
-		if (instance == null) {
-			String message = "Load balancer does not contain an instance for the service "
-					+ serviceId;
-			if (LOG.isWarnEnabled()) {
-				LOG.warn(message);
-			}
-			return Response.builder().request(request)
-					.status(HttpStatus.SERVICE_UNAVAILABLE.value())
-					.body(message, StandardCharsets.UTF_8).build();
-		}
-		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
-				.toString();
-		Request newRequest = Request.create(request.httpMethod(), reconstructedUrl,
-				request.headers(), request.body(), request.charset(),
-				request.requestTemplate());
-		return delegate.execute(newRequest, options);
-	}
-
-	// Visible for Sleuth instrumentation
-	public Client getDelegate() {
-		return delegate;
-	}
-
-}
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import feign.Client;
-import feign.Feign;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
- * of {@link Client}.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.0
- */
-@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(LoadBalancerClient.class)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-@EnableConfigurationProperties(FeignHttpClientProperties.class)
-@Configuration(proxyBeanMethods = false)
-// Order is important here, last should be the default, first should be optional
-// see
-// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ HttpClientFeignLoadBalancerConfiguration.class,
-		OkHttpFeignLoadBalancerConfiguration.class,
-		DefaultFeignLoadBalancerConfiguration.class })
-public class FeignLoadBalancerAutoConfiguration {
-
-}
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-import org.apache.http.client.HttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link ApacheHttpClient} under the hood.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnBean(LoadBalancerClient.class)
-@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-@Import(HttpClientFeignConfiguration.class)
-class HttpClientFeignLoadBalancerConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Client feignClient(LoadBalancerClient loadBalancerClient,
-			HttpClient httpClient) {
-		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
-	}
-
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import feign.Client;
-import feign.okhttp.OkHttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link OkHttpClient} under the hood.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty("feign.okhttp.enabled")
-@ConditionalOnBean(LoadBalancerClient.class)
-@Import(OkHttpFeignConfiguration.class)
-class OkHttpFeignLoadBalancerConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
-			LoadBalancerClient loadBalancerClient) {
-		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
-	}
-
-}
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.Map;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.util.ConcurrentReferenceHashMap;
+
+/**
+ * Factory for SpringLoadBalancer instances that caches the entries created.
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ * @author Ryan Baxter
+ * @author Gang Li
+ */
+public class CachingSpringLoadBalancerFactory {
+
+	protected final SpringClientFactory factory;
+
+	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;
+
+	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();
+
+	public CachingSpringLoadBalancerFactory(SpringClientFactory factory) {
+		this.factory = factory;
+	}
+
+	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
+			LoadBalancedRetryFactory loadBalancedRetryPolicyFactory) {
+		this.factory = factory;
+		this.loadBalancedRetryFactory = loadBalancedRetryPolicyFactory;
+	}
+
+	public FeignLoadBalancer create(String clientName) {
+		FeignLoadBalancer client = this.cache.get(clientName);
+		if (client != null) {
+			return client;
+		}
+		IClientConfig config = this.factory.getClientConfig(clientName);
+		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
+		ServerIntrospector serverIntrospector = this.factory.getInstance(clientName,
+				ServerIntrospector.class);
+		client = this.loadBalancedRetryFactory != null
+				? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
+						this.loadBalancedRetryFactory)
+				: new FeignLoadBalancer(lb, config, serverIntrospector);
+		this.cache.put(clientName, client);
+		return client;
+	}
+
+}
@@ -14,30 +14,27 @@
 * limitations under the License.
 */

-package org.springframework.cloud.openfeign.loadbalancer;
+package org.springframework.cloud.openfeign.ribbon;

 import feign.Client;

 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

 /**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link Client.Default} under the hood.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.0
+ * @author Spencer Gibb
 */
-@Configuration(proxyBeanMethods = false)
-class DefaultFeignLoadBalancerConfiguration {
+@Configuration
+class DefaultFeignLoadBalancedConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
-	public Client feignClient(LoadBalancerClient loadBalancerClient) {
-		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
-				loadBalancerClient);
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory) {
+		return new LoadBalancerFeignClient(new Client.Default(null, null), cachingFactory,
+				clientFactory);
 	}

 }
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.netflix.client.AbstractLoadBalancerAwareClient;
+import com.netflix.client.ClientException;
+import com.netflix.client.ClientRequest;
+import com.netflix.client.IResponse;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.RetryHandler;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.netflix.ribbon.RibbonProperties;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpRequest;
+
+import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecureConnectionIfNeeded;
+
+/**
+ * @author Dave Syer
+ * @author Spencer Gibb
+ * @author Ryan Baxter
+ * @author Tim Ysewyn
+ * @author Olga Maciaszek-Sharma
+ */
+public class FeignLoadBalancer extends
+		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
+
+	private final RibbonProperties ribbon;
+
+	protected int connectTimeout;
+
+	protected int readTimeout;
+
+	protected IClientConfig clientConfig;
+
+	protected ServerIntrospector serverIntrospector;
+
+	public FeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
+			ServerIntrospector serverIntrospector) {
+		super(lb, clientConfig);
+		this.setRetryHandler(RetryHandler.DEFAULT);
+		this.clientConfig = clientConfig;
+		this.ribbon = RibbonProperties.from(clientConfig);
+		RibbonProperties ribbon = this.ribbon;
+		this.connectTimeout = ribbon.getConnectTimeout();
+		this.readTimeout = ribbon.getReadTimeout();
+		this.serverIntrospector = serverIntrospector;
+	}
+
+	@Override
+	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
+			throws IOException {
+		Request.Options options;
+		if (configOverride != null) {
+			RibbonProperties override = RibbonProperties.from(configOverride);
+			options = new Request.Options(override.connectTimeout(this.connectTimeout),
+					override.readTimeout(this.readTimeout));
+		}
+		else {
+			options = new Request.Options(this.connectTimeout, this.readTimeout);
+		}
+		Response response = request.client().execute(request.toRequest(), options);
+		return new RibbonResponse(request.getUri(), response);
+	}
+
+	@Override
+	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
+			RibbonRequest request, IClientConfig requestConfig) {
+		if (this.ribbon.isOkToRetryOnAllOperations()) {
+			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
+					requestConfig);
+		}
+		if (!request.toRequest().httpMethod().name().equals("GET")) {
+			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
+					requestConfig);
+		}
+		else {
+			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
+					requestConfig);
+		}
+	}
+
+	@Override
+	public URI reconstructURIWithServer(Server server, URI original) {
+		URI uri = updateToSecureConnectionIfNeeded(original, this.clientConfig,
+				this.serverIntrospector, server);
+		return super.reconstructURIWithServer(server, uri);
+	}
+
+	protected static class RibbonRequest extends ClientRequest implements Cloneable {
+
+		private final Request request;
+
+		private final Client client;
+
+		protected RibbonRequest(Client client, Request request, URI uri) {
+			this.client = client;
+			setUri(uri);
+			this.request = toRequest(request);
+		}
+
+		private Request toRequest(Request request) {
+			Map<String, Collection<String>> headers = new LinkedHashMap<>(
+					request.headers());
+			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
+					request.requestBody());
+		}
+
+		Request toRequest() {
+			return toRequest(this.request);
+		}
+
+		Client client() {
+			return this.client;
+		}
+
+		HttpRequest toHttpRequest() {
+			return new HttpRequest() {
+				@Override
+				public HttpMethod getMethod() {
+					return HttpMethod
+							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
+				}
+
+				@Override
+				public String getMethodValue() {
+					return getMethod().name();
+				}
+
+				@Override
+				public URI getURI() {
+					return RibbonRequest.this.getUri();
+				}
+
+				@Override
+				public HttpHeaders getHeaders() {
+					Map<String, List<String>> headers = new HashMap<>();
+					Map<String, Collection<String>> feignHeaders = RibbonRequest.this
+							.toRequest().headers();
+					for (String key : feignHeaders.keySet()) {
+						headers.put(key, new ArrayList<String>(feignHeaders.get(key)));
+					}
+					HttpHeaders httpHeaders = new HttpHeaders();
+					httpHeaders.putAll(headers);
+					return httpHeaders;
+
+				}
+			};
+		}
+
+		public Request getRequest() {
+			return this.request;
+		}
+
+		public Client getClient() {
+			return this.client;
+		}
+
+		@Override
+		public Object clone() {
+			return new RibbonRequest(this.client, this.request, getUri());
+		}
+
+	}
+
+	protected static class RibbonResponse implements IResponse {
+
+		private final URI uri;
+
+		private final Response response;
+
+		protected RibbonResponse(URI uri, Response response) {
+			this.uri = uri;
+			this.response = response;
+		}
+
+		@Override
+		public Object getPayload() throws ClientException {
+			return this.response.body();
+		}
+
+		@Override
+		public boolean hasPayload() {
+			return this.response.body() != null;
+		}
+
+		@Override
+		public boolean isSuccess() {
+			return this.response.status() == 200;
+		}
+
+		@Override
+		public URI getRequestedURI() {
+			return this.uri;
+		}
+
+		@Override
+		public Map<String, Collection<String>> getHeaders() {
+			return this.response.headers();
+		}
+
+		Response toResponse() {
+			return this.response;
+		}
+
+		@Override
+		public void close() throws IOException {
+			if (this.response != null && this.response.body() != null) {
+				this.response.body().close();
+			}
+		}
+
+	}
+
+}
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
+import org.springframework.http.HttpRequest;
+import org.springframework.retry.RetryContext;
+
+/**
+ * @author Ryan Baxter
+ */
+public class FeignRetryPolicy extends InterceptorRetryPolicy {
+
+	private HttpRequest request;
+
+	private String serviceId;
+
+	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
+			ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
+		super(request, policy, serviceInstanceChooser, serviceName);
+		this.request = request;
+		this.serviceId = serviceName;
+	}
+
+	@Override
+	public boolean canRetry(RetryContext context) {
+		/*
+		 * In InterceptorRetryPolicy.canRetry we ask the LoadBalancer to choose a server
+		 * if one is not set in the retry context and then return true. RetryTemplat calls
+		 * the canRetry method of the policy even on its first execution. So the fact that
+		 * we didnt have a service instance set in the RetryContext signaled that it was
+		 * the first execution and we should return true.
+		 *
+		 * In the Feign scenario, Feign as actually already queried the load balancer for
+		 * a service instance and we set that service instance in the context when we call
+		 * the open method of the policy. So in the Feign case we just return true if the
+		 * retry count is 0 indicating we haven't yet made a failed request.
+		 */
+		if (context.getRetryCount() == 0) {
+			return true;
+		}
+		return super.canRetry(context);
+	}
+
+	@Override
+	public RetryContext open(RetryContext parent) {
+		/*
+		 * With Feign (unlike Ribbon) the request already has the URI for the service
+		 * instance we are going to make the request to, so extract that information and
+		 * set the service instance in the context. In the Ribbon scenario the URI in the
+		 * request object still has the service id so we choose and set the service
+		 * instance later on.
+		 */
+		LoadBalancedRetryContext context = new LoadBalancedRetryContext(parent,
+				this.request);
+		context.setServiceInstance(
+				new FeignRetryPolicyServiceInstance(this.serviceId, this.request));
+		return context;
+	}
+
+	class FeignRetryPolicyServiceInstance implements ServiceInstance {
+
+		private String serviceId;
+
+		private HttpRequest request;
+
+		private Map<String, String> metadata;
+
+		FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) {
+			this.serviceId = serviceId;
+			this.request = request;
+			this.metadata = new HashMap<>();
+		}
+
+		@Override
+		public String getServiceId() {
+			return this.serviceId;
+		}
+
+		@Override
+		public String getHost() {
+			return this.request.getURI().getHost();
+		}
+
+		@Override
+		public int getPort() {
+			return this.request.getURI().getPort();
+		}
+
+		@Override
+		public boolean isSecure() {
+			return "https".equals(this.request.getURI().getScheme());
+		}
+
+		@Override
+		public URI getUri() {
+			return this.request.getURI();
+		}
+
+		@Override
+		public Map<String, String> getMetadata() {
+			return this.metadata;
+		}
+
+	}
+
+}
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import feign.Feign;
+import feign.Request;
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
+ * load balancer.
+ *
+ * @author Dave Syer
+ */
+@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
+@Configuration
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+@EnableConfigurationProperties({ FeignHttpClientProperties.class })
+// Order is important here, last should be the default, first should be optional
+// see
+// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
+@Import({ HttpClientFeignLoadBalancedConfiguration.class,
+		OkHttpFeignLoadBalancedConfiguration.class,
+		DefaultFeignLoadBalancedConfiguration.class })
+public class FeignRibbonClientAutoConfiguration {
+
+	@Bean
+	@Primary
+	@ConditionalOnMissingBean
+	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
+	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
+			SpringClientFactory factory) {
+		return new CachingSpringLoadBalancerFactory(factory);
+	}
+
+	@Bean
+	@Primary
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
+	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
+			SpringClientFactory factory, LoadBalancedRetryFactory retryFactory) {
+		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Request.Options feignRequestOptions() {
+		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
+	}
+
+}
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.annotation.PreDestroy;
+
+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Spencer Gibb
+ */
+@Configuration
+@ConditionalOnClass(ApacheHttpClient.class)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+class HttpClientFeignLoadBalancedConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(Client.class)
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory, HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
+	}
+
+	@Configuration
+	@ConditionalOnMissingBean(CloseableHttpClient.class)
+	protected static class HttpClientFeignConfiguration {
+
+		private final Timer connectionManagerTimer = new Timer(
+				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
+
+		private CloseableHttpClient httpClient;
+
+		@Autowired(required = false)
+		private RegistryBuilder registryBuilder;
+
+		@Bean
+		@ConditionalOnMissingBean(HttpClientConnectionManager.class)
+		public HttpClientConnectionManager connectionManager(
+				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
+				FeignHttpClientProperties httpClientProperties) {
+			final HttpClientConnectionManager connectionManager = connectionManagerFactory
+					.newConnectionManager(httpClientProperties.isDisableSslValidation(),
+							httpClientProperties.getMaxConnections(),
+							httpClientProperties.getMaxConnectionsPerRoute(),
+							httpClientProperties.getTimeToLive(),
+							httpClientProperties.getTimeToLiveUnit(),
+							this.registryBuilder);
+			this.connectionManagerTimer.schedule(new TimerTask() {
+				@Override
+				public void run() {
+					connectionManager.closeExpiredConnections();
+				}
+			}, 30000, httpClientProperties.getConnectionTimerRepeat());
+			return connectionManager;
+		}
+
+		@Bean
+		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
+		public CloseableHttpClient customHttpClient(
+				HttpClientConnectionManager httpClientConnectionManager,
+				FeignHttpClientProperties httpClientProperties) {
+			HttpClientBuilder builder = HttpClientBuilder.create()
+					.disableCookieManagement().useSystemProperties();
+			this.httpClient = createClient(builder, httpClientConnectionManager,
+					httpClientProperties);
+			return this.httpClient;
+		}
+
+		@Bean
+		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
+		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
+				HttpClientConnectionManager httpClientConnectionManager,
+				FeignHttpClientProperties httpClientProperties) {
+			this.httpClient = createClient(httpClientFactory.createBuilder(),
+					httpClientConnectionManager, httpClientProperties);
+			return this.httpClient;
+		}
+
+		private CloseableHttpClient createClient(HttpClientBuilder builder,
+				HttpClientConnectionManager httpClientConnectionManager,
+				FeignHttpClientProperties httpClientProperties) {
+			RequestConfig defaultRequestConfig = RequestConfig.custom()
+					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
+					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
+					.build();
+			CloseableHttpClient httpClient = builder
+					.setDefaultRequestConfig(defaultRequestConfig)
+					.setConnectionManager(httpClientConnectionManager).build();
+			return httpClient;
+		}
+
+		@PreDestroy
+		public void destroy() throws Exception {
+			this.connectionManagerTimer.cancel();
+			if (this.httpClient != null) {
+				this.httpClient.close();
+			}
+		}
+
+	}
+
+}
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+
+import com.netflix.client.ClientException;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class LoadBalancerFeignClient implements Client {
+
+	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
+
+	private final Client delegate;
+
+	private CachingSpringLoadBalancerFactory lbClientFactory;
+
+	private SpringClientFactory clientFactory;
+
+	public LoadBalancerFeignClient(Client delegate,
+			CachingSpringLoadBalancerFactory lbClientFactory,
+			SpringClientFactory clientFactory) {
+		this.delegate = delegate;
+		this.lbClientFactory = lbClientFactory;
+		this.clientFactory = clientFactory;
+	}
+
+	static URI cleanUrl(String originalUrl, String host) {
+		String newUrl = originalUrl;
+		if (originalUrl.startsWith("https://")) {
+			newUrl = originalUrl.substring(0, 8)
+					+ originalUrl.substring(8 + host.length());
+		}
+		else if (originalUrl.startsWith("http")) {
+			newUrl = originalUrl.substring(0, 7)
+					+ originalUrl.substring(7 + host.length());
+		}
+		StringBuffer buffer = new StringBuffer(newUrl);
+		if ((newUrl.startsWith("https://") && newUrl.length() == 8)
+				|| (newUrl.startsWith("http://") && newUrl.length() == 7)) {
+			buffer.append("/");
+		}
+		return URI.create(buffer.toString());
+	}
+
+	@Override
+	public Response execute(Request request, Request.Options options) throws IOException {
+		try {
+			URI asUri = URI.create(request.url());
+			String clientName = asUri.getHost();
+			URI uriWithoutHost = cleanUrl(request.url(), clientName);
+			FeignLoadBalancer.RibbonRequest ribbonRequest = new FeignLoadBalancer.RibbonRequest(
+					this.delegate, request, uriWithoutHost);
+
+			IClientConfig requestConfig = getClientConfig(options, clientName);
+			return lbClient(clientName)
+					.executeWithLoadBalancer(ribbonRequest, requestConfig).toResponse();
+		}
+		catch (ClientException e) {
+			IOException io = findIOException(e);
+			if (io != null) {
+				throw io;
+			}
+			throw new RuntimeException(e);
+		}
+	}
+
+	IClientConfig getClientConfig(Request.Options options, String clientName) {
+		IClientConfig requestConfig;
+		if (options == DEFAULT_OPTIONS) {
+			requestConfig = this.clientFactory.getClientConfig(clientName);
+		}
+		else {
+			requestConfig = new FeignOptionsClientConfig(options);
+		}
+		return requestConfig;
+	}
+
+	protected IOException findIOException(Throwable t) {
+		if (t == null) {
+			return null;
+		}
+		if (t instanceof IOException) {
+			return (IOException) t;
+		}
+		return findIOException(t.getCause());
+	}
+
+	public Client getDelegate() {
+		return this.delegate;
+	}
+
+	private FeignLoadBalancer lbClient(String clientName) {
+		return this.lbClientFactory.create(clientName);
+	}
+
+	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
+
+		FeignOptionsClientConfig(Request.Options options) {
+			setProperty(CommonClientConfigKey.ConnectTimeout,
+					options.connectTimeoutMillis());
+			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
+		}
+
+		@Override
+		public void loadProperties(String clientName) {
+
+		}
+
+		@Override
+		public void loadDefaultValues() {
+
+		}
+
+	}
+
+}
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.PreDestroy;
+
+import feign.Client;
+import feign.okhttp.OkHttpClient;
+import okhttp3.ConnectionPool;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Spencer Gibb
+ */
+@Configuration
+@ConditionalOnClass(OkHttpClient.class)
+@ConditionalOnProperty("feign.okhttp.enabled")
+class OkHttpFeignLoadBalancedConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(Client.class)
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
+		OkHttpClient delegate = new OkHttpClient(okHttpClient);
+		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
+	}
+
+	@Configuration
+	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
+	protected static class OkHttpFeignConfiguration {
+
+		private okhttp3.OkHttpClient okHttpClient;
+
+		@Bean
+		@ConditionalOnMissingBean(ConnectionPool.class)
+		public ConnectionPool httpClientConnectionPool(
+				FeignHttpClientProperties httpClientProperties,
+				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+			Long timeToLive = httpClientProperties.getTimeToLive();
+			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
+			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
+		}
+
+		@Bean
+		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
+				ConnectionPool connectionPool,
+				FeignHttpClientProperties httpClientProperties) {
+			Boolean followRedirects = httpClientProperties.isFollowRedirects();
+			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+			this.okHttpClient = httpClientFactory
+					.createBuilder(httpClientProperties.isDisableSslValidation())
+					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+					.followRedirects(followRedirects).connectionPool(connectionPool)
+					.build();
+			return this.okHttpClient;
+		}
+
+		@PreDestroy
+		public void destroy() {
+			if (this.okHttpClient != null) {
+				this.okHttpClient.dispatcher().executorService().shutdown();
+				this.okHttpClient.connectionPool().evictAll();
+			}
+		}
+
+	}
+
+}
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+
+import com.netflix.client.DefaultLoadBalancerRetryHandler;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
+import org.springframework.cloud.netflix.ribbon.RibbonProperties;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.retry.RetryCallback;
+import org.springframework.retry.RetryContext;
+import org.springframework.retry.RetryListener;
+import org.springframework.retry.backoff.BackOffPolicy;
+import org.springframework.retry.backoff.NoBackOffPolicy;
+import org.springframework.retry.policy.NeverRetryPolicy;
+import org.springframework.retry.support.RetryTemplate;
+import org.springframework.util.StreamUtils;
+
+/**
+ * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
+ *
+ * @author Ryan Baxter
+ * @author Gang Li
+ */
+public class RetryableFeignLoadBalancer extends FeignLoadBalancer
+		implements ServiceInstanceChooser {
+
+	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
+
+	public RetryableFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
+			ServerIntrospector serverIntrospector,
+			LoadBalancedRetryFactory loadBalancedRetryFactory) {
+		super(lb, clientConfig, serverIntrospector);
+		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
+		this.setRetryHandler(new DefaultLoadBalancerRetryHandler(clientConfig));
+	}
+
+	@Override
+	public RibbonResponse execute(final RibbonRequest request,
+			IClientConfig configOverride) throws IOException {
+		final Request.Options options;
+		if (configOverride != null) {
+			RibbonProperties ribbon = RibbonProperties.from(configOverride);
+			options = new Request.Options(ribbon.connectTimeout(this.connectTimeout),
+					ribbon.readTimeout(this.readTimeout));
+		}
+		else {
+			options = new Request.Options(this.connectTimeout, this.readTimeout);
+		}
+		final LoadBalancedRetryPolicy retryPolicy = this.loadBalancedRetryFactory
+				.createRetryPolicy(this.getClientName(), this);
+		RetryTemplate retryTemplate = new RetryTemplate();
+		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory
+				.createBackOffPolicy(this.getClientName());
+		retryTemplate.setBackOffPolicy(
+				backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
+		RetryListener[] retryListeners = this.loadBalancedRetryFactory
+				.createRetryListeners(this.getClientName());
+		if (retryListeners != null && retryListeners.length != 0) {
+			retryTemplate.setListeners(retryListeners);
+		}
+		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
+				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this,
+						this.getClientName()));
+		return retryTemplate.execute(new RetryCallback<RibbonResponse, IOException>() {
+			@Override
+			public RibbonResponse doWithRetry(RetryContext retryContext)
+					throws IOException {
+				Request feignRequest = null;
+				// on retries the policy will choose the server and set it in the context
+				// extract the server and update the request being made
+				if (retryContext instanceof LoadBalancedRetryContext) {
+					ServiceInstance service = ((LoadBalancedRetryContext) retryContext)
+							.getServiceInstance();
+					if (service != null) {
+						feignRequest = ((RibbonRequest) request
+								.replaceUri(reconstructURIWithServer(
+										new Server(service.getHost(), service.getPort()),
+										request.getUri()))).toRequest();
+					}
+				}
+				if (feignRequest == null) {
+					feignRequest = request.toRequest();
+				}
+				Response response = request.client().execute(feignRequest, options);
+				if (retryPolicy != null
+						&& retryPolicy.retryableStatusCode(response.status())) {
+					byte[] byteArray = response.body() == null ? new byte[] {}
+							: StreamUtils
+									.copyToByteArray(response.body().asInputStream());
+					response.close();
+					throw new RibbonResponseStatusCodeException(
+							RetryableFeignLoadBalancer.this.clientName, response,
+							byteArray, request.getUri());
+				}
+				return new RibbonResponse(request.getUri(), response);
+			}
+		}, new LoadBalancedRecoveryCallback<RibbonResponse, Response>() {
+			@Override
+			protected RibbonResponse createResponse(Response response, URI uri) {
+				return new RibbonResponse(uri, response);
+			}
+		});
+	}
+
+	@Override
+	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
+			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
+		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(),
+				requestConfig);
+	}
+
+	@Override
+	public ServiceInstance choose(String serviceId) {
+		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
+				this.getLoadBalancer().chooseServer(serviceId));
+	}
+
+}
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
+import feign.Response;
+
+import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
+
+/**
+ * A {@link RetryableStatusCodeException} for {@link Response}s.
+ *
+ * @author Ryan Baxter
+ */
+public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
+
+	private final Response response;
+
+	public RibbonResponseStatusCodeException(String serviceId, Response response,
+			byte[] body, URI uri) {
+		super(serviceId, response.status(), response, uri);
+		this.response = Response.builder()
+				.body(new ByteArrayInputStream(body), body.length)
+				.headers(response.headers()).reason(response.reason())
+				.status(response.status()).request(response.request()).build();
+	}
+
+	@Override
+	public Response getResponse() {
+		return this.response;
+	}
+
+}
@@ -1,85 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.support;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.zip.GZIPInputStream;
-
-import feign.FeignException;
-import feign.Response;
-import feign.codec.Decoder;
-
-import org.springframework.cloud.openfeign.encoding.HttpEncoding;
-
-/**
- * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder}
- * to decode.
- *
- * @author Jaesik Kim
- */
-public class DefaultGzipDecoder implements Decoder {
-
-	private Decoder decoder;
-
-	public DefaultGzipDecoder(Decoder decoder) {
-		this.decoder = decoder;
-	}
-
-	@Override
-	public Object decode(final Response response, Type type)
-			throws IOException, FeignException {
-		Collection<String> encoding = response.headers()
-				.containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
-						? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER)
-						: null;
-
-		if (encoding != null) {
-			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
-				String decompressedBody = decompress(response);
-				if (decompressedBody != null) {
-					Response decompressedResponse = response.toBuilder()
-							.body(decompressedBody.getBytes()).build();
-					return decoder.decode(decompressedResponse, type);
-				}
-			}
-		}
-		return decoder.decode(response, type);
-	}
-
-	private String decompress(Response response) throws IOException {
-		if (response.body() == null) {
-			return null;
-		}
-		try (GZIPInputStream gzipInputStream = new GZIPInputStream(
-				response.body().asInputStream());
-				BufferedReader reader = new BufferedReader(
-						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
-			String outputString = "";
-			String line;
-			while ((line = reader.readLine()) != null) {
-				outputString += line;
-			}
-			return outputString;
-		}
-	}
-
-}
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.support;
-
-import feign.codec.Decoder;
-import feign.optionals.OptionalDecoder;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configures Default Gzip Decoder.
- *
- * @author Jaesik Kim
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty("feign.compression.response.enabled")
-// The OK HTTP client uses "transparent" compression.
-// If the accept-encoding header is present, it disables transparent compression
-@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@AutoConfigureAfter(FeignAutoConfiguration.class)
-public class DefaultGzipDecoderConfiguration {
-
-	private ObjectFactory<HttpMessageConverters> messageConverters;
-
-	public DefaultGzipDecoderConfiguration(
-			ObjectFactory<HttpMessageConverters> messageConverters) {
-		this.messageConverters = messageConverters;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
-	public Decoder defaultGzipDecoder() {
-		return new OptionalDecoder(new ResponseEntityDecoder(
-				new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
-	}
-
-}
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.support;
+
+import com.netflix.hystrix.HystrixCommand;
+import com.netflix.hystrix.HystrixCommandGroupKey;
+import com.netflix.hystrix.HystrixThreadPoolKey;
+
+/**
+ * Convenience class for implementing feign fallbacks that return {@link HystrixCommand}.
+ * Also useful for return types of {@link rx.Observable} and
+ * {@link java.util.concurrent.Future}. For those return types, just call
+ * {@link FallbackCommand#observe()} or {@link FallbackCommand#queue()} respectively.
+ *
+ * @param <T> result type
+ * @author Spencer Gibb
+ */
+public class FallbackCommand<T> extends HystrixCommand<T> {
+
+	private T result;
+
+	public FallbackCommand(T result) {
+		this(result, "fallback");
+	}
+
+	protected FallbackCommand(T result, String groupname) {
+		super(HystrixCommandGroupKey.Factory.asKey(groupname));
+		this.result = result;
+	}
+
+	public FallbackCommand(T result, HystrixCommandGroupKey group) {
+		super(group);
+		this.result = result;
+	}
+
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			int executionIsolationThreadTimeoutInMilliseconds) {
+		super(group, executionIsolationThreadTimeoutInMilliseconds);
+		this.result = result;
+	}
+
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			HystrixThreadPoolKey threadPool) {
+		super(group, threadPool);
+		this.result = result;
+	}
+
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			HystrixThreadPoolKey threadPool,
+			int executionIsolationThreadTimeoutInMilliseconds) {
+		super(group, threadPool, executionIsolationThreadTimeoutInMilliseconds);
+		this.result = result;
+	}
+
+	public FallbackCommand(T result, Setter setter) {
+		super(setter);
+		this.result = result;
+	}
+
+	@Override
+	protected T run() throws Exception {
+		return this.result;
+	}
+
+}
@@ -62,18 +62,6 @@ public class PageableSpringEncoder implements Encoder {
 		this.delegate = delegate;
 	}

-	public void setPageParameter(String pageParameter) {
-		this.pageParameter = pageParameter;
-	}
-
-	public void setSizeParameter(String sizeParameter) {
-		this.sizeParameter = sizeParameter;
-	}
-
-	public void setSortParameter(String sortParameter) {
-		this.sortParameter = sortParameter;
-	}
-
 	@Override
 	public void encode(Object object, Type bodyType, RequestTemplate template)
 			throws EncodeException {
@@ -41,7 +41,6 @@ import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.GenericHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConversionException;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.multipart.MultipartFile;
@@ -53,7 +52,6 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
 * @author Spencer Gibb
 * @author Scien Jus
 * @author Ahmad Mozafarnia
- * @author Aaron Whiteside
 */
 public class SpringEncoder implements Encoder {

@@ -61,7 +59,7 @@ public class SpringEncoder implements Encoder {

 	private final SpringFormEncoder springFormEncoder = new SpringFormEncoder();

-	private final ObjectFactory<HttpMessageConverters> messageConverters;
+	private ObjectFactory<HttpMessageConverters> messageConverters;

 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.messageConverters = messageConverters;
@@ -81,15 +79,16 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}

-			if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
-				this.springFormEncoder.encode(requestBody, bodyType, request);
-				return;
-			}
-			else {
-				if (bodyType == MultipartFile.class) {
-					log.warn(
-							"For MultipartFile to be handled correctly, the 'consumes' parameter of @RequestMapping "
-									+ "should be specified as MediaType.MULTIPART_FORM_DATA_VALUE");
+			if (bodyType != null && bodyType.equals(MultipartFile.class)) {
+				if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
+					this.springFormEncoder.encode(requestBody, bodyType, request);
+					return;
+				}
+				else {
+					String message = "Content-Type \"" + MediaType.MULTIPART_FORM_DATA
+							+ "\" not set for request body of type "
+							+ requestBody.getClass().getSimpleName();
+					throw new EncodeException(message);
 				}
 			}

@@ -107,7 +106,7 @@ public class SpringEncoder implements Encoder {
 								messageConverter, request);
 					}
 				}
-				catch (IOException | HttpMessageConversionException ex) {
+				catch (IOException ex) {
 					throw new EncodeException("Error converting request body", ex);
 				}
 				if (outputMessage != null) {
@@ -36,12 +36,10 @@ import feign.Param;
 import feign.Request;

 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.RequestHeaderParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.RequestParamParameterProcessor;
-import org.springframework.cloud.openfeign.annotation.RequestPartParameterProcessor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.DefaultParameterNameDiscoverer;
@@ -70,8 +68,6 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
 * @author Halvdan Hoem Grelland
 * @author Aram Peres
 * @author Olga Maciaszek-Sharma
- * @author Aaron Whiteside
- * @author Artyom Romanenko
 */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -114,9 +110,13 @@ public class SpringMvcContract extends Contract.BaseContract
 				"Parameter processors can not be null.");
 		Assert.notNull(conversionService, "ConversionService can not be null.");

-		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
-		processors.addAll(annotatedParameterProcessors);
-
+		List<AnnotatedParameterProcessor> processors;
+		if (!annotatedParameterProcessors.isEmpty()) {
+			processors = new ArrayList<>(annotatedParameterProcessors);
+		}
+		else {
+			processors = getDefaultAnnotatedArgumentsProcessors();
+		}
 		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
 		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
@@ -168,14 +168,15 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (clz.getInterfaces().length == 0) {
 			RequestMapping classAnnotation = findMergedAnnotation(clz,
 					RequestMapping.class);
-			if (classAnnotation != null && classAnnotation.value().length > 0) {
+			if (classAnnotation != null) {
 				// Prepend path from class annotation if specified
-				String pathValue = emptyToNull(classAnnotation.value()[0]);
-				if (pathValue != null) {
+				if (classAnnotation.value().length > 0) {
+					String pathValue = emptyToNull(classAnnotation.value()[0]);
 					pathValue = resolve(pathValue);
-					if (!pathValue.equals("/")) {
-						data.template().uri(pathValue);
+					if (!pathValue.startsWith("/")) {
+						pathValue = "/" + pathValue;
 					}
+					data.template().uri(pathValue);
 				}
 			}
 		}
@@ -229,9 +230,11 @@ public class SpringMvcContract extends Contract.BaseContract
 			String pathValue = emptyToNull(methodMapping.value()[0]);
 			if (pathValue != null) {
 				pathValue = resolve(pathValue);
-				if (!pathValue.equals("/")) {
-					data.template().uri(pathValue, true);
+				// Append path from @RequestMapping if value is present on method
+				if (!pathValue.startsWith("/") && !data.template().path().endsWith("/")) {
+					pathValue = "/" + pathValue;
 				}
+				data.template().uri(pathValue, true);
 			}
 		}

@@ -352,12 +355,10 @@ public class SpringMvcContract extends Contract.BaseContract

 		List<AnnotatedParameterProcessor> annotatedArgumentResolvers = new ArrayList<>();

-		annotatedArgumentResolvers.add(new MatrixVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new PathVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestParamParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
 		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());
-		annotatedArgumentResolvers.add(new RequestPartParameterProcessor());

 		return annotatedArgumentResolvers;
 	}
@@ -26,12 +26,6 @@
 			"description": "Enables the response from Feign to be compressed.",
 			"defaultValue": "false"
 		},
-		{
-			"name": "feign.compression.response.useGzipDecoder",
-			"type": "java.lang.Boolean",
-			"description": "Enables the default gzip decoder to be used.",
-			"defaultValue": "false"
-		},
 		{
 			"name": "feign.compression.request.enabled",
 			"type": "java.lang.Boolean",
@@ -1,6 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.openfeign.hateoas.FeignHalAutoConfiguration,\
+org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration,\
 org.springframework.cloud.openfeign.FeignAutoConfiguration,\
 org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\
-org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration,\
-org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration
+org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration
@@ -1,179 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.util.Objects;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Jaesik Kim
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = DefaultGzipDecoderTests.Application.class,
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=defaultGzipDecoderTests",
-				"feign.compression.response.enabled=true",
-				"feign.compression.response.useGzipDecoder=true",
-				"feign.client.config.default.loggerLevel=full",
-				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
-@DirtiesContext
-public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
-
-	@Autowired
-	FeignContext context;
-
-	@Value("${local.server.port}")
-	private int port = 0;
-
-	public DefaultGzipDecoderTests() {
-		setName("tests");
-		setContextId("test");
-	}
-
-	public TestClient testClient() {
-		setType(this.getClass());
-		return feign(context).target(TestClient.class, "http://localhost:" + this.port);
-	}
-
-	@Test
-	public void testBodyDecompress() {
-		ResponseEntity<Hello> response = testClient().getGzipResponse();
-		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
-		Hello hello = response.getBody();
-		assertThat(hello).as("hello was null").isNotNull();
-		assertThat(hello).as("first hello didn't match")
-				.isEqualTo(new Hello("hello world via response"));
-	}
-
-	@Test
-	public void testNullBodyDecompress() {
-		ResponseEntity<Hello> response = testClient().getNullResponse();
-		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
-		Hello hello = response.getBody();
-		assertThat(hello).as("hello was not null").isNull();
-		assertThat(hello).as("null hello didn't match").isEqualTo(null);
-	}
-
-	@Test
-	public void testCharsetDecompress() {
-		ResponseEntity<Hello> response = testClient().getUtf8Response();
-		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
-		Hello hello = response.getBody();
-		assertThat(hello).as("hello was null").isNotNull();
-		assertThat(hello).as("utf8 hello didn't match")
-				.isEqualTo(new Hello("안녕하세요 means Hello in Korean"));
-	}
-
-	private static class Hello {
-
-		private String message;
-
-		Hello() {
-		}
-
-		Hello(String message) {
-			this.message = message;
-		}
-
-		public String getMessage() {
-			return message;
-		}
-
-		public void setMessage(String message) {
-			this.message = message;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o) {
-				return true;
-			}
-			if (o == null || getClass() != o.getClass()) {
-				return false;
-			}
-			Hello that = (Hello) o;
-			return Objects.equals(message, that.message);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(message);
-		}
-
-	}
-
-	protected interface TestClient {
-
-		@GetMapping("/helloGzipResponse")
-		ResponseEntity<Hello> getGzipResponse();
-
-		@GetMapping("/nullGzipResponse")
-		ResponseEntity<Hello> getNullResponse();
-
-		@GetMapping("/utf8Response")
-		ResponseEntity<Hello> getUtf8Response();
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@Import(NoSecurityConfiguration.class)
-	protected static class Application implements TestClient {
-
-		@Override
-		public ResponseEntity<Hello> getGzipResponse() {
-			return ResponseEntity.ok(new Hello("hello world via response"));
-		}
-
-		@Override
-		public ResponseEntity<Hello> getNullResponse() {
-			return ResponseEntity.ok(null);
-		}
-
-		@Override
-		public ResponseEntity<Hello> getUtf8Response() {
-			return ResponseEntity.ok(new Hello("안녕하세요 means Hello in Korean"));
-		}
-
-	}
-
-}
@@ -21,10 +21,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

@@ -46,8 +48,9 @@ public class EnableFeignClientsSpringDataTests {
 				.cast(this.feignContext.getInstance("foo", Encoder.class));
 	}

-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
+	@Configuration
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {

 	}
@@ -30,6 +30,7 @@ import org.junit.runner.RunWith;

 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.cloud.test.ClassPathExclusions;
@@ -86,8 +87,8 @@ public class EnableFeignClientsTests {
 		Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}

-	@Configuration(proxyBeanMethods = false)
-	@Import({ FeignAutoConfiguration.class })
+	@Configuration
+	@Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {

 	}
@@ -101,11 +101,11 @@ public class FeignClientBuilderTests {
 	public void forType_preinitializedBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient");
+				.forType(FeignClientBuilderTests.class, "TestClient");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
 		assertFactoryBeanField(builder, "contextId", "TestClient");

@@ -126,20 +126,21 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").decode404(true).url("Url/")
-				.path("/Path").contextId("TestContext");
+				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
+				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
+				.url("Url/");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
-		assertFactoryBeanField(builder, "contextId", "TestContext");

 		// and:
 		assertFactoryBeanField(builder, "url", "http://Url/");
 		assertFactoryBeanField(builder, "path", "/Path");
 		assertFactoryBeanField(builder, "decode404", true);
-
+		assertFactoryBeanField(builder, "fallback", Object.class);
+		assertFactoryBeanField(builder, "fallbackFactory", Object.class);
 	}

 	@Test
@@ -158,8 +159,4 @@ public class FeignClientBuilderTests {
 		builder.build();
 	}

-	private interface TestFeignClient {
-
-	}
-
 }
@@ -1,170 +0,0 @@
-/*
- * Copyright 2020-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Map;
-
-import feign.Contract;
-import feign.InvocationHandlerFactory;
-import feign.RequestLine;
-import feign.Response;
-import feign.codec.ErrorDecoder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.openfeign.support.SpringMvcContract;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Michael Cramer
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientErrorDecoderTests.TestConfiguration.class)
-@DirtiesContext
-public class FeignClientErrorDecoderTests {
-
-	@Autowired
-	private FeignContext context;
-
-	@Autowired
-	private FooClient foo;
-
-	@Autowired
-	private BarClient bar;
-
-	@Test
-	public void clientsAvailable() {
-		assertThat(this.foo).isNotNull();
-		assertThat(this.bar).isNotNull();
-	}
-
-	@Test
-	public void errorDecoderInConfiguration() {
-		assertThat(this.context.getInstance("foo", ErrorDecoder.class))
-				.isInstanceOf(ErrorDecoder.Default.class);
-		assertThat(this.context.getInstance("bar", ErrorDecoder.class)).isNull();
-	}
-
-	@Test
-	public void useConfiguredErrorDecoderWhenAlsoErrorDecoderFactoryIsAvailable() {
-		Object errorDecoder = getErrorDecoderFromClient(this.foo);
-		assertThat(errorDecoder).isInstanceOf(ErrorDecoder.Default.class);
-	}
-
-	@Test
-	public void useErrorDecoderFromErrorDecoderFactory() {
-		Object errorDecoder = getErrorDecoderFromClient(this.bar);
-		assertThat(errorDecoder).isInstanceOf(ErrorDecoderImpl.class);
-	}
-
-	@SuppressWarnings({ "unchecked", "ConstantConditions" })
-	private Object getErrorDecoderFromClient(final Object client) {
-		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
-		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
-				.getField(invocationHandler, "dispatch");
-		Method key = new ArrayList<>(dispatch.keySet()).get(0);
-		return ReflectionTestUtils.getField(dispatch.get(key), "errorDecoder");
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
-	@EnableAutoConfiguration
-	protected static class TestConfiguration {
-
-	}
-
-	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
-	interface FooClient {
-
-		@RequestLine("GET /")
-		String get();
-
-	}
-
-	public static class FooConfiguration {
-
-		@Bean
-		Contract feignContract() {
-			return new Contract.Default();
-		}
-
-		@Bean
-		FeignErrorDecoderFactory errorDecoderFactory() {
-			return new FeignErrorDecoderFactoryImpl();
-		}
-
-		@Bean
-		ErrorDecoder feignErrorDecoder() {
-			return new ErrorDecoder.Default();
-		}
-
-	}
-
-	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
-	interface BarClient {
-
-		@RequestMapping(value = "/", method = RequestMethod.GET)
-		String get();
-
-	}
-
-	public static class BarConfiguration {
-
-		@Bean
-		Contract feignContract() {
-			return new SpringMvcContract();
-		}
-
-		@Bean
-		FeignErrorDecoderFactory errorDecoderFactory() {
-			return new FeignErrorDecoderFactoryImpl();
-		}
-
-	}
-
-	public static class FeignErrorDecoderFactoryImpl implements FeignErrorDecoderFactory {
-
-		@Override
-		public ErrorDecoder create(final Class<?> type) {
-			return new ErrorDecoderImpl();
-		}
-
-	}
-
-	public static class ErrorDecoderImpl implements ErrorDecoder {
-
-		@Override
-		public Exception decode(final String methodKey, final Response response) {
-			return null;
-		}
-
-	}
-
-}
@@ -16,30 +16,14 @@

 package org.springframework.cloud.openfeign;

-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;

-import feign.Client;
-import feign.InvocationHandlerFactory;
 import org.junit.Test;

-import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.web.bind.annotation.RequestMapping;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.web.bind.annotation.RequestMethod.GET;

 /**
 * @author Spencer Gibb
@@ -65,74 +49,10 @@ public class FeignClientFactoryTests {
 		assertThat(foobar).as("bar was not null").isNull();
 	}

-	@Test
-	public void shouldRedirectToDelegateWhenUrlSet() {
-		new ApplicationContextRunner().withUserConfiguration(TestConfig.class)
-				.run(this::defaultClientUsed);
-	}
-
-	@SuppressWarnings({ "unchecked", "ConstantConditions" })
-	private void defaultClientUsed(AssertableApplicationContext context) {
-		Proxy target = context.getBean(FeignClientFactoryBean.class).getTarget();
-		Object invocationHandler = ReflectionTestUtils.getField(target, "h");
-		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
-				.getField(invocationHandler, "dispatch");
-		Method key = new ArrayList<>(dispatch.keySet()).get(0);
-		Object client = ReflectionTestUtils.getField(dispatch.get(key), "client");
-		assertThat(client).isInstanceOf(Client.Default.class);
-	}
-
 	private FeignClientSpecification getSpec(String name, Class<?> configClass) {
 		return new FeignClientSpecification(name, new Class[] { configClass });
 	}

-	interface TestType {
-
-		@RequestMapping(value = "/", method = GET)
-		String hello();
-
-	}
-
-	@Configuration
-	static class TestConfig {
-
-		@Bean
-		BlockingLoadBalancerClient loadBalancerClient() {
-			return new BlockingLoadBalancerClient(new LoadBalancerClientFactory());
-		}
-
-		@Bean
-		FeignContext feignContext() {
-			FeignContext feignContext = new FeignContext();
-			feignContext.setConfigurations(
-					Collections.singletonList(new FeignClientSpecification("test",
-							new Class[] { LoadBalancerAutoConfiguration.class })));
-			return feignContext;
-		}
-
-		@Bean
-		FeignClientProperties feignClientProperties() {
-			return new FeignClientProperties();
-		}
-
-		@Bean
-		Targeter targeter() {
-			return new DefaultTargeter();
-		}
-
-		@Bean
-		FeignClientFactoryBean feignClientFactoryBean() {
-			FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
-			feignClientFactoryBean.setContextId("test");
-			feignClientFactoryBean.setName("test");
-			feignClientFactoryBean.setType(TestType.class);
-			feignClientFactoryBean.setPath("");
-			feignClientFactoryBean.setUrl("http://some.absolute.url");
-			return feignClientFactoryBean;
-		}
-
-	}
-
 	static class FooConfig {

 		@Bean
@@ -17,9 +17,8 @@
 package org.springframework.cloud.openfeign;

 import feign.Contract;
-import feign.ExceptionPropagationPolicy;
+import feign.Feign;
 import feign.Logger;
-import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestLine;
@@ -29,19 +28,21 @@ import feign.auth.BasicAuthRequestInterceptor;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
-import feign.querymap.BeanQueryMapEncoder;
 import feign.slf4j.Slf4jLogger;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -117,6 +118,13 @@ public class FeignClientOverrideDefaultsTests {
 				.cast(this.context.getInstance("bar", ErrorDecoder.class));
 	}

+	@Test
+	public void overrideBuilder() {
+		HystrixFeign.Builder.class
+				.cast(this.context.getInstance("foo", Feign.Builder.class));
+		Feign.Builder.class.cast(this.context.getInstance("bar", Feign.Builder.class));
+	}
+
 	@Test
 	public void overrideRequestOptions() {
 		assertThat(this.context.getInstance("foo", Request.Options.class)).isNull();
@@ -125,14 +133,6 @@ public class FeignClientOverrideDefaultsTests {
 		assertThat(options.readTimeoutMillis()).isEqualTo(1);
 	}

-	@Test
-	public void overrideQueryMapEncoder() {
-		QueryMapEncoder.Default.class
-				.cast(this.context.getInstance("foo", QueryMapEncoder.class));
-		BeanQueryMapEncoder.class
-				.cast(this.context.getInstance("bar", QueryMapEncoder.class));
-	}
-
 	@Test
 	public void addRequestInterceptor() {
 		assertThat(this.context.getInstances("foo", RequestInterceptor.class).size())
@@ -141,16 +141,7 @@ public class FeignClientOverrideDefaultsTests {
 				.isEqualTo(2);
 	}

-	@Test
-	public void exceptionPropagationPolicy() {
-		assertThat(this.context.getInstances("foo", ExceptionPropagationPolicy.class))
-				.isNull();
-		assertThat(this.context.getInstances("bar", ExceptionPropagationPolicy.class))
-				.containsValues(ExceptionPropagationPolicy.UNWRAP);
-	}
-
-	@FeignClient(name = "foo", url = "https://foo",
-			configuration = FooConfiguration.class)
+	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
 	interface FooClient {

 		@RequestLine("GET /")
@@ -158,8 +149,7 @@ public class FeignClientOverrideDefaultsTests {

 	}

-	@FeignClient(name = "bar", url = "https://bar",
-			configuration = BarConfiguration.class)
+	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
 	interface BarClient {

 		@RequestMapping(value = "/", method = RequestMethod.GET)
@@ -167,9 +157,10 @@ public class FeignClientOverrideDefaultsTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
-	@EnableAutoConfiguration
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			FeignAutoConfiguration.class })
 	protected static class TestConfiguration {

 		@Bean
@@ -206,8 +197,8 @@ public class FeignClientOverrideDefaultsTests {
 		}

 		@Bean
-		public QueryMapEncoder queryMapEncoder() {
-			return new feign.QueryMapEncoder.Default();
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
 		}

 	}
@@ -239,16 +230,6 @@ public class FeignClientOverrideDefaultsTests {
 			return new BasicAuthRequestInterceptor("user", "pass");
 		}

-		@Bean
-		public QueryMapEncoder queryMapEncoder() {
-			return new BeanQueryMapEncoder();
-		}
-
-		@Bean
-		public ExceptionPropagationPolicy exceptionPropagationPolicy() {
-			return ExceptionPropagationPolicy.UNWRAP;
-		}
-
 	}

 }
@@ -16,14 +16,13 @@

 package org.springframework.cloud.openfeign;

-import java.io.IOException;
 import java.lang.reflect.Type;
-import java.net.SocketTimeoutException;
 import java.util.Collections;
 import java.util.Map;

 import javax.servlet.http.HttpServletRequest;

+import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -51,6 +50,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -59,8 +59,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Eko Kurniawan Khannedy
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
-		webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -78,8 +77,6 @@ public class FeignClientUsingPropertiesTests {

 	private FeignClientFactoryBean barFactoryBean;

-	private FeignClientFactoryBean unwrapFactoryBean;
-
 	private FeignClientFactoryBean formFactoryBean;

 	public FeignClientUsingPropertiesTests() {
@@ -91,10 +88,6 @@ public class FeignClientUsingPropertiesTests {
 		this.barFactoryBean.setContextId("bar");
 		this.barFactoryBean.setType(FeignClientFactoryBean.class);

-		this.unwrapFactoryBean = new FeignClientFactoryBean();
-		this.unwrapFactoryBean.setContextId("unwrap");
-		this.unwrapFactoryBean.setType(FeignClientFactoryBean.class);
-
 		this.formFactoryBean = new FeignClientFactoryBean();
 		this.formFactoryBean.setContextId("form");
 		this.formFactoryBean.setType(FeignClientFactoryBean.class);
@@ -112,12 +105,6 @@ public class FeignClientUsingPropertiesTests {
 				"http://localhost:" + this.port);
 	}

-	public UnwrapClient unwrapClient() {
-		this.unwrapFactoryBean.setApplicationContext(this.applicationContext);
-		return this.unwrapFactoryBean.feign(this.context).target(UnwrapClient.class,
-				"http://localhost:" + this.port);
-	}
-
 	public FormClient formClient() {
 		this.formFactoryBean.setApplicationContext(this.applicationContext);
 		return this.formFactoryBean.feign(this.context).target(FormClient.class,
@@ -136,12 +123,6 @@ public class FeignClientUsingPropertiesTests {
 		fail("it should timeout");
 	}

-	@Test(expected = SocketTimeoutException.class)
-	public void testUnwrap() throws Exception {
-		unwrapClient().unwrap();
-		fail("it should timeout");
-	}
-
 	@Test
 	public void testForm() {
 		Map<String, String> request = Collections.singletonMap("form", "Data");
@@ -163,22 +144,14 @@ public class FeignClientUsingPropertiesTests {

 	}

-	protected interface UnwrapClient {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/bar") // intentionally /bar
-		String unwrap() throws IOException;
-
-	}
-
 	protected interface FormClient {

-		@RequestMapping(value = "/form", method = RequestMethod.POST,
-				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		String form(Map<String, String> form);

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -201,8 +174,7 @@ public class FeignClientUsingPropertiesTests {
 			return "OK";
 		}

-		@RequestMapping(value = "/form", method = RequestMethod.POST,
-				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		public String form(HttpServletRequest request) {
 			return request.getParameter("form");
 		}
@@ -258,7 +230,7 @@ public class FeignClientUsingPropertiesTests {

 			requestTemplate.header(HttpHeaders.CONTENT_TYPE,
 					MediaType.APPLICATION_FORM_URLENCODED_VALUE);
-			requestTemplate.body(builder.toString());
+			requestTemplate.body(Request.Body.bodyTemplate(builder.toString(), UTF_8));
 		}

 	}
@@ -37,7 +37,7 @@ public class FeignClientsRegistrarTests {

 	@Test(expected = IllegalStateException.class)
 	public void badNameHttpPrefix() {
-		testGetName("https://bad_hostname");
+		testGetName("http://bad_hostname");
 	}

 	@Test(expected = IllegalStateException.class)
@@ -63,8 +63,8 @@ public class FeignClientsRegistrarTests {

 	@Test
 	public void goodNameHttpPrefix() {
-		String name = testGetName("https://good-name");
-		assertThat(name).as("name was wrong").isEqualTo("https://good-name");
+		String name = testGetName("http://good-name");
+		assertThat(name).as("name was wrong").isEqualTo("http://good-name");
 	}

 	@Test
@@ -89,8 +89,7 @@ public class FeignClientsRegistrarTests {
 		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}

-	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/",
-			fallback = FallbackClient.class)
+	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
 	protected interface FallbackClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -98,8 +97,7 @@ public class FeignClientsRegistrarTests {

 	}

-	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/",
-			fallbackFactory = FallbackFactoryClient.class)
+	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/", fallbackFactory = FallbackFactoryClient.class)
 	protected interface FallbackFactoryClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -107,17 +105,17 @@ public class FeignClientsRegistrarTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
 	protected static class FallbackTestConfig {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
-	@EnableFeignClients(
-			clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class })
+	@EnableFeignClients(clients = {
+			FeignClientsRegistrarTests.FallbackFactoryClient.class })
 	protected static class FallbackFactoryTestConfig {

 	}
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration;
 import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingInterceptor;
 import org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration;
@@ -53,7 +54,8 @@ public class FeignCompressionTests {
 				.withPropertyValues("feign.compression.response.enabled=true",
 						"feign.compression.request.enabled=true",
 						"feign.okhttp.enabled=false")
-				.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
+				.withConfiguration(AutoConfigurations.of(ArchaiusAutoConfiguration.class,
+						FeignAutoConfiguration.class,
 						FeignContentGzipEncodingAutoConfiguration.class,
 						FeignAcceptGzipEncodingAutoConfiguration.class,
 						HttpClientConfiguration.class, PlainConfig.class))
@@ -69,7 +71,7 @@ public class FeignCompressionTests {
 				});
 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	protected static class PlainConfig {

 		@Autowired
@@ -1,125 +0,0 @@
-/*
- * Copyright 2020-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.Response;
-import feign.codec.ErrorDecoder;
-import org.junit.Test;
-
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Michael Cramer
- */
-public class FeignErrorDecoderFactoryTests {
-
-	@Test
-	public void testNoDefaultFactory() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				SampleConfiguration1.class);
-		String[] beanNamesForType = context
-				.getBeanNamesForType(FeignErrorDecoderFactory.class);
-		assertThat(beanNamesForType).isEmpty();
-		context.close();
-	}
-
-	@Test
-	public void testCustomErrorDecoderFactory() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				SampleConfiguration2.class);
-		FeignErrorDecoderFactory errorDecoderFactory = context
-				.getBean(FeignErrorDecoderFactory.class);
-		assertThat(errorDecoderFactory).isNotNull();
-		ErrorDecoder errorDecoder = errorDecoderFactory.create(Object.class);
-		assertThat(errorDecoder).isNotNull();
-		assertThat(errorDecoder instanceof ErrorDecoderImpl).isTrue();
-		context.close();
-	}
-
-	@Test
-	public void testCustomErrorDecoderFactoryNotOverwritingErrorDecoder() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				SampleConfiguration3.class);
-		FeignErrorDecoderFactory errorDecoderFactory = context
-				.getBean(FeignErrorDecoderFactory.class);
-		assertThat(errorDecoderFactory).isNotNull();
-		ErrorDecoder errorDecoderFromFactory = errorDecoderFactory.create(Object.class);
-		assertThat(errorDecoderFromFactory).isNotNull();
-		assertThat(errorDecoderFromFactory instanceof ErrorDecoderImpl).isTrue();
-		ErrorDecoder errorDecoder = context.getBean(ErrorDecoder.class);
-		assertThat(errorDecoder).isNotNull();
-		assertThat(errorDecoder instanceof ErrorDecoder.Default).isTrue();
-		context.close();
-	}
-
-	@Configuration
-	@Import(FeignClientsConfiguration.class)
-	protected static class SampleConfiguration1 {
-
-	}
-
-	@Configuration
-	@Import(FeignClientsConfiguration.class)
-	protected static class SampleConfiguration2 {
-
-		@Bean
-		public FeignErrorDecoderFactory errorDecoderFactory() {
-			return new ErrorDecoderFactoryImpl();
-		}
-
-	}
-
-	@Configuration
-	@Import(FeignClientsConfiguration.class)
-	protected static class SampleConfiguration3 {
-
-		@Bean
-		public FeignErrorDecoderFactory errorDecoderFactory() {
-			return new ErrorDecoderFactoryImpl();
-		}
-
-		@Bean
-		public ErrorDecoder errorDecoder() {
-			return new ErrorDecoder.Default();
-		}
-
-	}
-
-	static class ErrorDecoderFactoryImpl implements FeignErrorDecoderFactory {
-
-		@Override
-		public ErrorDecoder create(final Class<?> type) {
-			return new ErrorDecoderImpl();
-		}
-
-	}
-
-	static class ErrorDecoderImpl implements ErrorDecoder {
-
-		@Override
-		public Exception decode(final String methodKey, final Response response) {
-			return null;
-		}
-
-	}
-
-}
@@ -50,10 +50,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class,
-		webEnvironment = DEFINED_PORT,
-		value = { "spring.application.name=feignclienturltest",
-				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = DEFINED_PORT, value = {
+		"spring.application.name=feignclienturltest", "feign.hystrix.enabled=false",
+		"feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignHttpClientUrlTests {

@@ -129,7 +128,7 @@ public class FeignHttpClientUrlTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class,
@@ -69,13 +69,13 @@ public class FeignLoggerFactoryTests {
 		context.close();
 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration1 {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration2 {

@@ -95,7 +95,7 @@ public class FeignLoggerFactoryTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration3 {

@@ -25,10 +25,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -47,16 +47,15 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringDecoderTests.Application.class,
-		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-				"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringDecoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringDecoderTests extends FeignClientFactoryBean {

 	@Autowired
 	FeignContext context;

-	@LocalServerPort
+	@Value("${local.server.port}")
 	private int port = 0;

 	public SpringDecoderTests() {
@@ -215,7 +214,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" })
+public class SpringRetryDisabledTests {
+
+	private ConfigurableApplicationContext context;
+
+	@Before
+	public void setUp() {
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.sources(RibbonAutoConfiguration.class,
+						LoadBalancerAutoConfiguration.class,
+						RibbonClientConfiguration.class,
+						FeignRibbonClientAutoConfiguration.class)
+				.run();
+	}
+
+	@After
+	public void tearDown() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void testLoadBalancedRetryFactoryBean() throws Exception {
+		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
+				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
+		assertThat(lbFactorys.values()).hasSize(1);
+		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
+		assertThat(lb).isInstanceOf(FeignLoadBalancer.class);
+		assertThat(lb).isNotInstanceOf(RetryableFeignLoadBalancer.class);
+	}
+
+}
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.BeansException;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { RibbonAutoConfiguration.class,
+		RibbonClientConfiguration.class, LoadBalancerAutoConfiguration.class,
+		FeignRibbonClientAutoConfiguration.class, HttpClientConfiguration.class })
+public class SpringRetryEnabledTests implements ApplicationContextAware {
+
+	private ApplicationContext context;
+
+	@Test
+	public void testLoadBalancedRetryFactoryBean() throws Exception {
+		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
+				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
+		assertThat(lbFactorys.values()).hasSize(1);
+		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
+		assertThat(lb).isInstanceOf(RetryableFeignLoadBalancer.class);
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.context = context;
+	}
+
+}
@@ -47,20 +47,14 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Dave Syer
- * @author Spencer Gibb
- * @author Jakub Narloch
- * @author Erik Kringen
- * @author Halvdan Hoem Grelland
- * @author Aaron Whiteside
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = BeansFeignClientTests.Application.class,
-		webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=feignclienttest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
-public class BeansFeignClientTests {
+public class FeignClientTests {

 	@Value("${local.server.port}")
 	private int port = 0;
@@ -117,7 +111,7 @@ public class BeansFeignClientTests {
 		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients
@@ -175,7 +169,7 @@ public class BeansFeignClientTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class TestDefaultFeignConfig {

 	}
@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign.beans;

 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.beans.BeansFeignClientTests.Hello;
+import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
 import org.springframework.context.annotation.Primary;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign.beans.extra;

 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.beans.BeansFeignClientTests.Hello;
+import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

@@ -16,17 +16,20 @@

 package org.springframework.cloud.openfeign.encoding;

+import java.util.Collections;
 import java.util.List;

+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -34,7 +37,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -48,9 +50,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "feign.compression.response.enabled=true" })
+@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"feign.compression.response.enabled=true" })
@RunWith(SpringRunner.class)
@DirtiesContext
 public class FeignAcceptEncodingTests {
@@ -73,24 +74,25 @@ public class FeignAcceptEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
-	@SpringBootApplication(
-			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {

 	}

-	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	@Configuration
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -16,17 +16,20 @@

 package org.springframework.cloud.openfeign.encoding;

+import java.util.Collections;
 import java.util.List;

+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -34,7 +37,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,11 +49,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignContentEncodingTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "feign.compression.request.enabled=true",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"ribbon.OkToRetryOnAllOperations=false" })
+@SpringBootTest(classes = FeignContentEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"feign.compression.request.enabled=true",
+		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+		"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignContentEncodingTests {

@@ -77,24 +78,25 @@ public class FeignContentEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
-	@SpringBootApplication(
-			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {

 	}

-	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	@Configuration
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -16,16 +16,19 @@

 package org.springframework.cloud.openfeign.encoding;

+import java.util.Collections;
+
+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
@@ -34,7 +37,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -52,11 +54,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Charlie Mordant.
 */
-@SpringBootTest(classes = FeignPageableEncodingTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "feign.compression.request.enabled=true",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"ribbon.OkToRetryOnAllOperations=false" })
+@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"feign.compression.request.enabled=true",
+		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+		"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignPageableEncodingTests {

@@ -82,26 +83,26 @@ public class FeignPageableEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
-	@SpringBootApplication(
-			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
-			exclude = { RepositoryRestMvcAutoConfiguration.class })
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@EnableSpringDataWebSupport
 	@Import({ NoSecurityConfiguration.class, FeignClientsConfiguration.class })
 	public static class Application {

 	}

-	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	@Configuration
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -34,18 +34,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
@FeignClient("local")
 public interface InvoiceClient {

-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable);

-	@RequestMapping(value = "invoices", method = RequestMethod.GET,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> getInvoices();

-	@RequestMapping(value = "invoices", method = RequestMethod.POST,
-			consumes = MediaType.APPLICATION_JSON_VALUE,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> saveInvoices(List<Invoice> invoices);

 }
@@ -39,23 +39,19 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
 public class InvoiceResource {

-	@RequestMapping(value = "invoices", method = RequestMethod.GET,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Invoice>> getInvoices() {

 		return ResponseEntity.ok(createInvoiceList(100));
 	}

-	@RequestMapping(value = "invoices", method = RequestMethod.POST,
-			consumes = MediaType.APPLICATION_JSON_VALUE,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> saveInvoices(@RequestBody List<Invoice> invoices) {

 		return ResponseEntity.ok(invoices);
 	}

-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable) {
 		Page<Invoice> page = new PageImpl<>(createInvoiceList(pageable.getPageSize()),
@@ -1,75 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
-import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.test.context.FilteredClassLoader;
-import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
-import org.springframework.hateoas.RepresentationModel;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Hector Espert
- */
-public class FeignHalAutoConfigurationContextTests {
-
-	private WebApplicationContextRunner contextRunner;
-
-	@Before
-	public void setUp() {
-		contextRunner = new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
-						HttpMessageConvertersAutoConfiguration.class,
-						HypermediaAutoConfiguration.class,
-						RepositoryRestMvcAutoConfiguration.class,
-						FeignHalAutoConfiguration.class))
-				.withPropertyValues("debug=true");
-	}
-
-	@Test
-	public void testHalJacksonHttpMessageConverterIsNotLoaded() {
-		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(
-				RepositoryRestMvcConfiguration.class, RepresentationModel.class);
-		contextRunner.withClassLoader(filteredClassLoader)
-				.run(context -> assertThat(context)
-						.doesNotHaveBean("halJacksonHttpMessageConverter"));
-	}
-
-	@Test
-	public void testHalJacksonHttpMessageConverterIsLoaded() {
-		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(
-				RepositoryRestMvcConfiguration.class);
-		contextRunner.withClassLoader(filteredClassLoader).run(
-				context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
-	}
-
-	@Test
-	public void testHalJacksonHttpMessageConverterIsNotLoadedUseRestDataMessageConverterInstead() {
-		contextRunner.run(
-				context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
-	}
-
-}
@@ -1,89 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas;
-
-import java.util.Arrays;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.hateoas.mediatype.MessageResolver;
-import org.springframework.hateoas.mediatype.hal.CurieProvider;
-import org.springframework.hateoas.mediatype.hal.HalConfiguration;
-import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
-import org.springframework.hateoas.server.LinkRelationProvider;
-import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.springframework.hateoas.MediaTypes.HAL_JSON;
-
-/**
- * @author Hector Espert
- */
-@RunWith(MockitoJUnitRunner.class)
-public class FeignHalAutoConfigurationTests {
-
-	@Mock
-	private ObjectProvider<ObjectMapper> objectMapper;
-
-	@Mock
-	private ObjectProvider<HalConfiguration> halConfiguration;
-
-	@Mock
-	private ObjectProvider<LinkRelationProvider> relProvider;
-
-	@Mock
-	private ObjectProvider<CurieProvider> curieProvider;
-
-	@Mock
-	private ObjectProvider<MessageResolver> messageResolver;
-
-	@InjectMocks
-	private FeignHalAutoConfiguration feignHalAutoConfiguration;
-
-	@Test
-	public void halJacksonHttpMessageConverter() {
-		ObjectMapper mapper = new ObjectMapper();
-		when(objectMapper.getIfAvailable(any())).thenReturn(mapper);
-
-		when(halConfiguration.getIfAvailable(any()))
-				.thenReturn(mock(HalConfiguration.class));
-		when(relProvider.getIfAvailable()).thenReturn(mock(LinkRelationProvider.class));
-		when(curieProvider.getIfAvailable(any())).thenReturn(mock(CurieProvider.class));
-		when(messageResolver.getIfAvailable()).thenReturn(mock(MessageResolver.class));
-
-		TypeConstrainedMappingJackson2HttpMessageConverter converter = feignHalAutoConfiguration
-				.halJacksonHttpMessageConverter(objectMapper, halConfiguration,
-						messageResolver, curieProvider, relProvider);
-
-		assertThat(converter).isNotNull();
-		assertThat(converter.getObjectMapper()).isNotNull();
-		assertThat(converter.getSupportedMediaTypes()).isEqualTo(Arrays.asList(HAL_JSON));
-
-		assertThat(Jackson2HalModule.isAlreadyRegisteredIn(converter.getObjectMapper()))
-				.isTrue();
-	}
-
-}
@@ -1,107 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas;
-
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.openfeign.hateoas.app.FeignHalApplication;
-import org.springframework.cloud.openfeign.hateoas.app.FeignHalClient;
-import org.springframework.cloud.openfeign.hateoas.app.MarsRover;
-import org.springframework.hateoas.CollectionModel;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.PagedModel;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * Test HATEOAS support.
- *
- * @author Hector Espert
- */
-@SpringBootTest(classes = FeignHalApplication.class, webEnvironment = RANDOM_PORT,
-		value = "debug=true")
-@RunWith(SpringRunner.class)
-@DirtiesContext
-public class FeignHalTests {
-
-	@Autowired
-	private FeignHalClient feignHalClient;
-
-	@Test
-	public void testEntityModel() {
-		EntityModel<MarsRover> entity = feignHalClient.entity();
-		assertThat(entity).isNotNull();
-
-		assertThat(entity.hasLinks()).isTrue();
-		assertThat(entity.hasLink("self")).isTrue();
-
-		assertThat(entity.getLink("self")).map(Link::getHref).contains("/entity");
-
-		MarsRover marsRover = entity.getContent();
-		assertThat(marsRover).isNotNull();
-		assertThat(marsRover.getName()).isEqualTo("Sojourner");
-	}
-
-	@Test
-	public void testCollectionModel() {
-		CollectionModel<MarsRover> collectionModel = feignHalClient.collection();
-		assertThat(collectionModel).isNotNull();
-		assertThat(collectionModel).isNotEmpty();
-
-		assertThat(collectionModel.hasLinks()).isTrue();
-		assertThat(collectionModel.hasLink("self")).isTrue();
-
-		assertThat(collectionModel.getLink("self")).map(Link::getHref)
-				.contains("/collection");
-
-		Collection<MarsRover> collection = collectionModel.getContent();
-		assertThat(collection).isNotEmpty();
-
-		MarsRover marsRover = collection.stream().findAny().orElse(null);
-		assertThat(marsRover).isNotNull();
-		assertThat(marsRover.getName()).isEqualTo("Opportunity");
-	}
-
-	@Test
-	public void testPagedModel() {
-		PagedModel<MarsRover> paged = feignHalClient.paged();
-		assertThat(paged).isNotNull();
-		assertThat(paged).isNotEmpty();
-
-		assertThat(paged.hasLinks()).isTrue();
-		assertThat(paged.hasLink("self")).isTrue();
-
-		assertThat(paged.getLink("self")).map(Link::getHref).contains("/paged");
-
-		Collection<MarsRover> collection = paged.getContent();
-		assertThat(collection).isNotEmpty();
-
-		MarsRover marsRover = collection.stream().findAny().orElse(null);
-		assertThat(marsRover).isNotNull();
-		assertThat(marsRover.getName()).isEqualTo("Curiosity");
-	}
-
-}
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas.app;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
-
-/**
- * Test HATEOAS application.
- *
- * @author Hector Espert
- */
-@EnableFeignClients(clients = FeignHalClient.class)
-@SpringBootApplication(
-		scanBasePackages = "org.springframework.cloud.openfeign.hateoas.app",
-		exclude = RepositoryRestMvcAutoConfiguration.class)
-@LoadBalancerClient(name = "local", configuration = LocalHalClientConfiguration.class)
-@Import(NoSecurityConfiguration.class)
-public class FeignHalApplication {
-
-	// Load balancer with fixed server list for "local" pointing to localhost
-
-}
-
-class LocalHalClientConfiguration {
-
-	@LocalServerPort
-	private int port = 0;
-
-	@Bean
-	public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-			Environment env) {
-		return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
-	}
-
-}
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas.app;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.hateoas.CollectionModel;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.PagedModel;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
- * @author Hector Espert
- */
-@FeignClient("local")
-public interface FeignHalClient {
-
-	@GetMapping("entity")
-	EntityModel<MarsRover> entity();
-
-	@GetMapping("collection")
-	CollectionModel<MarsRover> collection();
-
-	@GetMapping("paged")
-	PagedModel<MarsRover> paged();
-
-}
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas.app;
-
-import java.util.Collections;
-
-import org.springframework.hateoas.CollectionModel;
-import org.springframework.hateoas.EntityModel;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.PagedModel;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Hector Espert
- */
-@RestController
-public class FeignHalController {
-
-	@GetMapping("/entity")
-	public EntityModel<MarsRover> getEntity() {
-		MarsRover marsRover = new MarsRover();
-		marsRover.setName("Sojourner");
-		Link link = new Link("/entity", "self");
-		return new EntityModel<>(marsRover, link);
-	}
-
-	@GetMapping("/collection")
-	public CollectionModel<MarsRover> getCollection() {
-		MarsRover marsRover = new MarsRover();
-		marsRover.setName("Opportunity");
-		Link link = new Link("/collection", "self");
-		return new CollectionModel<>(Collections.singleton(marsRover), link);
-	}
-
-	@GetMapping("/paged")
-	public CollectionModel<MarsRover> getPaged() {
-		MarsRover marsRover = new MarsRover();
-		marsRover.setName("Curiosity");
-		Link link = new Link("/paged", "self");
-		PagedModel.PageMetadata metadata = new PagedModel.PageMetadata(1, 1, 1);
-		return new PagedModel<>(Collections.singleton(marsRover), metadata, link);
-	}
-
-}
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
+import org.springframework.cloud.openfeign.hystrix.security.app.ProxyUsernameController;
+import org.springframework.cloud.openfeign.hystrix.security.app.TestInterceptor;
+import org.springframework.cloud.openfeign.hystrix.security.app.UsernameClient;
+import org.springframework.cloud.openfeign.hystrix.security.app.UsernameController;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * @author Daniel Lavoie
+ */
+@Configuration
+@EnableAutoConfiguration
+@EnableFeignClients(clients = UsernameClient.class)
+@Import(NoSecurityConfiguration.class)
+public class HystrixSecurityApplication {
+
+	@Bean
+	public CustomConcurrenyStrategy customConcurrenyStrategy() {
+		return new CustomConcurrenyStrategy();
+	}
+
+	@Bean
+	public TestInterceptor testInterceptor() {
+		return new TestInterceptor();
+	}
+
+	@Bean
+	public ProxyUsernameController proxyUsernameController() {
+		return new ProxyUsernameController();
+	}
+
+	@Bean
+	public UsernameController usernameController() {
+		return new UsernameController();
+	}
+
+}
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security;
+
+import java.util.Base64;
+
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurrencyStrategy;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests that a secured web service returning values using a feign client properly access
+ * the security context from a hystrix command.
+ *
+ * @author Daniel Lavoie
+ */
+@RunWith(SpringRunner.class)
+@DirtiesContext
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
+		"feign.hystrix.enabled=true" })
+@ActiveProfiles("proxysecurity")
+public class HystrixSecurityTests {
+
+	@Autowired
+	private CustomConcurrenyStrategy customConcurrenyStrategy;
+
+	@LocalServerPort
+	private String serverPort;
+
+	// TODO: move to constants in TestAutoConfiguration
+	private String username = "user";
+
+	private String password = "password";
+
+	public static HttpHeaders createBasicAuthHeader(final String username,
+			final String password) {
+		return new HttpHeaders() {
+			private static final long serialVersionUID = 1766341693637204893L;
+
+			{
+				String auth = username + ":" + password;
+				byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes());
+				String authHeader = "Basic " + new String(encodedAuth);
+				this.set("Authorization", authHeader);
+			}
+		};
+	}
+
+	@Test
+	public void testSecurityConcurrencyStrategyInstalled() {
+		HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance()
+				.getConcurrencyStrategy();
+		assertThat(concurrencyStrategy)
+				.isInstanceOf(SecurityContextConcurrencyStrategy.class);
+	}
+
+	@Test
+	public void testFeignHystrixSecurity() {
+		HttpHeaders headers = createBasicAuthHeader(this.username, this.password);
+
+		ResponseEntity<String> entity = new RestTemplate().exchange(
+				"http://localhost:" + this.serverPort + "/proxy-username", HttpMethod.GET,
+				new HttpEntity<Void>(headers), String.class);
+
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+		assertThat(entity.getBody())
+				.as("Username should have been intercepted by feign interceptor.")
+				.isEqualTo(this.username);
+
+		assertThat(this.customConcurrenyStrategy.isHookCalled())
+				.as("Custom hook should have been called.").isTrue();
+	}
+
+	@SpringBootConfiguration
+	@Import(HystrixSecurityApplication.class)
+	@RibbonClient(name = "username", configuration = LocalRibbonClientConfiguration.class)
+	protected static class TestConfig {
+
+	}
+
+	protected static class LocalRibbonClientConfiguration {
+
+		@LocalServerPort
+		private int port = 0;
+
+		@Bean
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
+		}
+
+	}
+
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import java.util.concurrent.Callable;
+
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+
+public class CustomConcurrenyStrategy extends HystrixConcurrencyStrategy {
+
+	private boolean hookCalled;
+
+	@Override
+	public <T> Callable<T> wrapCallable(Callable<T> callable) {
+		this.hookCalled = true;
+
+		return super.wrapCallable(callable);
+	}
+
+	public boolean isHookCalled() {
+		return this.hookCalled;
+	}
+
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Daniel Lavoie
+ */
+@RestController
+@RequestMapping("/proxy-username")
+public class ProxyUsernameController {
+
+	@Autowired
+	private UsernameClient usernameClient;
+
+	@RequestMapping
+	public String getUsername() {
+		return this.usernameClient.getUsername();
+	}
+
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * This interceptor should be called from an Hyxtrix command execution thread. It is
+ * access the SecurityContext and settings an http header from the authentication details.
+ *
+ * @author Daniel Lavoie
+ */
+public class TestInterceptor implements RequestInterceptor {
+
+	@Override
+	public void apply(RequestTemplate template) {
+		if (SecurityContextHolder.getContext().getAuthentication() != null) {
+			template.header("username",
+					SecurityContextHolder.getContext().getAuthentication().getName());
+		}
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,21 +14,18 @@
 * limitations under the License.
 */

-package org.springframework.cloud.openfeign.hateoas.app;
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;

 /**
- * @author Hector Espert
+ * @author Daniel Lavoie
 */
-public class MarsRover {
+@FeignClient("username")
+public interface UsernameClient {

-	private String name;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
+	@RequestMapping("/username")
+	String getUsername();

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,16 +14,22 @@
 * limitations under the License.
 */

-package org.springframework.cloud.openfeign.hateoas.app;
+package org.springframework.cloud.openfeign.hystrix.security.app;

-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 /**
- * @author Hector Espert
+ * @author Daniel Lavoie
 */
-public class FeignHalRibbonConfiguration {
+@RestController
+@RequestMapping("/username")
+public class UsernameController {

-	@Value("${local.server.port}")
-	private int serverPort = 0;
+	@RequestMapping
+	public String getUsername(@RequestHeader String username) {
+		return username;
+	}

 }
@@ -16,16 +16,22 @@

 package org.springframework.cloud.openfeign.invalid;

+import feign.Feign;
+import feign.hystrix.FallbackFactory;
+import feign.hystrix.HystrixFeign;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;

 import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,10 +47,18 @@ public class FeignClientValidationTests {
 	@Rule
 	public ExpectedException expected = ExpectedException.none();

+	@Test
+	public void testNameAndValue() {
+		this.expected.expectMessage("only one is permitted");
+		new AnnotationConfigApplicationContext(NameAndValueConfiguration.class);
+	}
+
 	@Test
 	public void testServiceIdAndValue() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				LoadBalancerAutoConfiguration.class, NameAndServiceIdConfiguration.class);
+				LoadBalancerAutoConfiguration.class, RibbonAutoConfiguration.class,
+				FeignRibbonClientAutoConfiguration.class,
+				NameAndServiceIdConfiguration.class);
 		assertThat(context.getBean(NameAndServiceIdConfiguration.Client.class))
 				.isNotNull();
 		context.close();
@@ -55,6 +69,7 @@ public class FeignClientValidationTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.setAllowBeanDefinitionOverriding(false);
 		context.register(LoadBalancerAutoConfiguration.class,
+				RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class,
 				DuplicatedFeignClientNamesConfiguration.class);
 		context.refresh();
 		assertThat(
@@ -72,7 +87,63 @@ public class FeignClientValidationTests {
 		new AnnotationConfigApplicationContext(BadHostnameConfiguration.class);
 	}

-	@Configuration(proxyBeanMethods = false)
+	@Test
+	public void testMissingFallback() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				MissingFallbackConfiguration.class)) {
+			this.expected.expectMessage("No fallback instance of type");
+			assertThat(context.getBean(MissingFallbackConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testWrongFallbackType() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				WrongFallbackTypeConfiguration.class)) {
+			this.expected.expectMessage("Incompatible fallback instance");
+			assertThat(context.getBean(WrongFallbackTypeConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testMissingFallbackFactory() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				MissingFallbackFactoryConfiguration.class)) {
+			this.expected.expectMessage("No fallbackFactory instance of type");
+			assertThat(context.getBean(MissingFallbackFactoryConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testWrongFallbackFactoryType() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				WrongFallbackFactoryTypeConfiguration.class)) {
+			this.expected.expectMessage("Incompatible fallbackFactory instance");
+			assertThat(
+					context.getBean(WrongFallbackFactoryTypeConfiguration.Client.class))
+							.isNotNull();
+		}
+	}
+
+	@Configuration
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = NameAndValueConfiguration.Client.class)
+	protected static class NameAndValueConfiguration {
+
+		@FeignClient(value = "foo", name = "bar")
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+	}
+
+	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
 	protected static class NameAndServiceIdConfiguration {
@@ -87,11 +158,12 @@ public class FeignClientValidationTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
+
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
-	@EnableFeignClients(
-			clients = { DuplicatedFeignClientNamesConfiguration.FooClient.class,
-					DuplicatedFeignClientNamesConfiguration.BarClient.class })
+	@EnableFeignClients(clients = {
+			DuplicatedFeignClientNamesConfiguration.FooClient.class,
+			DuplicatedFeignClientNamesConfiguration.BarClient.class })
 	protected static class DuplicatedFeignClientNamesConfiguration {

 		@FeignClient(contextId = "foo", name = "bar")
@@ -112,7 +184,7 @@ public class FeignClientValidationTests {

 	}

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = BadHostnameConfiguration.Client.class)
 	protected static class BadHostnameConfiguration {
@@ -127,4 +199,120 @@ public class FeignClientValidationTests {

 	}

+	@Configuration
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = MissingFallbackConfiguration.Client.class)
+	protected static class MissingFallbackConfiguration {
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost", fallback = ClientFallback.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class ClientFallback implements Client {
+
+			@Override
+			public String get() {
+				return null;
+			}
+
+		}
+
+	}
+
+	@Configuration
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = WrongFallbackTypeConfiguration.Client.class)
+	protected static class WrongFallbackTypeConfiguration {
+
+		@Bean
+		Dummy dummy() {
+			return new Dummy();
+		}
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost", fallback = Dummy.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class Dummy {
+
+		}
+
+	}
+
+	@Configuration
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = MissingFallbackFactoryConfiguration.Client.class)
+	protected static class MissingFallbackFactoryConfiguration {
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = ClientFallback.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class ClientFallback implements FallbackFactory<Client> {
+
+			@Override
+			public Client create(Throwable cause) {
+				return null;
+			}
+
+		}
+
+	}
+
+	@Configuration
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = WrongFallbackFactoryTypeConfiguration.Client.class)
+	protected static class WrongFallbackFactoryTypeConfiguration {
+
+		@Bean
+		Dummy dummy() {
+			return new Dummy();
+		}
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = Dummy.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class Dummy {
+
+		}
+
+	}
+
 }
@@ -1,144 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link FeignBlockingLoadBalancerClient}. Note: the underlying
- * {@link BlockingLoadBalancerClient} is already extensively tested in the Spring Cloud
- * Commons project, so here we are only testing the interactions between
- * {@link FeignBlockingLoadBalancerClient} and its delegates.
- *
- * @see <a href=
- * "https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
- * @author Olga Maciaszek-Sharma
- */
-@ExtendWith(MockitoExtension.class)
-class FeignBlockingLoadBalancerClientTests {
-
-	private Client delegate = mock(Client.class);
-
-	private BlockingLoadBalancerClient loadBalancerClient = mock(
-			BlockingLoadBalancerClient.class);
-
-	private FeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new FeignBlockingLoadBalancerClient(
-			delegate, loadBalancerClient);
-
-	@Test
-	void shouldExtractServiceIdFromRequestUrl() throws IOException {
-		Request request = testRequest();
-
-		feignBlockingLoadBalancerClient.execute(request, new Request.Options());
-
-		verify(loadBalancerClient).choose("test");
-	}
-
-	@Test
-	void shouldThrowExceptionIfNoServiceId() {
-		Request request = testRequest("");
-
-		assertThatIllegalStateException()
-				.isThrownBy(() -> feignBlockingLoadBalancerClient.execute(request,
-						new Request.Options()))
-				.withMessage(
-						"Request URI does not contain a valid hostname: http:///path");
-	}
-
-	@Test
-	void shouldRespondWithServiceUnavailableIfInstanceNotFound() throws IOException {
-		Request request = testRequest();
-
-		Response response = feignBlockingLoadBalancerClient.execute(request,
-				new Request.Options());
-
-		assertThat(response.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.value());
-		assertThat(response.body().toString()).isEqualTo(
-				"Load balancer does not contain an instance for the service test");
-	}
-
-	@Test
-	void shouldPassCorrectRequestToDelegate() throws IOException {
-		Request request = testRequest();
-		Request.Options options = new Request.Options();
-		String url = "http://127.0.0.1/path";
-		ServiceInstance serviceInstance = new DefaultServiceInstance("test-1", "test",
-				"test-host", 8888, false);
-		when(loadBalancerClient.choose("test")).thenReturn(serviceInstance);
-		when(loadBalancerClient.reconstructURI(serviceInstance,
-				URI.create("http://test/path"))).thenReturn(URI.create(url));
-
-		feignBlockingLoadBalancerClient.execute(request, options);
-
-		ArgumentCaptor<Request> captor = ArgumentCaptor.forClass(Request.class);
-		verify(delegate, times(1)).execute(captor.capture(), eq(options));
-		Request actualRequest = captor.getValue();
-		assertThat(actualRequest.httpMethod()).isEqualTo(Request.HttpMethod.GET);
-		assertThat(actualRequest.url()).isEqualTo(url);
-		assertThat(actualRequest.headers()).hasSize(1);
-		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
-				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		assertThat(new String(actualRequest.body())).isEqualTo("hello");
-	}
-
-	private Request testRequest() {
-		return testRequest("test");
-	}
-
-	private Request testRequest(String host) {
-		return Request.create(Request.HttpMethod.GET, "http://" + host + "/path",
-				testHeaders(), "hello".getBytes(), StandardCharsets.UTF_8, null);
-	}
-
-	private Map<String, Collection<String>> testHeaders() {
-		Map<String, Collection<String>> feignHeaders = new HashMap<>();
-		feignHeaders.put(HttpHeaders.CONTENT_TYPE,
-				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		return feignHeaders;
-
-	}
-
-}
@@ -1,89 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.util.Map;
-
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-import feign.okhttp.OkHttpClient;
-import org.junit.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
-import org.springframework.context.ConfigurableApplicationContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-public class FeignLoadBalancerAutoConfigurationTests {
-
-	@Test
-	public void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
-		ConfigurableApplicationContext context = initContext(
-				"feign.httpclient.enabled=false");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, Client.Default.class);
-	}
-
-	@Test
-	public void shouldInstantiateHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, ApacheHttpClient.class);
-	}
-
-	@Test
-	public void shouldInstantiateOkHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, OkHttpClient.class);
-	}
-
-	private ConfigurableApplicationContext initContext(String... properties) {
-		return new SpringApplicationBuilder().web(WebApplicationType.NONE)
-				.properties(properties)
-				.sources(HttpClientConfiguration.class,
-						LoadBalancerAutoConfiguration.class,
-						BlockingLoadBalancerClientAutoConfiguration.class,
-						FeignLoadBalancerAutoConfiguration.class)
-				.run();
-	}
-
-	private void assertThatOneBeanPresent(ConfigurableApplicationContext context,
-			Class<?> beanClass) {
-		Map<String, ?> beans = context.getBeansOfType(beanClass);
-		assertThat(beans).as("Missing bean of type %s", beanClass).hasSize(1);
-	}
-
-	private void assertLoadBalanced(ConfigurableApplicationContext context,
-			Class delegateClass) {
-		Map<String, FeignBlockingLoadBalancerClient> beans = context
-				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
-		assertThat(beans).as("Missing bean of type %s", delegateClass).hasSize(1);
-		assertThat(beans.get("feignClient").getDelegate()).isInstanceOf(delegateClass);
-	}
-
-}
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Spencer Gibb
+ */
+public class CachingSpringLoadBalancerFactoryTests {
+
+	@Mock
+	private SpringClientFactory delegate;
+
+	@Mock
+	private RibbonLoadBalancedRetryFactory loadBalancedRetryFactory;
+
+	private CachingSpringLoadBalancerFactory factory;
+
+	@Before
+	public void init() {
+		MockitoAnnotations.initMocks(this);
+
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+
+		when(this.delegate.getClientConfig("client1")).thenReturn(config);
+		when(this.delegate.getClientConfig("client2")).thenReturn(config);
+
+		this.factory = new CachingSpringLoadBalancerFactory(this.delegate,
+				this.loadBalancedRetryFactory);
+	}
+
+	@Test
+	public void delegateCreatesWhenMissing() {
+		FeignLoadBalancer client = this.factory.create("client1");
+		assertThat(client).as("client was null").isNotNull();
+
+		verify(this.delegate, times(1)).getClientConfig("client1");
+	}
+
+	@Test
+	public void cacheWorks() {
+		FeignLoadBalancer client = this.factory.create("client2");
+		assertThat(client).as("client was null").isNotNull();
+
+		client = this.factory.create("client2");
+		assertThat(client).as("client was null").isNotNull();
+
+		verify(this.delegate, times(1)).getClientConfig("client2");
+	}
+
+	@Test
+	public void delegateCreatesWithNoRetry() {
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+		when(this.delegate.getClientConfig("retry")).thenReturn(config);
+		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
+				this.delegate);
+		FeignLoadBalancer client = this.factory.create("retry");
+		assertThat(client).as("client was null").isNotNull();
+	}
+
+	@Test
+	public void delegateCreatesWithRetry() {
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+		when(this.delegate.getClientConfig("retry")).thenReturn(config);
+		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
+				this.delegate, this.loadBalancedRetryFactory);
+		FeignLoadBalancer client = this.factory.create("retry");
+		assertThat(client).as("client was null").isNotNull();
+	}
+
+}
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.RoundRobinRule;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
+import feign.Client;
+import feign.Request;
+import feign.Request.Options;
+import feign.RequestTemplate;
+import feign.Response;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonRequest;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonResponse;
+
+import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
+import static com.netflix.client.config.CommonClientConfigKey.IsSecure;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
+import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOperations;
+import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
+import static feign.Request.HttpMethod.GET;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+public class FeignLoadBalancerTests {
+
+	@Mock
+	private Client delegate;
+
+	@Mock
+	private ILoadBalancer lb;
+
+	@Mock
+	private IClientConfig config;
+
+	private FeignLoadBalancer feignLoadBalancer;
+
+	private ServerIntrospector inspector = new DefaultServerIntrospector();
+
+	private Integer defaultConnectTimeout = 10000;
+
+	private Integer defaultReadTimeout = 10000;
+
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		when(this.config.get(MaxAutoRetries, DEFAULT_MAX_AUTO_RETRIES)).thenReturn(1);
+		when(this.config.get(MaxAutoRetriesNextServer,
+				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(1);
+		when(this.config.get(OkToRetryOnAllOperations, eq(anyBoolean())))
+				.thenReturn(true);
+		when(this.config.get(ConnectTimeout)).thenReturn(this.defaultConnectTimeout);
+		when(this.config.get(ReadTimeout)).thenReturn(this.defaultReadTimeout);
+		when(this.config.get(OkToRetryOnAllOperations, false)).thenReturn(true);
+	}
+
+	@Test
+	public void testUriInsecure() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Request request = new RequestTemplate().method(GET).target("http://foo/")
+				.resolve(new HashMap<>()).request();
+		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
+				new URI(request.url()));
+
+		Response response = Response.builder().request(request).status(200).reason("Test")
+				.headers(Collections.emptyMap()).body(new byte[0]).build();
+		when(this.delegate.execute(any(Request.class), any(Options.class)))
+				.thenReturn(response);
+
+		RibbonResponse resp = this.feignLoadBalancer.execute(ribbonRequest, null);
+
+		assertThat(resp.getRequestedURI()).isEqualTo(new URI("http://foo"));
+	}
+
+	@Test
+	public void testSecureUriFromClientConfig() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(true);
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Server server = new Server("foo", 7777);
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("http://foo/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
+	}
+
+	@Test
+	public void testInsecureUriFromInsecureClientConfigToSecureServerIntrospector()
+			throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				new ServerIntrospector() {
+					@Override
+					public boolean isSecure(Server server) {
+						return true;
+					}
+
+					@Override
+					public Map<String, String> getMetadata(Server server) {
+						return null;
+					}
+				});
+		Server server = new Server("foo", 7777);
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("http://foo/"));
+		assertThat(uri).isEqualTo(new URI("http://foo:7777/"));
+	}
+
+	@Test
+	public void testSecureUriFromClientConfigOverride() throws Exception {
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Server server = Mockito.mock(Server.class);
+		when(server.getPort()).thenReturn(443);
+		when(server.getHost()).thenReturn("foo");
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("http://bar/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:443/"));
+	}
+
+	@Test
+	public void testRibbonRequestURLEncode() throws Exception {
+		String url = "http://foo/?name=%7bcookie"; // name={cookie
+		Request request = Request.create(GET, url, new HashMap<>(), null, null);
+
+		assertThat(request.url()).isEqualTo(url);
+
+		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
+				new URI(request.url()));
+
+		Request cloneRequest = ribbonRequest.toRequest();
+
+		assertThat(cloneRequest.url()).isEqualTo(url);
+
+	}
+
+	@Test
+	public void testOverrideFeignLoadBalancer() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+		Server server1 = new Server("foo", 6666);
+		Server server2 = new Server("foo", 7777);
+		BaseLoadBalancer baseLoadBalancer = new BaseLoadBalancer();
+		baseLoadBalancer.setRule(new RoundRobinRule() {
+			@Override
+			public Server choose(Object loadBalancerKey) {
+				return loadBalancerKey == null ? server2 : server1;
+			}
+		});
+
+		this.feignLoadBalancer = new FeignLoadBalancer(baseLoadBalancer, this.config,
+				this.inspector) {
+			protected void customizeLoadBalancerCommandBuilder(
+					final FeignLoadBalancer.RibbonRequest request,
+					final IClientConfig config,
+					final LoadBalancerCommand.Builder<FeignLoadBalancer.RibbonResponse> builder) {
+				builder.withServerLocator(request.getRequest().headers().get("c_ip"));
+			}
+		};
+		Request request = new RequestTemplate().method(GET).resolve(new HashMap<>())
+				.request();
+		RibbonResponse resp = this.feignLoadBalancer.executeWithLoadBalancer(
+				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort()).isEqualTo(7777);
+		request = new RequestTemplate().method(GET).header("c_ip", "666")
+				.resolve(new HashMap<>()).request();
+		resp = this.feignLoadBalancer.executeWithLoadBalancer(
+				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort()).isEqualTo(6666);
+	}
+
+}
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author Venil Noronha
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=feignribbonclientpathtest", "feign.okhttp.enabled=false",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
+		"test.path.prefix=/base/path" // For pathWithPlaceholder test
+})
+@DirtiesContext
+public class FeignRibbonClientPathTests {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Autowired
+	private TestClient1 testClient1;
+
+	@Autowired
+	private TestClient2 testClient2;
+
+	@Autowired
+	private TestClient3 testClient3;
+
+	@Autowired
+	private TestClient4 testClient4;
+
+	@Autowired
+	private TestClient5 testClient5;
+
+	@Test
+	public void pathWithLeadingButNotTrailingSlash() {
+		testClientPath(this.testClient1);
+	}
+
+	@Test
+	public void pathWithoutLeadingAndTrailingSlash() {
+		testClientPath(this.testClient2);
+	}
+
+	@Test
+	public void pathWithoutLeadingButTrailingSlash() {
+		testClientPath(this.testClient3);
+	}
+
+	@Test
+	public void pathWithLeadingAndTrailingSlash() {
+		testClientPath(this.testClient4);
+	}
+
+	@Test
+	public void pathWithPlaceholder() {
+		testClientPath(this.testClient5);
+	}
+
+	private void testClientPath(TestClient testClient) {
+		Hello hello = testClient.getHello();
+		assertThat(hello).as("Object returned was null").isNotNull();
+		assertThat(hello.getMessage()).as("Response object value didn't match")
+				.isEqualTo("hello world");
+	}
+
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+	}
+
+	@FeignClient(name = "localapp", path = "/base/path")
+	protected interface TestClient1 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp1", path = "base/path")
+	protected interface TestClient2 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp2", path = "base/path/")
+	protected interface TestClient3 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp3", path = "/base/path/")
+	protected interface TestClient4 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp4", path = "${test.path.prefix}")
+	protected interface TestClient5 extends TestClient {
+
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@RestController
+	@RequestMapping("/base/path")
+	@EnableFeignClients(clients = { TestClient1.class, TestClient2.class,
+			TestClient3.class, TestClient4.class, TestClient5.class })
+	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
+	@Import(NoSecurityConfiguration.class)
+	public static class Application {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		public Hello getHello() {
+			return new Hello("hello world");
+		}
+
+	}
+
+	public static class Hello {
+
+		private String message;
+
+		public Hello() {
+		}
+
+		public Hello(String message) {
+			this.message = message;
+		}
+
+		public String getMessage() {
+			return this.message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+	}
+
+	@Configuration
+	public static class LocalRibbonClientConfiguration {
+
+		@Value("${local.server.port}")
+		private int port = 0;
+
+		@Bean
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
+		}
+
+	}
+
+}
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * Tests the Feign Retryer, not ribbon retry.
+ *
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=feignclientretrytest", "feign.okhttp.enabled=false",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
+		"localapp.ribbon.MaxAutoRetries=2",
+		"localapp.ribbon.MaxAutoRetriesNextServer=3" })
+@DirtiesContext
+public class FeignRibbonClientRetryTests {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Autowired
+	private TestClient testClient;
+
+	@Test
+	public void testClient() {
+		assertThat(this.testClient).as("testClient was null").isNotNull();
+		assertThat(Proxy.isProxyClass(this.testClient.getClass()))
+				.as("testClient is not a java Proxy").isTrue();
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.testClient);
+		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
+	}
+
+	@Test
+	public void testRetries() {
+		int retryMe = this.testClient.retryMe();
+		assertThat(1).as("retryCount didn't match").isEqualTo(retryMe);
+		// TODO: not sure how to verify retry happens. Debugging through it, it works
+		// maybe the assertEquals above is enough because of the bogus servers
+	}
+
+	@FeignClient("localapp")
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
+		int retryMe();
+
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = TestClient.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
+	@Import(NoSecurityConfiguration.class)
+	public static class Application {
+
+		private AtomicInteger retries = new AtomicInteger(1);
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		public Hello getHello() {
+			return new Hello("hello world 1");
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
+		public int retryMe() {
+			return this.retries.getAndIncrement();
+		}
+
+	}
+
+	public static class Hello {
+
+		private String message;
+
+		public Hello() {
+		}
+
+		public Hello(String message) {
+			this.message = message;
+		}
+
+		public String getMessage() {
+			return this.message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+	}
+
+}
+
+// Load balancer with fixed server list for "local" pointing to localhost
+// some bogus servers are thrown in to test retry
+@Configuration
+class LocalRibbonClientConfiguration {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Bean
+	public ServerList<Server> ribbonServerList() {
+		return new StaticServerList<>(new Server("mybadhost", 80),
+				new Server("mybadhost2", 10002), new Server("mybadhost3", 10003),
+				new Server("localhost", this.port));
+	}
+
+}
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.HashMap;
+
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.AbstractLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.LoadBalancerStats;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerStats;
+import feign.Client;
+import feign.Request;
+import feign.Request.Options;
+import feign.RequestTemplate;
+import org.hamcrest.CustomMatcher;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import static feign.Request.HttpMethod.GET;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+
+/**
+ * @author Dave Syer
+ * @author Spencer Gibb
+ */
+public class FeignRibbonClientTests {
+
+	private AbstractLoadBalancer loadBalancer = mock(AbstractLoadBalancer.class);
+
+	private Client delegate = mock(Client.class);
+
+	private SpringClientFactory factory = new SpringClientFactory() {
+		@Override
+		public IClientConfig getClientConfig(String name) {
+			DefaultClientConfigImpl config = new DefaultClientConfigImpl();
+			config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+			config.set(CommonClientConfigKey.ReadTimeout, 500);
+			return config;
+		}
+
+		@Override
+		public <C> C getInstance(String name, Class<C> type) {
+			if (type.isAssignableFrom(ServerIntrospector.class)) {
+				@SuppressWarnings("unchecked")
+				C instance = (C) new DefaultServerIntrospector();
+				return instance;
+			}
+			return null;
+		}
+
+		@Override
+		public ILoadBalancer getLoadBalancer(String name) {
+			return FeignRibbonClientTests.this.loadBalancer;
+		}
+	};
+
+	// Even though we don't maintain FeignRibbonClient, keep these tests
+	// around to make sure the expected behaviour doesn't break
+	private Client client = new LoadBalancerFeignClient(this.delegate,
+			new CachingSpringLoadBalancerFactory(this.factory), this.factory);
+
+	@Before
+	public void init() {
+		when(this.loadBalancer.chooseServer(any()))
+				.thenReturn(new Server("foo.com", 8000));
+		// to fix NPE
+		LoadBalancerStats stats = mock(LoadBalancerStats.class);
+		when(this.loadBalancer.getLoadBalancerStats()).thenReturn(stats);
+		when(stats.getSingleServerStat(any(Server.class)))
+				.thenReturn(mock(ServerStats.class));
+	}
+
+	@Test
+	public void remoteRequestIsSentAtRoot() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void remoteRequestIsSent() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void verifyCleanUrl() throws Exception {
+		Request request = new RequestTemplate().method(GET)
+				.target("https://tp/abc/bcd.json").resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/abc/bcd.json");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void remoteRequestIsSecure() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	private final static class RequestMatcher extends CustomMatcher<Request> {
+
+		private String url;
+
+		private RequestMatcher(String url) {
+			super("request has URI: " + url);
+			this.url = url;
+		}
+
+		@Override
+		public boolean matches(Object item) {
+			Request request = (Request) item;
+			return request.url().equals(this.url);
+		}
+
+	}
+
+}
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.lang.reflect.Field;
+
+import javax.net.ssl.SSLContextSpi;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.config.Lookup;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.impl.conn.DefaultHttpClientConnectionOperator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
+		"debug=true", "feign.httpclient.disableSslValidation=true" })
+@DirtiesContext
+public class FeignRibbonHttpClientConfigurationTests {
+
+	@Autowired
+	HttpClientConnectionManager connectionManager;
+
+	@Test
+	public void disableSslTest() throws Exception {
+		Lookup<ConnectionSocketFactory> socketFactoryRegistry = getConnectionSocketFactoryLookup(
+				this.connectionManager);
+		assertThat(socketFactoryRegistry.lookup("https")).isNotNull();
+		assertThat(this.getX509TrustManager(socketFactoryRegistry).getAcceptedIssuers())
+				.isNull();
+	}
+
+	private Lookup<ConnectionSocketFactory> getConnectionSocketFactoryLookup(
+			HttpClientConnectionManager connectionManager) {
+		DefaultHttpClientConnectionOperator connectionOperator = (DefaultHttpClientConnectionOperator) this
+				.getField(connectionManager, "connectionOperator");
+		return (Lookup) this.getField(connectionOperator, "socketFactoryRegistry");
+	}
+
+	private X509TrustManager getX509TrustManager(
+			Lookup<ConnectionSocketFactory> socketFactoryRegistry) {
+		ConnectionSocketFactory connectionSocketFactory = (ConnectionSocketFactory) socketFactoryRegistry
+				.lookup("https");
+		SSLSocketFactory sslSocketFactory = (SSLSocketFactory) this
+				.getField(connectionSocketFactory, "socketfactory");
+		SSLContextSpi sslContext = (SSLContextSpi) this.getField(sslSocketFactory,
+				"context");
+		return (X509TrustManager) this.getField(sslContext, "trustManager");
+	}
+
+	protected <T> Object getField(Object target, String name) {
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
+		return value;
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	static class FeignRibbonHttpClientConfigurationTestsApplication {
+
+		public static void main(String[] args) {
+			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
+					.run(args);
+		}
+
+	}
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
buildmaster	6f4179ed91	Bumping versions to 2.1.6.BUILD-SNAPSHOT after release	2020-01-31 21:53:12 +00:00
buildmaster	553c563836	Going back to snapshots	2020-01-31 21:53:12 +00:00
buildmaster	01f4808035	Update SNAPSHOT to 2.1.5.RELEASE	2020-01-31 21:52:25 +00:00