Update SNAPSHOT to 2.2.3.RELEASE

Update README.
Add info on reactive-feign to docs. Fixes gh-313.
2020-05-28 17:52:11 +00:00 · 2020-05-27 20:14:00 +02:00 · 2020-05-27 20:13:33 +02:00 · 2020-05-14 12:14:42 +02:00 · 2020-05-14 12:14:31 +02:00 · 2020-05-13 15:27:12 -04:00
175 changed files with 12597 additions and 4622 deletions
@@ -9,7 +9,6 @@ jobs:
    branches:
      ignore:
        - gh-pages # list of branches to ignore
-    resource_class: large
    steps:
      - checkout
      - restore_cache:
@@ -36,4 +35,4 @@ jobs:
          destination: artifacts
      - store_test_results:
          path: /junit/
-          destination: testartifacts
+          destination: testartifacts
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
@@ -0,0 +1,17 @@
+---
+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.
@@ -0,0 +1,20 @@
+---
+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,3 +18,6 @@ _site/
 .shelf
 *.swp
 *.swo
+.vscode/
+.flattened-pom.xml
+
@@ -1,66 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <servers>
-	<server>
-	  <id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
-  </servers>
-  <profiles>
-	<profile>
-      <!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
-	  <id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
-	  <repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>https://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	  </repositories>
-	  <pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	  </pluginRepositories>
-    </profile>
-  </profiles>
+	<servers>
+		<server>
+			<id>repo.spring.io</id>
+			<username>${env.CI_DEPLOY_USERNAME}</username>
+			<password>${env.CI_DEPLOY_PASSWORD}</password>
+		</server>
+	</servers>
+	<profiles>
+		<profile>
+			<!--
+				N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
+				It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
+				a native Maven with the right version. Eclipse users should points their Maven tooling to
+				this settings file, or copy the profile into their ~/.m2/settings.xml.
+			-->
+			<id>spring</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
 </settings>
@@ -1,4 +1,8 @@
-// Do not edit this file (e.g. go instead to src/main/asciidoc)
+////
+DO NOT EDIT THIS FILE. IT WAS GENERATED.
+Manual changes to this file will be lost when it is generated again.
+Edit the files in the src/main/asciidoc/ directory instead.
+////

 image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]

@@ -6,6 +10,23 @@ 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.

@@ -51,7 +72,7 @@ credentials and you already have those.

 The projects that require middleware generally include a
 `docker-compose.yml`, so consider using
-https://compose.docker.io/[Docker Compose] to run the middeware servers
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
 in Docker containers. See the README in the
 https://github.com/spring-cloud-samples/scripts[scripts demo
 repository] for specific instructions about the common cases of mongo,
@@ -78,6 +99,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.

+==== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
 ==== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
@@ -241,6 +267,7 @@ $ touch .springformat
 ==== Intellij IDEA

 In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.

 .spring-cloud-build-tools/
 ----
@@ -281,7 +308,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring

 Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:

- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 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>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.0.5.BUILD-SNAPSHOT</version>
+		<version>2.2.3.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -14,8 +15,15 @@
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.0.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
+		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -31,28 +39,29 @@
 			<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.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<inherited>false</inherited>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-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,6 +4,8 @@ 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
@@ -0,0 +1,16 @@
+: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}
@@ -0,0 +1,24 @@
+|===
+|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.
+
+|===
@@ -0,0 +1,14 @@
+:numbered!:
+[appendix]
+[[common-application-properties]]
+== Common application properties
+
+include::_attributes.adoc[]
+
+Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
+This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
+
+NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
+Also, you can define your own properties.
+
+include::_configprops.adoc[]
@@ -0,0 +1,26 @@
+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,11 +1,5 @@
-: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}*

@@ -15,7 +9,13 @@ include::intro.adoc[]
 [[spring-cloud-feign]]
 == Declarative REST Client: 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.
+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 Ribbon and Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -47,32 +47,38 @@ public interface StoreClient {
    @RequestMapping(method = RequestMethod.GET, value = "/stores")
    List<Store> getStores();

+    @RequestMapping(method = RequestMethod.GET, value = "/stores")
+    Page<Store> getStores(Pageable pageable);
+
    @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
    Store update(@PathVariable("storeId") Long storeId, Store store);
 }
 ----

-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
+In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create either a https://github.com/Netflix/ribbon[Ribbon] load-balancer (see <<spring-cloud-ribbon,below for details of Ribbon support>>) or https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java[Spring Cloud LoadBalancer].
+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 Ribbon client above will want to discover the physical addresses
+The load-balancer 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 (see
-<<spring-cloud-ribbon-without-eureka,above for example>>).
+in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
+
+WARNING: In order to maintain backward compatibility, is used as the default load-balancer implementation.
+However, Spring Cloud Netflix Ribbon is now in maintenance mode, so we recommend using Spring Cloud LoadBalancer instead.
+To do this, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false`.

 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults

 A central concept in Spring Cloud's Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
 `ApplicationContext` on demand for each named client using `FeignClientsConfiguration`. This contains (amongst other things) an `feign.Decoder`, a `feign.Encoder`, and a `feign.Contract`.
+It is possible to override the name of that ensemble by using the `contextId`
+attribute of the `@FeignClient` annotation.

 Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:

@@ -90,6 +96,10 @@ NOTE: `FooConfiguration` does not need to be annotated with `@Configuration`. Ho

 NOTE: The `serviceId` attribute is now deprecated in favor of the `name` attribute.

+NOTE: Using `contextId` attribute of the `@FeignClient` annotation in addition to changing the name of
+the `ApplicationContext` ensemble, it will override the alias of the client name
+and it will be used as part of the name of the configuration bean created for that client.
+
 WARNING: Previously, using the `url` attribute, did not require the `name` attribute. Using `name` is now required.

 Placeholders are supported in the `name` and `url` attributes.
@@ -109,12 +119,15 @@ Spring Cloud Netflix provides the following beans by default for feign (`BeanTyp
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used.
+* `Client` feignClient: if Ribbon is in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise 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.
+
+NOTE: `spring-cloud-starter-openfeign` contains both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`.

 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 `ClosableHttpClient` when using Apache or `OkHttpClient` when using OK HTTP.
+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.

-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:
+Spring Cloud OpenFeign _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:

 * `Logger.Level`
 * `Retryer`
@@ -122,6 +135,7 @@ 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:

@@ -206,6 +220,50 @@ hystrix:
          strategy: SEMAPHORE
 ----

+If we want to create multiple feign clients with the same name or url
+so that they would point to the same server but each with a different custom configuration then
+we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
+collision of these configuration beans.
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
+public interface FooClient {
+    //..
+}
+----
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
+public interface BarClient {
+    //..
+}
+----
+
+It is also possible to configure FeignClient not to inherit beans from the parent context.
+You can do this by overriding the `inheritParentConfiguration()` in a  `FeignClientConfigurer`
+bean to return `false`:
+
+[source,java,indent=0]
+----
+@Configuration
+public class CustomConfiguration{
+
+@Bean
+public FeignClientConfigurer feignClientConfigurer() {
+			return new FeignClientConfigurer() {
+
+				@Override
+				public boolean inheritParentConfiguration() {
+					return false;
+				}
+			};
+
+		}
+}
+----
+
 === Creating Feign Clients Manually

 In some cases it might be necessary to customize your Feign Clients in a way that is not
@@ -230,14 +288,14 @@ class FooController {
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");

 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");
    }
 }
 ----
@@ -251,6 +309,9 @@ NOTE: The Feign `Contract` object defines what annotations and values are valid
 autowired `Contract` bean provides supports for SpringMVC annotations, instead of
 the default Feign native annotations.

+You can also use the `Builder`to configure FeignClient not to inherit beans from the parent context.
+You can do this by overriding calling `inheritParentContext(false)` on the `Builder`.
+
 [[spring-cloud-feign-hystrix]]
 === Feign Hystrix Support

@@ -396,6 +457,14 @@ 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.
@@ -425,4 +494,110 @@ public class FooConfiguration {
        return Logger.Level.FULL;
    }
 }
----
+----
+
+=== Feign @QueryMap support
+
+The OpenFeign `@QueryMap` annotation provides support for POJOs to be used as
+GET parameter maps. Unfortunately, the default OpenFeign QueryMap annotation is
+incompatible with Spring because it lacks a `value` property.
+
+Spring Cloud OpenFeign provides an equivalent `@SpringQueryMap` annotation, which
+is used to annotate a POJO or Map parameter as a query parameter map.
+
+For example, the `Params` class defines parameters `param1` and `param2`:
+
+[source,java,indent=0]
+----
+// Params.java
+public class Params {
+    private String param1;
+    private String param2;
+
+    // [Getters and setters omitted for brevity]
+}
+----
+
+The following feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
+
+[source,java,indent=0]
+----
+@FeignClient("demo")
+public interface 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();
+}
+----
+
+=== Reactive Support
+As the https://github.com/OpenFeign/feign[OpenFeign project] does not currently support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], neither does Spring Cloud OpenFeign. We will add support for it here as soon as it becomes available in the core project.
+
+Until that is done, we recommend using https://github.com/Playtika/feign-reactive[feign-reactive] for Spring WebClient support.
+
+==== Early Initialization Errors
+
+Depending on how you are using your Feign clients you may see initialization errors when starting your application.
+To work around this problem you can use an `ObjectProvider` when autowiring your client.
+
+[source,java,indent=0]
+----
+@Autowired
+ObjectProvider<TestFeginClient> testFeginClient;
+----
+
+== Configuration properties
+
+To see the list of all Sleuth related configuration properties please check link:appendix.html[the Appendix page].
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 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>2.0.5.BUILD-SNAPSHOT</version>
+	<version>2.2.3.RELEASE</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>2.0.5.BUILD-SNAPSHOT</version>
-		<relativePath />
+		<version>2.3.0.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git</developerConnection>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git
+		</connection>
+		<developerConnection>
+			scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git
+		</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.0.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.0.3.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.2.3.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.3.RELEASE</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -32,11 +36,16 @@
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec
+		</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
 	</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>
@@ -46,11 +55,13 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs
+							</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs
+							</location>
 						</file>
 					</additionalConfig>
 				</configuration>
@@ -63,8 +74,26 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>io.spring.javaformat</groupId>
+				<artifactId>spring-javaformat-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -106,7 +135,7 @@
 		<module>spring-cloud-openfeign-core</module>
 		<module>spring-cloud-starter-openfeign</module>
 		<module>docs</module>
-    </modules>
+	</modules>
 	<profiles>
 		<profile>
 			<id>spring</id>
@@ -184,7 +213,8 @@
 								</goals>
 								<configuration>
 									<propertyName>surefireArgLine</propertyName>
-									<destFile>${project.build.directory}/jacoco.exec</destFile>
+									<destFile>${project.build.directory}/jacoco.exec
+									</destFile>
 								</configuration>
 							</execution>
 							<execution>
@@ -195,7 +225,8 @@
 								</goals>
 								<configuration>
 									<!-- Sets the path to the file which contains the execution data. -->
-									<dataFile>${project.build.directory}/jacoco.exec</dataFile>
+									<dataFile>${project.build.directory}/jacoco.exec
+									</dataFile>
 								</configuration>
 							</execution>
 						</executions>
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 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>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.0.5.BUILD-SNAPSHOT</version>
+		<version>2.2.3.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -49,6 +50,11 @@
 			<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>
@@ -117,11 +123,6 @@
 			<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>
@@ -157,11 +158,6 @@
 			<artifactId>rxjava</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
@@ -187,6 +183,11 @@
 			<artifactId>spring-cloud-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-test</artifactId>
@@ -202,6 +203,11 @@
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.googlecode.protobuf-java-format</groupId>
 			<artifactId>protobuf-java-format</artifactId>
@@ -214,22 +220,39 @@
 			<version>3.4.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.vavr</groupId>
+			<artifactId>vavr</artifactId>
+			<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>
 			<id>java8plus</id>
-				<activation>
-					<jdk>[1.8,2.0)</jdk>
-				</activation>
-				<build>
-					<plugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-compiler-plugin</artifactId>
-							<configuration>
-								<compilerArgs>
-									<arg>-parameters</arg>
-								</compilerArgs>
+			<activation>
+				<jdk>[1.8,2.0)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<compilerArgs>
+								<arg>-parameters</arg>
+							</compilerArgs>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -32,20 +32,19 @@ public interface AnnotatedParameterProcessor {

 	/**
 	 * Retrieves the processor supported annotation type.
-	 *
 	 * @return the annotation type
 	 */
 	Class<? extends Annotation> getAnnotationType();

 	/**
 	 * Process the annotated parameter.
-	 *
-	 * @param context	the parameter context
+	 * @param context the parameter context
 	 * @param annotation the annotation instance
-	 * @param method	 the method that contains the annotation
+	 * @param method the method that contains the annotation
 	 * @return whether the parameter is http
 	 */
-	boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method);
+	boolean processArgument(AnnotatedParameterContext context, Annotation annotation,
+			Method method);

 	/**
 	 * Specifies the parameter context.
@@ -56,32 +55,30 @@ public interface AnnotatedParameterProcessor {

 		/**
 		 * Retrieves the method metadata.
-		 *
 		 * @return the method metadata
 		 */
 		MethodMetadata getMethodMetadata();

 		/**
 		 * Retrieves the index of the parameter.
-		 *
 		 * @return the parameter index
 		 */
 		int getParameterIndex();

 		/**
 		 * Sets the parameter name.
-		 *
 		 * @param name the name of the parameter
 		 */
 		void setParameterName(String name);

 		/**
 		 * Sets the template parameter.
-		 *
 		 * @param name the template parameter
 		 * @param rest the existing parameter values
 		 * @return parameters
 		 */
 		Collection<String> setTemplateParameter(String name, Collection<String> rest);
+
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -12,7 +12,6 @@
 * 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;
@@ -26,8 +25,9 @@ import feign.Target;
 class DefaultTargeter implements Targeter {

 	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-						Target.HardCodedTarget<T> target) {
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target) {
 		return feign.target(target);
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -25,10 +25,11 @@ import java.lang.annotation.Target;
 import org.springframework.context.annotation.Import;

 /**
- * Scans for interfaces that declare they are feign clients (via {@link FeignClient
- * <code>@FeignClient</code>}). Configures component scanning directives for use with
- * {@link org.springframework.context.annotation.Configuration
- * <code>@Configuration</code>} classes.
+ * Scans for interfaces that declare they are feign clients (via
+ * {@link org.springframework.cloud.openfeign.FeignClient} <code>@FeignClient</code>).
+ * Configures component scanning directives for use with
+ * {@link org.springframework.context.annotation.Configuration}
+ * <code>@Configuration</code> classes.
 *
 * @author Spencer Gibb
 * @author Dave Syer
@@ -55,7 +56,6 @@ public @interface EnableFeignClients {
 	 * <p>
 	 * Use {@link #basePackageClasses()} for a type-safe alternative to String-based
 	 * package names.
-	 *
 	 * @return the array of 'basePackages'.
 	 */
 	String[] basePackages() default {};
@@ -66,7 +66,6 @@ public @interface EnableFeignClients {
 	 * <p>
 	 * Consider creating a special no-op marker class or interface in each package that
 	 * serves no purpose other than being referenced by this attribute.
-	 *
 	 * @return the array of 'basePackageClasses'.
 	 */
 	Class<?>[] basePackageClasses() default {};
@@ -77,12 +76,15 @@ public @interface EnableFeignClients {
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
 	 *
 	 * @see FeignClientsConfiguration for the defaults
+	 * @return list of default configurations
 	 */
 	Class<?>[] defaultConfiguration() default {};

 	/**
-	 * List of classes annotated with @FeignClient. If not empty, disables classpath scanning.
-	 * @return
+	 * List of classes annotated with @FeignClient. If not empty, disables classpath
+	 * scanning.
+	 * @return list of FeignClient classes
 	 */
 	Class<?>[] clients() default {};
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -22,11 +22,19 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;

+import javax.annotation.PreDestroy;
+
+import feign.Client;
+import feign.Feign;
+import feign.httpclient.ApacheHttpClient;
+import feign.okhttp.OkHttpClient;
+import okhttp3.ConnectionPool;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -38,25 +46,21 @@ 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 feign.Client;
-import feign.Feign;
-import feign.httpclient.ApacheHttpClient;
-import feign.okhttp.OkHttpClient;
-import okhttp3.ConnectionPool;
-
-import javax.annotation.PreDestroy;
+import org.springframework.context.annotation.Import;

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

 	@Autowired(required = false)
@@ -74,36 +78,41 @@ public class FeignAutoConfiguration {
 		return context;
 	}

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

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

 	// the following configuration is for alternate feign clients if
 	// ribbon is not on the class path.
 	// see corresponding configurations in FeignRibbonClientAutoConfiguration
 	// for load balanced ribbon clients.
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 	protected static class HttpClientFeignConfiguration {
+
 		private final Timer connectionManagerTimer = new Timer(
 				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);

@@ -118,10 +127,12 @@ public class FeignAutoConfiguration {
 				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 				FeignHttpClientProperties httpClientProperties) {
 			final HttpClientConnectionManager connectionManager = connectionManagerFactory
-					.newConnectionManager(httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
+					.newConnectionManager(httpClientProperties.isDisableSslValidation(),
+							httpClientProperties.getMaxConnections(),
 							httpClientProperties.getMaxConnectionsPerRoute(),
 							httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLiveUnit(), registryBuilder);
+							httpClientProperties.getTimeToLiveUnit(),
+							this.registryBuilder);
 			this.connectionManagerTimer.schedule(new TimerTask() {
 				@Override
 				public void run() {
@@ -139,9 +150,9 @@ public class FeignAutoConfiguration {
 					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
 					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
 					.build();
-			this.httpClient = httpClientFactory.createBuilder().
-					setConnectionManager(httpClientConnectionManager).
-					setDefaultRequestConfig(defaultRequestConfig).build();
+			this.httpClient = httpClientFactory.createBuilder()
+					.setConnectionManager(httpClientConnectionManager)
+					.setDefaultRequestConfig(defaultRequestConfig).build();
 			return this.httpClient;
 		}

@@ -153,26 +164,28 @@ public class FeignAutoConfiguration {

 		@PreDestroy
 		public void destroy() throws Exception {
-			connectionManagerTimer.cancel();
-			if(httpClient != null) {
-				httpClient.close();
+			this.connectionManagerTimer.cancel();
+			if (this.httpClient != null) {
+				this.httpClient.close();
 			}
 		}
+
 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	@ConditionalOnProperty(value = "feign.okhttp.enabled")
+	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {

 		private okhttp3.OkHttpClient okHttpClient;

 		@Bean
 		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
-													   OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+		public ConnectionPool httpClientConnectionPool(
+				FeignHttpClientProperties httpClientProperties,
+				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
 			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
 			Long timeToLive = httpClientProperties.getTimeToLive();
 			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
@@ -181,22 +194,23 @@ public class FeignAutoConfiguration {

 		@Bean
 		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
-										   ConnectionPool connectionPool, FeignHttpClientProperties httpClientProperties) {
+				ConnectionPool connectionPool,
+				FeignHttpClientProperties httpClientProperties) {
 			Boolean followRedirects = httpClientProperties.isFollowRedirects();
 			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
 			Boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation).
-					connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).
-					followRedirects(followRedirects).
-					connectionPool(connectionPool).build();
+			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
+					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+					.followRedirects(followRedirects).connectionPool(connectionPool)
+					.build();
 			return this.okHttpClient;
 		}

 		@PreDestroy
 		public void destroy() {
-			if(okHttpClient != null) {
-				okHttpClient.dispatcher().executorService().shutdown();
-				okHttpClient.connectionPool().evictAll();
+			if (this.okHttpClient != null) {
+				this.okHttpClient.dispatcher().executorService().shutdown();
+				this.okHttpClient.connectionPool().evictAll();
 			}
 		}

@@ -205,6 +219,7 @@ public class FeignAutoConfiguration {
 		public Client feignClient(okhttp3.OkHttpClient client) {
 			return new OkHttpClient(client);
 		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -42,72 +42,83 @@ public @interface FeignClient {
 	 * The name of the service with optional protocol prefix. Synonym for {@link #name()
 	 * name}. A name must be specified for all clients, whether or not a url is provided.
 	 * Can be specified as property key, eg: ${propertyKey}.
+	 * @return the name of the service with optional protocol prefix
 	 */
 	@AliasFor("name")
 	String value() default "";

 	/**
 	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
-	 *
 	 * @deprecated use {@link #name() name} instead
+	 * @return the service id with optional protocol prefix
 	 */
 	@Deprecated
 	String serviceId() default "";

 	/**
-	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
+	 * This will be used as the bean name instead of name if present, but will not be used
+	 * as a service id.
+	 * @return bean name instead of name if present
+	 */
+	String contextId() default "";
+
+	/**
+	 * @return The service id with optional protocol prefix. Synonym for {@link #value()
+	 * value}.
 	 */
 	@AliasFor("value")
 	String name() default "";
-	
+
 	/**
-	 * Sets the <code>@Qualifier</code> value for the feign client.
+	 * @return the <code>@Qualifier</code> value for the feign client.
 	 */
 	String qualifier() default "";

 	/**
-	 * An absolute URL or resolvable hostname (the protocol is optional).
+	 * @return an absolute URL or resolvable hostname (the protocol is optional).
 	 */
 	String url() default "";

 	/**
-	 * Whether 404s should be decoded instead of throwing FeignExceptions
+	 * @return whether 404s should be decoded instead of throwing FeignExceptions
 	 */
 	boolean decode404() default false;

 	/**
-	 * A custom <code>@Configuration</code> for the feign client. Can contain override
+	 * A custom configuration class 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}.
 	 *
 	 * @see FeignClientsConfiguration for the defaults
+	 * @return list of configurations for feign client
 	 */
 	Class<?>[] configuration() default {};

 	/**
 	 * Fallback class for the specified Feign client interface. The fallback class must
 	 * implement the interface annotated by this annotation and be a valid spring bean.
+	 * @return fallback class for the specified Feign client interface
 	 */
 	Class<?> fallback() default void.class;

 	/**
 	 * Define a fallback factory for the specified Feign client interface. The fallback
 	 * factory must produce instances of fallback classes that implement the interface
-	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring
-	 * bean.
+	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring bean.
 	 *
 	 * @see feign.hystrix.FallbackFactory for details.
+	 * @return fallback factory for the specified Feign client interface
 	 */
 	Class<?> fallbackFactory() default void.class;

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

 	/**
-	 * Whether to mark the feign proxy as a primary bean. Defaults to true.
+	 * @return whether to mark the feign proxy as a primary bean. Defaults to true.
 	 */
 	boolean primary() default true;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -16,6 +16,8 @@

 package org.springframework.cloud.openfeign;

+import feign.hystrix.FallbackFactory;
+
 import org.springframework.context.ApplicationContext;

 /**
@@ -25,6 +27,7 @@ import org.springframework.context.ApplicationContext;
 * {@link FeignClient} annotation.
 *
 * @author Sven Döring
+ * @author Matt King
 */
 public class FeignClientBuilder {

@@ -35,10 +38,15 @@ public class FeignClientBuilder {
 	}

 	public <T> Builder<T> forType(final Class<T> type, final String name) {
-		return new Builder<>(applicationContext, type, name);
+		return new Builder<>(this.applicationContext, type, name);
 	}

-	public static class Builder<T> {
+	/**
+	 * Builder of feign targets.
+	 *
+	 * @param <T> type of target
+	 */
+	public static final class Builder<T> {

 		private FeignClientFactoryBean feignClientFactoryBean;

@@ -49,45 +57,58 @@ public class FeignClientBuilder {
 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
 			this.feignClientFactoryBean.setName(FeignClientsRegistrar.getName(name));
+			this.feignClientFactoryBean.setContextId(FeignClientsRegistrar.getName(name));
+			this.feignClientFactoryBean.setInheritParentContext(true);
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
-			this.url("").path("").decode404(false).fallback(void.class)
-					.fallbackFactory(void.class);
+			this.url("").path("").decode404(false);
 		}

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

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

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

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

-		public Builder fallbackFactory(final Class<T> fallbackFactory) {
+		public Builder<T> fallbackFactory(
+				final Class<? extends FallbackFactory<? extends 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> T build() {
+		public T build() {
 			return this.feignClientFactoryBean.getTarget();
 		}
+
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -19,21 +19,12 @@ package org.springframework.cloud.openfeign;
 import java.util.Map;
 import java.util.Objects;

-import org.springframework.beans.BeanUtils;
-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.ribbon.LoadBalancerFeignClient;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
 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;
@@ -42,16 +33,32 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;

+import org.springframework.beans.BeanUtils;
+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.clientconfig.FeignClientConfigurer;
+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;
+import org.springframework.util.StringUtils;
+
 /**
 * @author Spencer Gibb
 * @author Venil Noronha
 * @author Eko Kurniawan Khannedy
 * @author Gregor Zurowski
+ * @author Matt King
 */
-class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
-		ApplicationContextAware {
+class FeignClientFactoryBean
+		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware {
+
 	/***********************************
-	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some lifecycle race condition.
+	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
+	 * lifecycle race condition.
 	 ***********************************/

 	private Class<?> type;
@@ -60,10 +67,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	private String url;

+	private String contextId;
+
 	private String path;

 	private boolean decode404;

+	private boolean inheritParentContext = true;
+
 	private ApplicationContext applicationContext;

 	private Class<?> fallback = void.class;
@@ -72,14 +83,10 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	@Override
 	public void afterPropertiesSet() throws Exception {
+		Assert.hasText(this.contextId, "Context id must be set");
 		Assert.hasText(this.name, "Name must be set");
 	}

-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.applicationContext = context;
-	}
-
 	protected Feign.Builder feign(FeignContext context) {
 		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
 		Logger logger = loggerFactory.create(this.type);
@@ -99,51 +106,87 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	protected void configureFeign(FeignContext context, Feign.Builder builder) {
-		FeignClientProperties properties = applicationContext.getBean(FeignClientProperties.class);
-		if (properties != null) {
+		FeignClientProperties properties = this.applicationContext
+				.getBean(FeignClientProperties.class);
+
+		FeignClientConfigurer feignClientConfigurer = getOptional(context,
+				FeignClientConfigurer.class);
+		setInheritParentContext(feignClientConfigurer.inheritParentConfiguration());
+
+		if (properties != null && inheritParentContext) {
 			if (properties.isDefaultToProperties()) {
 				configureUsingConfiguration(context, builder);
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
-			} else {
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
+				configureUsingProperties(
+						properties.getConfig().get(properties.getDefaultConfig()),
+						builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId),
+						builder);
+			}
+			else {
+				configureUsingProperties(
+						properties.getConfig().get(properties.getDefaultConfig()),
+						builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId),
+						builder);
 				configureUsingConfiguration(context, builder);
 			}
-		} else {
+		}
+		else {
 			configureUsingConfiguration(context, builder);
 		}
 	}

-	protected void configureUsingConfiguration(FeignContext context, Feign.Builder builder) {
-		Logger.Level level = getOptional(context, Logger.Level.class);
+	protected void configureUsingConfiguration(FeignContext context,
+			Feign.Builder builder) {
+		Logger.Level level = getInheritedAwareOptional(context, Logger.Level.class);
 		if (level != null) {
 			builder.logLevel(level);
 		}
-		Retryer retryer = getOptional(context, Retryer.class);
+		Retryer retryer = getInheritedAwareOptional(context, Retryer.class);
 		if (retryer != null) {
 			builder.retryer(retryer);
 		}
-		ErrorDecoder errorDecoder = getOptional(context, ErrorDecoder.class);
+		ErrorDecoder errorDecoder = getInheritedAwareOptional(context,
+				ErrorDecoder.class);
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
-		Request.Options options = getOptional(context, Request.Options.class);
+		else {
+			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
+					FeignErrorDecoderFactory.class);
+			if (errorDecoderFactory != null) {
+				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(this.type);
+				builder.errorDecoder(factoryErrorDecoder);
+			}
+		}
+		Request.Options options = getInheritedAwareOptional(context,
+				Request.Options.class);
 		if (options != null) {
 			builder.options(options);
 		}
-		Map<String, RequestInterceptor> requestInterceptors = context.getInstances(
-				this.name, RequestInterceptor.class);
+		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(
+				context, RequestInterceptor.class);
 		if (requestInterceptors != null) {
 			builder.requestInterceptors(requestInterceptors.values());
 		}
-
-		if (decode404) {
+		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context,
+				QueryMapEncoder.class);
+		if (queryMapEncoder != null) {
+			builder.queryMapEncoder(queryMapEncoder);
+		}
+		if (this.decode404) {
 			builder.decode404();
 		}
+		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(
+				context, ExceptionPropagationPolicy.class);
+		if (exceptionPropagationPolicy != null) {
+			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
+		}
 	}

-	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) {
+	protected void configureUsingProperties(
+			FeignClientProperties.FeignClientConfiguration config,
+			Feign.Builder builder) {
 		if (config == null) {
 			return;
 		}
@@ -153,7 +196,8 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		}

 		if (config.getConnectTimeout() != null && config.getReadTimeout() != null) {
-			builder.options(new Request.Options(config.getConnectTimeout(), config.getReadTimeout()));
+			builder.options(new Request.Options(config.getConnectTimeout(),
+					config.getReadTimeout()));
 		}

 		if (config.getRetryer() != null) {
@@ -166,7 +210,8 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			builder.errorDecoder(errorDecoder);
 		}

-		if (config.getRequestInterceptors() != null && !config.getRequestInterceptors().isEmpty()) {
+		if (config.getRequestInterceptors() != null
+				&& !config.getRequestInterceptors().isEmpty()) {
 			// this will add request interceptor to builder, not replace existing
 			for (Class<RequestInterceptor> bean : config.getRequestInterceptors()) {
 				RequestInterceptor interceptor = getOrInstantiate(bean);
@@ -191,27 +236,51 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		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) {
 		try {
-			return applicationContext.getBean(tClass);
-		} catch (NoSuchBeanDefinitionException e) {
+			return this.applicationContext.getBean(tClass);
+		}
+		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
 		}
 	}

 	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(this.name, type);
+		T instance = context.getInstance(this.contextId, type);
 		if (instance == null) {
-			throw new IllegalStateException("No bean found of type " + type + " for "
-					+ this.name);
+			throw new IllegalStateException(
+					"No bean found of type " + type + " for " + this.contextId);
 		}
 		return instance;
 	}

 	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(this.name, type);
+		return context.getInstance(this.contextId, type);
+	}
+
+	protected <T> T getInheritedAwareOptional(FeignContext context, Class<T> type) {
+		if (inheritParentContext) {
+			return getOptional(context, type);
+		}
+		else {
+			return context.getInstanceWithoutAncestors(this.contextId, type);
+		}
+	}
+
+	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context,
+			Class<T> type) {
+		if (inheritParentContext) {
+			return context.getInstances(this.contextId, type);
+		}
+		else {
+			return context.getInstancesWithoutAncestors(this.contextId, type);
+		}
 	}

 	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
@@ -234,23 +303,23 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	/**
 	 * @param <T> the target type of the Feign client
-	 * @return a {@link Feign} client created with the specified data and the context information
+	 * @return a {@link Feign} client created with the specified data and the context
+	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = applicationContext.getBean(FeignContext.class);
+		FeignContext context = this.applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);

 		if (!StringUtils.hasText(this.url)) {
-			String url;
 			if (!this.name.startsWith("http")) {
-				url = "http://" + this.name;
+				this.url = "http://" + this.name;
 			}
 			else {
-				url = this.name;
+				this.url = this.name;
 			}
-			url += cleanPath();
-			return (T) loadBalance(builder, context, new HardCodedTarget<>(this.type,
-					this.name, url));
+			this.url += cleanPath();
+			return (T) loadBalance(builder, context,
+					new HardCodedTarget<>(this.type, this.name, this.url));
 		}
 		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
 			this.url = "http://" + this.url;
@@ -261,13 +330,18 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			if (client instanceof LoadBalancerFeignClient) {
 				// not load balancing because we have a url,
 				// but ribbon is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient)client).getDelegate();
+				client = ((LoadBalancerFeignClient) client).getDelegate();
+			}
+			if (client instanceof FeignBlockingLoadBalancerClient) {
+				// not load balancing because we have a url,
+				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
+				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
 			}
 			builder.client(client);
 		}
 		Targeter targeter = get(context, Targeter.class);
-		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(
-				this.type, this.name, url));
+		return (T) targeter.target(this, builder, context,
+				new HardCodedTarget<>(this.type, this.name, url));
 	}

 	private String cleanPath() {
@@ -294,7 +368,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	public Class<?> getType() {
-		return type;
+		return this.type;
 	}

 	public void setType(Class<?> type) {
@@ -302,15 +376,23 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	public String getName() {
-		return name;
+		return this.name;
 	}

 	public void setName(String name) {
 		this.name = name;
 	}

+	public String getContextId() {
+		return this.contextId;
+	}
+
+	public void setContextId(String contextId) {
+		this.contextId = contextId;
+	}
+
 	public String getUrl() {
-		return url;
+		return this.url;
 	}

 	public void setUrl(String url) {
@@ -318,7 +400,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	public String getPath() {
-		return path;
+		return this.path;
 	}

 	public void setPath(String path) {
@@ -326,19 +408,32 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	public boolean isDecode404() {
-		return decode404;
+		return this.decode404;
 	}

 	public void setDecode404(boolean decode404) {
 		this.decode404 = decode404;
 	}

+	public boolean isInheritParentContext() {
+		return inheritParentContext;
+	}
+
+	public void setInheritParentContext(boolean inheritParentContext) {
+		this.inheritParentContext = inheritParentContext;
+	}
+
 	public ApplicationContext getApplicationContext() {
-		return applicationContext;
+		return this.applicationContext;
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.applicationContext = context;
 	}

 	public Class<?> getFallback() {
-		return fallback;
+		return this.fallback;
 	}

 	public void setFallback(Class<?> fallback) {
@@ -346,7 +441,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	public Class<?> getFallbackFactory() {
-		return fallbackFactory;
+		return this.fallbackFactory;
 	}

 	public void setFallbackFactory(Class<?> fallbackFactory) {
@@ -355,37 +450,43 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(applicationContext, that.applicationContext) &&
-				decode404 == that.decode404 &&
-				Objects.equals(fallback, that.fallback) &&
-				Objects.equals(fallbackFactory, that.fallbackFactory) &&
-				Objects.equals(name, that.name) &&
-				Objects.equals(path, that.path) &&
-				Objects.equals(type, that.type) &&
-				Objects.equals(url, that.url);
+		return Objects.equals(this.applicationContext, that.applicationContext)
+				&& this.decode404 == that.decode404
+				&& this.inheritParentContext == that.inheritParentContext
+				&& Objects.equals(this.fallback, that.fallback)
+				&& Objects.equals(this.fallbackFactory, that.fallbackFactory)
+				&& Objects.equals(this.name, that.name)
+				&& Objects.equals(this.path, that.path)
+				&& Objects.equals(this.type, that.type)
+				&& Objects.equals(this.url, that.url);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(applicationContext, decode404, fallback, fallbackFactory,
-				name, path, type, url);
+		return Objects.hash(this.applicationContext, this.decode404,
+				this.inheritParentContext, this.fallback, this.fallbackFactory, this.name,
+				this.path, this.type, this.url);
 	}

 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{")
-				.append("type=").append(type).append(", ")
-				.append("name='").append(name).append("', ")
-				.append("url='").append(url).append("', ")
-				.append("path='").append(path).append("', ")
-				.append("decode404=").append(decode404).append(", ")
-				.append("applicationContext=").append(applicationContext).append(", ")
-				.append("fallback=").append(fallback).append(", ")
-				.append("fallbackFactory=").append(fallbackFactory)
-				.append("}").toString();
+		return new StringBuilder("FeignClientFactoryBean{").append("type=")
+				.append(this.type).append(", ").append("name='").append(this.name)
+				.append("', ").append("url='").append(this.url).append("', ")
+				.append("path='").append(this.path).append("', ").append("decode404=")
+				.append(this.decode404).append(", ").append("inheritParentContext=")
+				.append(this.inheritParentContext).append(", ")
+				.append("applicationContext=").append(this.applicationContext)
+				.append(", ").append("fallback=").append(this.fallback).append(", ")
+				.append("fallbackFactory=").append(this.fallbackFactory).append("}")
+				.toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -13,21 +13,24 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package org.springframework.cloud.openfeign;

+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import feign.Contract;
+import feign.ExceptionPropagationPolicy;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import org.springframework.boot.context.properties.ConfigurationProperties;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
 * @author Eko Kurniawan Khannedy
@@ -42,7 +45,7 @@ public class FeignClientProperties {
 	private Map<String, FeignClientConfiguration> config = new HashMap<>();

 	public boolean isDefaultToProperties() {
-		return defaultToProperties;
+		return this.defaultToProperties;
 	}

 	public void setDefaultToProperties(boolean defaultToProperties) {
@@ -50,7 +53,7 @@ public class FeignClientProperties {
 	}

 	public String getDefaultConfig() {
-		return defaultConfig;
+		return this.defaultConfig;
 	}

 	public void setDefaultConfig(String defaultConfig) {
@@ -58,7 +61,7 @@ public class FeignClientProperties {
 	}

 	public Map<String, FeignClientConfiguration> getConfig() {
-		return config;
+		return this.config;
 	}

 	public void setConfig(Map<String, FeignClientConfiguration> config) {
@@ -67,19 +70,26 @@ public class FeignClientProperties {

 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties &&
-				Objects.equals(defaultConfig, that.defaultConfig) &&
-				Objects.equals(config, that.config);
+		return this.defaultToProperties == that.defaultToProperties
+				&& Objects.equals(this.defaultConfig, that.defaultConfig)
+				&& Objects.equals(this.config, that.config);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(defaultToProperties, defaultConfig, config);
+		return Objects.hash(this.defaultToProperties, this.defaultConfig, this.config);
 	}

+	/**
+	 * Feign client configuration.
+	 */
 	public static class FeignClientConfiguration {

 		private Logger.Level loggerLevel;
@@ -102,8 +112,10 @@ public class FeignClientProperties {

 		private Class<Contract> contract;

+		private ExceptionPropagationPolicy exceptionPropagationPolicy;
+
 		public Logger.Level getLoggerLevel() {
-			return loggerLevel;
+			return this.loggerLevel;
 		}

 		public void setLoggerLevel(Logger.Level loggerLevel) {
@@ -111,7 +123,7 @@ public class FeignClientProperties {
 		}

 		public Integer getConnectTimeout() {
-			return connectTimeout;
+			return this.connectTimeout;
 		}

 		public void setConnectTimeout(Integer connectTimeout) {
@@ -119,7 +131,7 @@ public class FeignClientProperties {
 		}

 		public Integer getReadTimeout() {
-			return readTimeout;
+			return this.readTimeout;
 		}

 		public void setReadTimeout(Integer readTimeout) {
@@ -127,7 +139,7 @@ public class FeignClientProperties {
 		}

 		public Class<Retryer> getRetryer() {
-			return retryer;
+			return this.retryer;
 		}

 		public void setRetryer(Class<Retryer> retryer) {
@@ -135,7 +147,7 @@ public class FeignClientProperties {
 		}

 		public Class<ErrorDecoder> getErrorDecoder() {
-			return errorDecoder;
+			return this.errorDecoder;
 		}

 		public void setErrorDecoder(Class<ErrorDecoder> errorDecoder) {
@@ -143,15 +155,16 @@ public class FeignClientProperties {
 		}

 		public List<Class<RequestInterceptor>> getRequestInterceptors() {
-			return requestInterceptors;
+			return this.requestInterceptors;
 		}

-		public void setRequestInterceptors(List<Class<RequestInterceptor>> requestInterceptors) {
+		public void setRequestInterceptors(
+				List<Class<RequestInterceptor>> requestInterceptors) {
 			this.requestInterceptors = requestInterceptors;
 		}

 		public Boolean getDecode404() {
-			return decode404;
+			return this.decode404;
 		}

 		public void setDecode404(Boolean decode404) {
@@ -159,7 +172,7 @@ public class FeignClientProperties {
 		}

 		public Class<Decoder> getDecoder() {
-			return decoder;
+			return this.decoder;
 		}

 		public void setDecoder(Class<Decoder> decoder) {
@@ -167,7 +180,7 @@ public class FeignClientProperties {
 		}

 		public Class<Encoder> getEncoder() {
-			return encoder;
+			return this.encoder;
 		}

 		public void setEncoder(Class<Encoder> encoder) {
@@ -175,35 +188,53 @@ public class FeignClientProperties {
 		}

 		public Class<Contract> getContract() {
-			return contract;
+			return this.contract;
 		}

 		public void setContract(Class<Contract> contract) {
 			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) return true;
-			if (o == null || getClass() != o.getClass()) return false;
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel &&
-					Objects.equals(connectTimeout, that.connectTimeout) &&
-					Objects.equals(readTimeout, that.readTimeout) &&
-					Objects.equals(retryer, that.retryer) &&
-					Objects.equals(errorDecoder, that.errorDecoder) &&
-					Objects.equals(requestInterceptors, that.requestInterceptors) &&
-					Objects.equals(decode404, that.decode404) &&
-					Objects.equals(encoder, that.encoder) &&
-					Objects.equals(decoder, that.decoder) &&
-					Objects.equals(contract, that.contract);
+			return this.loggerLevel == that.loggerLevel
+					&& Objects.equals(this.connectTimeout, that.connectTimeout)
+					&& Objects.equals(this.readTimeout, that.readTimeout)
+					&& Objects.equals(this.retryer, that.retryer)
+					&& Objects.equals(this.errorDecoder, that.errorDecoder)
+					&& Objects.equals(this.requestInterceptors, that.requestInterceptors)
+					&& 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);
 		}

 		@Override
 		public int hashCode() {
-			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer,
-					errorDecoder, requestInterceptors, decode404, encoder, decoder, contract);
+			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);
 		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,11 +16,11 @@

 package org.springframework.cloud.openfeign;

-import org.springframework.cloud.context.named.NamedContextFactory;
-
 import java.util.Arrays;
 import java.util.Objects;

+import org.springframework.cloud.context.named.NamedContextFactory;
+
 /**
 * @author Dave Syer
 * @author Gregor Zurowski
@@ -31,15 +31,16 @@ class FeignClientSpecification implements NamedContextFactory.Specification {

 	private Class<?>[] configuration;

-	public FeignClientSpecification() {}
+	FeignClientSpecification() {
+	}

-	public FeignClientSpecification(String name, Class<?>[] configuration) {
+	FeignClientSpecification(String name, Class<?>[] configuration) {
 		this.name = name;
 		this.configuration = configuration;
 	}

 	public String getName() {
-		return name;
+		return this.name;
 	}

 	public void setName(String name) {
@@ -47,7 +48,7 @@ class FeignClientSpecification implements NamedContextFactory.Specification {
 	}

 	public Class<?>[] getConfiguration() {
-		return configuration;
+		return this.configuration;
 	}

 	public void setConfiguration(Class<?>[] configuration) {
@@ -56,24 +57,27 @@ class FeignClientSpecification implements NamedContextFactory.Specification {

 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		FeignClientSpecification that = (FeignClientSpecification) o;
-		return Objects.equals(name, that.name) &&
-				Arrays.equals(configuration, that.configuration);
+		return Objects.equals(this.name, that.name)
+				&& Arrays.equals(this.configuration, that.configuration);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(name, configuration);
+		return Objects.hash(this.name, this.configuration);
 	}

 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientSpecification{")
-				.append("name='").append(name).append("', ")
-				.append("configuration=").append(Arrays.toString(configuration))
-				.append("}").toString();
+		return new StringBuilder("FeignClientSpecification{").append("name='")
+				.append(this.name).append("', ").append("configuration=")
+				.append(Arrays.toString(this.configuration)).append("}").toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,7 +12,6 @@
 * 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;
@@ -20,13 +19,34 @@ package org.springframework.cloud.openfeign;
 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.form.MultipartFormContentProcessor;
+import feign.form.spring.SpringFormEncoder;
+import feign.hystrix.HystrixFeign;
+import feign.optionals.OptionalDecoder;
+
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.ObjectProvider;
 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.autoconfigure.data.web.SpringDataWebProperties;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
+import org.springframework.cloud.openfeign.support.AbstractFormWriter;
+import org.springframework.cloud.openfeign.support.PageJacksonModule;
+import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
+import org.springframework.cloud.openfeign.support.SortJacksonModule;
 import org.springframework.cloud.openfeign.support.SpringDecoder;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
@@ -37,22 +57,14 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.format.support.FormattingConversionService;

-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 static feign.form.ContentType.MULTIPART;

 /**
 * @author Dave Syer
 * @author Venil Noronha
+ * @author Darren Foong
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {

 	@Autowired
@@ -67,16 +79,40 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private Logger logger;

+	@Autowired(required = false)
+	private SpringDataWebProperties springDataWebProperties;
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
+		return new OptionalDecoder(
+				new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
 	}

 	@Bean
 	@ConditionalOnMissingBean
-	public Encoder feignEncoder() {
-		return new SpringEncoder(this.messageConverters);
+	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
+	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		return springEncoder(formWriterProvider);
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
+	@ConditionalOnMissingBean
+	public Encoder feignEncoderPageable(
+			ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		PageableSpringEncoder encoder = new PageableSpringEncoder(
+				springEncoder(formWriterProvider));
+
+		if (springDataWebProperties != null) {
+			encoder.setPageParameter(
+					springDataWebProperties.getPageable().getPageParameter());
+			encoder.setSizeParameter(
+					springDataWebProperties.getPageable().getSizeParameter());
+			encoder.setSortParameter(
+					springDataWebProperties.getSort().getSortParameter());
+		}
+		return encoder;
 	}

 	@Bean
@@ -88,24 +124,12 @@ public class FeignClientsConfiguration {
 	@Bean
 	public FormattingConversionService feignConversionService() {
 		FormattingConversionService conversionService = new DefaultFormattingConversionService();
-		for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) {
+		for (FeignFormatterRegistrar feignFormatterRegistrar : this.feignFormatterRegistrars) {
 			feignFormatterRegistrar.registerFormatters(conversionService);
 		}
 		return conversionService;
 	}

-	@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();
-		}
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	public Retryer feignRetryer() {
@@ -122,7 +146,64 @@ public class FeignClientsConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
-		return new DefaultFeignLoggerFactory(logger);
+		return new DefaultFeignLoggerFactory(this.logger);
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Page")
+	public Module pageJacksonModule() {
+		return new PageJacksonModule();
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Page")
+	public Module sortModule() {
+		return new SortJacksonModule();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(FeignClientConfigurer.class)
+	public FeignClientConfigurer feignClientConfigurer() {
+		return new FeignClientConfigurer() {
+		};
+	}
+
+	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
+
+		if (formWriter != null) {
+			return new SpringEncoder(new SpringPojoFormEncoder(formWriter),
+					this.messageConverters);
+		}
+		else {
+			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters);
+		}
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@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();
+		}
+
+	}
+
+	private class SpringPojoFormEncoder extends SpringFormEncoder {
+
+		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
+			super();
+
+			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(
+					MULTIPART);
+			processor.addFirstWriter(formWriter);
+		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -58,8 +59,8 @@ import org.springframework.util.StringUtils;
 * @author Venil Noronha
 * @author Gang Li
 */
-class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
-		ResourceLoaderAware, EnvironmentAware {
+class FeignClientsRegistrar
+		implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {

 	// patterned after Spring Integration IntegrationComponentScanRegistrar
 	// and RibbonClientsConfigurationRegistgrar
@@ -68,7 +69,68 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,

 	private Environment environment;

-	public FeignClientsRegistrar() {
+	FeignClientsRegistrar() {
+	}
+
+	static void validateFallback(final Class clazz) {
+		Assert.isTrue(!clazz.isInterface(),
+				"Fallback class must implement the interface annotated by @FeignClient");
+	}
+
+	static void validateFallbackFactory(final Class clazz) {
+		Assert.isTrue(!clazz.isInterface(), "Fallback factory must produce instances "
+				+ "of fallback classes that implement the interface annotated by @FeignClient");
+	}
+
+	static String getName(String name) {
+		if (!StringUtils.hasText(name)) {
+			return "";
+		}
+
+		String host = null;
+		try {
+			String url;
+			if (!name.startsWith("http://") && !name.startsWith("https://")) {
+				url = "http://" + name;
+			}
+			else {
+				url = name;
+			}
+			host = new URI(url).getHost();
+
+		}
+		catch (URISyntaxException e) {
+		}
+		Assert.state(host != null, "Service id not legal hostname (" + name + ")");
+		return name;
+	}
+
+	static String getUrl(String url) {
+		if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) {
+			if (!url.contains("://")) {
+				url = "http://" + url;
+			}
+			try {
+				new URL(url);
+			}
+			catch (MalformedURLException e) {
+				throw new IllegalArgumentException(url + " is malformed", e);
+			}
+		}
+		return url;
+	}
+
+	static String getPath(String path) {
+		if (StringUtils.hasText(path)) {
+			path = path.trim();
+			if (!path.startsWith("/")) {
+				path = "/" + path;
+			}
+			if (path.endsWith("/")) {
+				path = path.substring(0, path.length() - 1);
+			}
+		}
+		return path;
 	}

 	@Override
@@ -171,16 +233,20 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		definition.addPropertyValue("path", getPath(attributes));
 		String name = getName(attributes);
 		definition.addPropertyValue("name", name);
+		String contextId = getContextId(attributes);
+		definition.addPropertyValue("contextId", contextId);
 		definition.addPropertyValue("type", className);
 		definition.addPropertyValue("decode404", attributes.get("decode404"));
 		definition.addPropertyValue("fallback", attributes.get("fallback"));
 		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);

-		String alias = name + "FeignClient";
+		String alias = contextId + "FeignClient";
 		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();
+		beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, className);

-		boolean primary = (Boolean)attributes.get("primary"); // has a default, won't be null
+		// has a default, won't be null
+		boolean primary = (Boolean) attributes.get("primary");

 		beanDefinition.setPrimary(primary);

@@ -202,19 +268,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		validateFallbackFactory(annotation.getClass("fallbackFactory"));
 	}

-	static void validateFallback(final Class clazz) {
-		Assert.isTrue(
-			!clazz.isInterface(),
-			"Fallback class must implement the interface annotated by @FeignClient"
-		);
-	}
-
-	static void validateFallbackFactory(final Class clazz) {
-		Assert.isTrue(!clazz.isInterface(),
-			"Fallback factory must produce instances of fallback classes that implement the interface annotated by @FeignClient"
-		);
-	}
-
 	/* for testing */ String getName(Map<String, Object> attributes) {
 		String name = (String) attributes.get("serviceId");
 		if (!StringUtils.hasText(name)) {
@@ -227,26 +280,14 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return getName(name);
 	}

-	static String getName(String name) {
-		if (!StringUtils.hasText(name)) {
-			return "";
+	private String getContextId(Map<String, Object> attributes) {
+		String contextId = (String) attributes.get("contextId");
+		if (!StringUtils.hasText(contextId)) {
+			return getName(attributes);
 		}

-		String host = null;
-		try {
-			String url;
-			if (!name.startsWith("http://") && !name.startsWith("https://")) {
-				url = "http://" + name;
-			} else {
-				url = name;
-			}
-			host = new URI(url).getHost();
-
-		}
-		catch (URISyntaxException e) {
-		}
-		Assert.state(host != null, "Service id not legal hostname (" + name + ")");
-		return name;
+		contextId = resolve(contextId);
+		return getName(contextId);
 	}

 	private String resolve(String value) {
@@ -261,43 +302,16 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return getUrl(url);
 	}

-	static String getUrl(String url) {
-		if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) {
-			if (!url.contains("://")) {
-				url = "http://" + url;
-			}
-			try {
-				new URL(url);
-			}
-			catch (MalformedURLException e) {
-				throw new IllegalArgumentException(url + " is malformed", e);
-			}
-		}
-		return url;
-	}
-
 	private String getPath(Map<String, Object> attributes) {
 		String path = resolve((String) attributes.get("path"));
 		return getPath(path);
 	}

-	static String getPath(String path) {
-		if (StringUtils.hasText(path)) {
-			path = path.trim();
-			if (!path.startsWith("/")) {
-				path = "/" + path;
-			}
-			if (path.endsWith("/")) {
-				path = path.substring(0, path.length() - 1);
-			}
-		}
-		return path;
-	}
-
 	protected ClassPathScanningCandidateComponentProvider getScanner() {
 		return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
 			@Override
-			protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
+			protected boolean isCandidateComponent(
+					AnnotatedBeanDefinition beanDefinition) {
 				boolean isCandidate = false;
 				if (beanDefinition.getMetadata().isIndependent()) {
 					if (!beanDefinition.getMetadata().isAnnotation()) {
@@ -334,7 +348,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		}
 		return basePackages;
 	}
-	
+
 	private String getQualifier(Map<String, Object> client) {
 		if (client == null) {
 			return null;
@@ -350,7 +364,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		if (client == null) {
 			return null;
 		}
-		String value = (String) client.get("value");
+		String value = (String) client.get("contextId");
+		if (!StringUtils.hasText(value)) {
+			value = (String) client.get("value");
+		}
 		if (!StringUtils.hasText(value)) {
 			value = (String) client.get("name");
 		}
@@ -393,10 +410,9 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,

 		/**
 		 * Creates a new {@link AllTypeFilter} to match if all the given delegates match.
-		 *
 		 * @param delegates must not be {@literal null}.
 		 */
-		public AllTypeFilter(List<TypeFilter> delegates) {
+		AllTypeFilter(List<TypeFilter> delegates) {
 			Assert.notNull(delegates, "This argument is required, it must not be null");
 			this.delegates = delegates;
 		}
@@ -413,5 +429,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,

 			return true;
 		}
+
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,7 +16,12 @@

 package org.springframework.cloud.openfeign;

+import java.util.Map;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.cloud.context.named.NamedContextFactory;
+import org.springframework.lang.Nullable;

 /**
 * A factory that creates instances of feign classes. It creates a Spring
@@ -24,6 +29,7 @@ import org.springframework.cloud.context.named.NamedContextFactory;
 *
 * @author Spencer Gibb
 * @author Dave Syer
+ * @author Matt King
 */
 public class FeignContext extends NamedContextFactory<FeignClientSpecification> {

@@ -31,4 +37,19 @@ public class FeignContext extends NamedContextFactory<FeignClientSpecification>
 		super(FeignClientsConfiguration.class, "feign", "feign.client.name");
 	}

+	@Nullable
+	public <T> T getInstanceWithoutAncestors(String name, Class<T> type) {
+		try {
+			return BeanFactoryUtils.beanOfType(getContext(name), type);
+		}
+		catch (BeansException ex) {
+			return null;
+		}
+	}
+
+	@Nullable
+	public <T> Map<String, T> getInstancesWithoutAncestors(String name, Class<T> type) {
+		return getContext(name).getBeansOfType(type);
+	}
+
 }
@@ -0,0 +1,37 @@
+/*
+ * 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);
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-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.
@@ -27,10 +27,9 @@ public interface FeignLoggerFactory {

 	/**
 	 * Factory method to provide a {@link Logger} for a given {@link Class}.
-	 *
 	 * @param type the {@link Class} for which a {@link Logger} instance is to be created
 	 * @return a {@link Logger} instance
 	 */
-	public Logger create(Class<?> type);
+	Logger create(Class<?> type);

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -12,19 +12,18 @@
 * 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 org.springframework.util.Assert;
-
 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
@@ -33,66 +32,70 @@ import feign.hystrix.SetterFactory;
 class HystrixTargeter implements Targeter {

 	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-						Target.HardCodedTarget<T> target) {
+	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;
-		SetterFactory setterFactory = getOptional(factory.getName(), context,
-			SetterFactory.class);
+		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(factory.getName(), context, target, builder, fallback);
+			return targetWithFallback(name, context, target, builder, fallback);
 		}
 		Class<?> fallbackFactory = factory.getFallbackFactory();
 		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(factory.getName(), context, target, builder, fallbackFactory);
+			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);
+			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());
+			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) {
+	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));
+					"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));
+			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) {
+			Class<T> beanType) {
 		return context.getInstance(feignClientName, beanType);
 	}
+
 }
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013-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.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import feign.QueryMap;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Spring MVC equivalent of OpenFeign's {@link feign.QueryMap} parameter annotation.
+ *
+ * @author Aram Peres
+ * @see feign.QueryMap
+ * @see org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.PARAMETER })
+public @interface SpringQueryMap {
+
+	/**
+	 * @see QueryMap#encoded()
+	 * @return alias for {@link #encoded()}.
+	 */
+	@AliasFor("encoded")
+	boolean value() default false;
+
+	/**
+	 * @see QueryMap#encoded()
+	 * @return Specifies whether parameter names and values are already encoded.
+	 */
+	@AliasFor("value")
+	boolean encoded() default false;
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -12,7 +12,6 @@
 * 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;
@@ -24,6 +23,8 @@ import feign.Target;
 * @author Spencer Gibb
 */
 interface Targeter {
-	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-				 Target.HardCodedTarget<T> target);
+
+	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target);
+
 }
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-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.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,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -21,11 +21,11 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;

+import feign.MethodMetadata;
+
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.PathVariable;

-import feign.MethodMetadata;
-
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;

@@ -46,10 +46,12 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 	}

 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		String name = ANNOTATION.cast(annotation).value();
 		checkState(emptyToNull(name) != null,
-				"PathVariable annotation was empty on param %s.", context.getParameterIndex());
+				"PathVariable annotation was empty on param %s.",
+				context.getParameterIndex());
 		context.setParameterName(name);

 		MethodMetadata data = context.getMethodMetadata();
@@ -74,4 +76,5 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 		}
 		return false;
 	}
+
 }
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-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.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import feign.MethodMetadata;
+
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+
+/**
+ * {@link SpringQueryMap} parameter processor.
+ *
+ * @author Aram Peres
+ * @see AnnotatedParameterProcessor
+ */
+public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
+
+	private static final Class<SpringQueryMap> ANNOTATION = SpringQueryMap.class;
+
+	@Override
+	public Class<? extends Annotation> getAnnotationType() {
+		return ANNOTATION;
+	}
+
+	@Override
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
+		int paramIndex = context.getParameterIndex();
+		MethodMetadata metadata = context.getMethodMetadata();
+		if (metadata.queryMapIndex() == null) {
+			metadata.queryMapIndex(paramIndex);
+			metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
+		}
+		return true;
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -21,11 +21,11 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;

+import feign.MethodMetadata;
+
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.RequestHeader;

-import feign.MethodMetadata;
-
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;

@@ -46,13 +46,15 @@ public class RequestHeaderParameterProcessor implements AnnotatedParameterProces
 	}

 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();

 		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.headerMapIndex() == null, "Header map can only be present once.");
+			checkState(data.headerMapIndex() == null,
+					"Header map can only be present once.");
 			data.headerMapIndex(parameterIndex);

 			return true;
@@ -63,8 +65,10 @@ public class RequestHeaderParameterProcessor implements AnnotatedParameterProces
 				"RequestHeader.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);

-		Collection<String> header = context.setTemplateParameter(name, data.template().headers().get(name));
+		Collection<String> header = context.setTemplateParameter(name,
+				data.template().headers().get(name));
 		data.template().header(name, header);
 		return true;
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -21,14 +21,14 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;

+import feign.MethodMetadata;
+
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.RequestParam;

 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;

-import feign.MethodMetadata;
-
 /**
 * {@link RequestParam} parameter processor.
 *
@@ -46,13 +46,15 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 	}

 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();

 		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.queryMapIndex() == null, "Query map can only be present once.");
+			checkState(data.queryMapIndex() == null,
+					"Query map can only be present once.");
 			data.queryMapIndex(parameterIndex);

 			return true;
@@ -61,8 +63,7 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 		RequestParam requestParam = ANNOTATION.cast(annotation);
 		String name = requestParam.value();
 		checkState(emptyToNull(name) != null,
-				"RequestParam.value() was empty on parameter %s",
-				parameterIndex);
+				"RequestParam.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);

 		Collection<String> query = context.setTemplateParameter(name,
@@ -70,4 +71,5 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 		data.template().query(name, query);
 		return true;
 	}
+
 }
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013-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.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;
+	}
+
+}
@@ -0,0 +1,45 @@
+/*
+ * 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;
+
+/**
+ * Additional Feign Client configuration that are not included in
+ * {@link org.springframework.cloud.openfeign.FeignClient}.
+ *
+ * @author Matt King
+ */
+public interface FeignClientConfigurer {
+
+	/**
+	 * @return whether to mark the feign proxy as a primary bean. Defaults to true.
+	 */
+	default boolean primary() {
+		return true;
+	}
+
+	/**
+	 * FALSE will only apply configurations from classes listed in
+	 * <code>configuration()</code>. Will still use parent instance of
+	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, and
+	 * {@link feign.Contract} if none are provided.
+	 * @return weather to inherit parent context for client configuration.
+	 */
+	default boolean inheritParentConfiguration() {
+		return true;
+	}
+
+}
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2013-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.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();
+		}
+	}
+
+}
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-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.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();
+		}
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign.encoding;

 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+
 import org.springframework.util.Assert;

 /**
@@ -34,7 +35,6 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {

 	/**
 	 * Creates new instance of {@link BaseRequestInterceptor}.
-	 *
 	 * @param properties the encoding properties
 	 */
 	protected BaseRequestInterceptor(FeignClientEncodingProperties properties) {
@@ -44,12 +44,12 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {

 	/**
 	 * Adds the header if it wasn't yet specified.
-	 *
 	 * @param requestTemplate the request
-	 * @param name			the header name
-	 * @param values		  the header values
+	 * @param name the header name
+	 * @param values the header values
 	 */
-	protected void addHeader(RequestTemplate requestTemplate, String name, String... values) {
+	protected void addHeader(RequestTemplate requestTemplate, String name,
+			String... values) {

 		if (!requestTemplate.headers().containsKey(name)) {
 			requestTemplate.header(name, values);
@@ -57,7 +57,7 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	}

 	protected FeignClientEncodingProperties getProperties() {
-		return properties;
+		return this.properties;
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -35,19 +35,22 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignAcceptGzipEncodingInterceptor
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@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
+@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")
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignAcceptGzipEncodingAutoConfiguration {

 	@Bean
-	public FeignAcceptGzipEncodingInterceptor feignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	public FeignAcceptGzipEncodingInterceptor feignAcceptGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		return new FeignAcceptGzipEncodingInterceptor(properties);
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -19,10 +19,11 @@ package org.springframework.cloud.openfeign.encoding;
 import feign.RequestTemplate;

 /**
- * Enables the HTTP response payload compression by specifying the {@code Accept-Encoding} headers.
- * Although this does not yet mean that the requests will be compressed, it requires the remote server
- * to understand the header and be configured to compress responses. Still no all responses might be compressed
- * based on the media type matching and other factors like the response content length.
+ * Enables the HTTP response payload compression by specifying the {@code Accept-Encoding}
+ * headers. Although this does not yet mean that the requests will be compressed, it
+ * requires the remote server to understand the header and be configured to compress
+ * responses. Still no all responses might be compressed based on the media type matching
+ * and other factors like the response content length.
 *
 * @author Jakub Narloch
 */
@@ -30,10 +31,10 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {

 	/**
 	 * Creates new instance of {@link FeignAcceptGzipEncodingInterceptor}.
-	 *
 	 * @param properties the encoding properties
 	 */
-	protected FeignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	protected FeignAcceptGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		super(properties);
 	}

@@ -43,7 +44,8 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 	@Override
 	public void apply(RequestTemplate template) {

-		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-				HttpEncoding.DEFLATE_ENCODING);
+		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER,
+				HttpEncoding.GZIP_ENCODING, HttpEncoding.DEFLATE_ENCODING);
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -16,11 +16,11 @@

 package org.springframework.cloud.openfeign.encoding;

-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.Arrays;
 import java.util.Objects;

+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 /**
 * The Feign encoding properties.
 *
@@ -32,7 +32,8 @@ public class FeignClientEncodingProperties {
 	/**
 	 * The list of supported mime types.
 	 */
-	private String[] mimeTypes = new String[]{"text/xml", "application/xml", "application/json"};
+	private String[] mimeTypes = new String[] { "text/xml", "application/xml",
+			"application/json" };

 	/**
 	 * The minimum threshold content size.
@@ -40,7 +41,7 @@ public class FeignClientEncodingProperties {
 	private int minRequestSize = 2048;

 	public String[] getMimeTypes() {
-		return mimeTypes;
+		return this.mimeTypes;
 	}

 	public void setMimeTypes(String[] mimeTypes) {
@@ -48,7 +49,7 @@ public class FeignClientEncodingProperties {
 	}

 	public int getMinRequestSize() {
-		return minRequestSize;
+		return this.minRequestSize;
 	}

 	public void setMinRequestSize(int minRequestSize) {
@@ -57,24 +58,28 @@ public class FeignClientEncodingProperties {

 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		FeignClientEncodingProperties that = (FeignClientEncodingProperties) o;
-		return Arrays.equals(mimeTypes, that.mimeTypes) &&
-				Objects.equals(minRequestSize, that.minRequestSize);
+		return Arrays.equals(this.mimeTypes, that.mimeTypes)
+				&& Objects.equals(this.minRequestSize, that.minRequestSize);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(mimeTypes, minRequestSize);
+		return Objects.hash(this.mimeTypes, this.minRequestSize);
 	}

 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientEncodingProperties{")
-				.append("mimeTypes=").append(Arrays.toString(mimeTypes)).append(", ")
-				.append("minRequestSize=").append(minRequestSize)
-				.append("}").toString();
+		return new StringBuilder("FeignClientEncodingProperties{").append("mimeTypes=")
+				.append(Arrays.toString(this.mimeTypes)).append(", ")
+				.append("minRequestSize=").append(this.minRequestSize).append("}")
+				.toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -35,19 +35,22 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignContentGzipEncodingInterceptor
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@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
+// 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 {

 	@Bean
-	public FeignContentGzipEncodingInterceptor feignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	public FeignContentGzipEncodingInterceptor feignContentGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		return new FeignContentGzipEncodingInterceptor(properties);
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -16,13 +16,14 @@

 package org.springframework.cloud.openfeign.encoding;

-import feign.RequestTemplate;
-
 import java.util.Collection;
 import java.util.Map;

+import feign.RequestTemplate;
+
 /**
- * Enables the HTTP request payload compression by specifying the {@code Content-Encoding} headers.
+ * Enables the HTTP request payload compression by specifying the {@code Content-Encoding}
+ * headers.
 *
 * @author Jakub Narloch
 */
@@ -30,10 +31,10 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor

 	/**
 	 * Creates new instance of {@link FeignContentGzipEncodingInterceptor}.
-	 *
 	 * @param properties the encoding properties
 	 */
-	protected FeignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	protected FeignContentGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		super(properties);
 	}

@@ -44,14 +45,13 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	public void apply(RequestTemplate template) {

 		if (requiresCompression(template)) {
-			addHeader(template, HttpEncoding.CONTENT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-					HttpEncoding.DEFLATE_ENCODING);
+			addHeader(template, HttpEncoding.CONTENT_ENCODING_HEADER,
+					HttpEncoding.GZIP_ENCODING, HttpEncoding.DEFLATE_ENCODING);
 		}
 	}

 	/**
 	 * Returns whether the request requires GZIP compression.
-	 *
 	 * @param template the request template
 	 * @return true if request requires compression, false otherwise
 	 */
@@ -64,7 +64,6 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor

 	/**
 	 * Returns whether the request content length exceed configured minimum size.
-	 *
 	 * @param contentLength the content length header value
 	 * @return true if length is grater than minimum size, false otherwise
 	 */
@@ -78,14 +77,14 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			final String strLen = contentLength.iterator().next();
 			final long length = Long.parseLong(strLen);
 			return length > getProperties().getMinRequestSize();
-		} catch (NumberFormatException ex) {
+		}
+		catch (NumberFormatException ex) {
 			return false;
 		}
 	}

 	/**
 	 * Returns whether the content mime types matches the configures mime types.
-	 *
 	 * @param contentTypes the content types
 	 * @return true if any specified content type matches the request content types
 	 */
@@ -94,7 +93,8 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			return false;
 		}

-		if (getProperties().getMimeTypes() == null || getProperties().getMimeTypes().length == 0) {
+		if (getProperties().getMimeTypes() == null
+				|| getProperties().getMimeTypes().length == 0) {
 			// no specific mime types has been set - matching everything
 			return true;
 		}
@@ -107,4 +107,5 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor

 		return false;
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -52,4 +52,5 @@ public interface HttpEncoding {
 	 * The Deflate encoding.
 	 */
 	String DEFLATE_ENCODING = "deflate";
+
 }
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2016-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.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;
+	}
+
+}
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013-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.loadbalancer;
+
+import feign.Client;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link Client.Default} under the hood.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@Configuration(proxyBeanMethods = false)
+class DefaultFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
+		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
+				loadBalancerClient);
+	}
+
+}
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013-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.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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.http.HttpStatus;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} 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 BlockingLoadBalancerClient loadBalancerClient;
+
+	public FeignBlockingLoadBalancerClient(Client delegate,
+			BlockingLoadBalancerClient 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;
+	}
+
+}
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013-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.loadbalancer;
+
+import feign.Client;
+import feign.Feign;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
+ * implementations of {@link Client}. In order to use this load-balancing mechanism, the
+ * Ribbon-based implementation has to be disabled by setting
+ * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@ConditionalOnClass(Feign.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.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 {
+
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-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.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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+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 BlockingLoadBalancerClient}-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(BlockingLoadBalancerClient.class)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Import(HttpClientFeignConfiguration.class)
+class HttpClientFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+	}
+
+}
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-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.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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+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 BlockingLoadBalancerClient}-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(BlockingLoadBalancerClient.class)
+@Import(OkHttpFeignConfiguration.class)
+class OkHttpFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
+			BlockingLoadBalancerClient loadBalancerClient) {
+		OkHttpClient delegate = new OkHttpClient(okHttpClient);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -18,14 +18,14 @@ 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;

-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-
 /**
 * Factory for SpringLoadBalancer instances that caches the entries created.
 *
@@ -36,8 +36,9 @@ import com.netflix.loadbalancer.ILoadBalancer;
 */
 public class CachingSpringLoadBalancerFactory {

-	private final SpringClientFactory factory;
-	private LoadBalancedRetryFactory loadBalancedRetryFactory = null;
+	protected final SpringClientFactory factory;
+
+	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;

 	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();

@@ -45,23 +46,27 @@ public class CachingSpringLoadBalancerFactory {
 		this.factory = factory;
 	}

-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory, LoadBalancedRetryFactory loadBalancedRetryPolicyFactory) {
+	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) {
+		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 = loadBalancedRetryFactory != null ? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
-			loadBalancedRetryFactory) : new FeignLoadBalancer(lb, config, serverIntrospector);
+		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;
 	}

-}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,12 +12,12 @@
 * 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 feign.Client;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
@@ -26,13 +26,15 @@ import org.springframework.context.annotation.Configuration;
 /**
 * @author Spencer Gibb
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class DefaultFeignLoadBalancedConfiguration {
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-							  SpringClientFactory clientFactory) {
-		return new LoadBalancerFeignClient(new Client.Default(null, null),
-				cachingFactory, clientFactory);
+			SpringClientFactory clientFactory) {
+		return new LoadBalancerFeignClient(new Client.Default(null, null), cachingFactory,
+				clientFactory);
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,10 +16,6 @@

 package org.springframework.cloud.openfeign.ribbon;

-import feign.Client;
-import feign.Request;
-import feign.Response;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,11 +25,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-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 com.netflix.client.AbstractLoadBalancerAwareClient;
 import com.netflix.client.ClientException;
 import com.netflix.client.ClientRequest;
@@ -43,6 +34,15 @@ 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;

@@ -51,18 +51,23 @@ import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecur
 * @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) {
+			ServerIntrospector serverIntrospector) {
 		super(lb, clientConfig);
 		this.setRetryHandler(RetryHandler.DEFAULT);
 		this.clientConfig = clientConfig;
@@ -79,8 +84,7 @@ public class FeignLoadBalancer extends
 		Request.Options options;
 		if (configOverride != null) {
 			RibbonProperties override = RibbonProperties.from(configOverride);
-			options = new Request.Options(
-					override.connectTimeout(this.connectTimeout),
+			options = new Request.Options(override.connectTimeout(this.connectTimeout),
 					override.readTimeout(this.readTimeout));
 		}
 		else {
@@ -97,7 +101,7 @@ public class FeignLoadBalancer extends
 			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
 					requestConfig);
 		}
-		if (!request.toRequest().method().equals("GET")) {
+		if (!request.toRequest().httpMethod().name().equals("GET")) {
 			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
 					requestConfig);
 		}
@@ -109,16 +113,18 @@ public class FeignLoadBalancer extends

 	@Override
 	public URI reconstructURIWithServer(Server server, URI original) {
-		URI uri = updateToSecureConnectionIfNeeded(original, this.clientConfig, this.serverIntrospector, server);
+		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;

-		RibbonRequest(Client client, Request request, URI uri) {
+		protected RibbonRequest(Client client, Request request, URI uri) {
 			this.client = client;
 			setUri(uri);
 			this.request = toRequest(request);
@@ -127,7 +133,8 @@ public class FeignLoadBalancer extends
 		private Request toRequest(Request request) {
 			Map<String, Collection<String>> headers = new LinkedHashMap<>(
 					request.headers());
-			return Request.create(request.method(),getUri().toASCIIString(),headers,request.body(),request.charset());
+			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
+					request.body(), request.charset(), request.requestTemplate());
 		}

 		Request toRequest() {
@@ -142,7 +149,8 @@ public class FeignLoadBalancer extends
 			return new HttpRequest() {
 				@Override
 				public HttpMethod getMethod() {
-					return HttpMethod.resolve(RibbonRequest.this.toRequest().method());
+					return HttpMethod
+							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
 				}

 				@Override
@@ -158,8 +166,9 @@ public class FeignLoadBalancer extends
 				@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()) {
+					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();
@@ -170,19 +179,28 @@ public class FeignLoadBalancer extends
 			};
 		}

+		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;

-		RibbonResponse(URI uri, Response response) {
+		protected RibbonResponse(URI uri, Response response) {
 			this.uri = uri;
 			this.response = response;
 		}
@@ -225,4 +243,4 @@ public class FeignLoadBalancer extends

 	}

-}
+}
@@ -1,19 +1,17 @@
 /*
+ * Copyright 2013-2020 the original author or authors.
 *
- *  * Copyright 2013-2016 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.
+ * 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;
@@ -34,9 +32,13 @@ 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) {
+
+	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
+			ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
 		super(request, policy, serviceInstanceChooser, serviceName);
 		this.request = request;
 		this.serviceId = serviceName;
@@ -45,17 +47,18 @@ public class FeignRetryPolicy extends InterceptorRetryPolicy {
 	@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 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.
+		 * 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) {
+		if (context.getRetryCount() == 0) {
 			return true;
 		}
 		return super.canRetry(context);
@@ -64,20 +67,25 @@ public class FeignRetryPolicy extends InterceptorRetryPolicy {
 	@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.
+		 * 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(serviceId, request));
+		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) {
@@ -88,32 +96,34 @@ public class FeignRetryPolicy extends InterceptorRetryPolicy {

 		@Override
 		public String getServiceId() {
-			return serviceId;
+			return this.serviceId;
 		}

 		@Override
 		public String getHost() {
-			return request.getURI().getHost();
+			return this.request.getURI().getHost();
 		}

 		@Override
 		public int getPort() {
-			return request.getURI().getPort();
+			return this.request.getURI().getPort();
 		}

 		@Override
 		public boolean isSecure() {
-			return "https".equals(request.getURI().getScheme());
+			return "https".equals(this.request.getURI().getScheme());
 		}

 		@Override
 		public URI getUri() {
-			return request.getURI();
+			return this.request.getURI();
 		}

 		@Override
 		public Map<String, String> getMetadata() {
-			return metadata;
+			return this.metadata;
 		}
+
 	}
-}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -16,37 +16,41 @@

 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.autoconfigure.condition.ConditionalOnProperty;
 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.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;

-import com.netflix.loadbalancer.ILoadBalancer;
-
-import feign.Feign;
-import feign.Request;
-
 /**
 * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
 * load balancer.
 *
 * @author Dave Syer
+ * @author Olga Maciaszek-Sharma
 */
@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
-@Configuration
+@ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled",
+		matchIfMissing = true)
+@Configuration(proxyBeanMethods = false)
@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
+// 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 })
@@ -66,8 +70,7 @@ public class FeignRibbonClientAutoConfiguration {
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
-		SpringClientFactory factory,
-		LoadBalancedRetryFactory retryFactory) {
+			SpringClientFactory factory, LoadBalancedRetryFactory retryFactory) {
 		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
 	}

@@ -76,4 +79,5 @@ public class FeignRibbonClientAutoConfiguration {
 	public Request.Options feignRequestOptions() {
 		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,117 +12,39 @@
 * 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 feign.Client;
 import feign.httpclient.ApacheHttpClient;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import javax.annotation.PreDestroy;
 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.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+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;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Import(HttpClientFeignConfiguration.class)
 class HttpClientFeignLoadBalancedConfiguration {

-	@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(), 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 {
-			connectionManagerTimer.cancel();
-			if(httpClient != null) {
-				httpClient.close();
-			}
-		}
+	@Bean
+	@ConditionalOnMissingBean(Client.class)
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory, HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 	}

-
-		@Bean
-		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-								  SpringClientFactory clientFactory, HttpClient httpClient) {
-			ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-			return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-		}
-
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2013-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.
@@ -19,17 +19,16 @@ package org.springframework.cloud.openfeign.ribbon;
 import java.io.IOException;
 import java.net.URI;

-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
 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
 *
@@ -39,17 +38,37 @@ 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) {
+			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 {
@@ -60,8 +79,8 @@ public class LoadBalancerFeignClient implements Client {
 					this.delegate, request, uriWithoutHost);

 			IClientConfig requestConfig = getClientConfig(options, clientName);
-			return lbClient(clientName).executeWithLoadBalancer(ribbonRequest,
-					requestConfig).toResponse();
+			return lbClient(clientName)
+					.executeWithLoadBalancer(ribbonRequest, requestConfig).toResponse();
 		}
 		catch (ClientException e) {
 			IOException io = findIOException(e);
@@ -76,7 +95,8 @@ public class LoadBalancerFeignClient implements Client {
 		IClientConfig requestConfig;
 		if (options == DEFAULT_OPTIONS) {
 			requestConfig = this.clientFactory.getClientConfig(clientName);
-		} else {
+		}
+		else {
 			requestConfig = new FeignOptionsClientConfig(options);
 		}
 		return requestConfig;
@@ -96,28 +116,13 @@ public class LoadBalancerFeignClient implements Client {
 		return this.delegate;
 	}

-	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());
-	}
-
 	private FeignLoadBalancer lbClient(String clientName) {
 		return this.lbClientFactory.create(clientName);
 	}

 	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {

-		public FeignOptionsClientConfig(Request.Options options) {
+		FeignOptionsClientConfig(Request.Options options) {
 			setProperty(CommonClientConfigKey.ConnectTimeout,
 					options.connectTimeoutMillis());
 			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
@@ -134,4 +139,5 @@ public class LoadBalancerFeignClient implements Client {
 		}

 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,76 +12,38 @@
 * 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 feign.Client;
 import feign.okhttp.OkHttpClient;
-import okhttp3.ConnectionPool;

-import java.util.concurrent.TimeUnit;
-import javax.annotation.PreDestroy;
 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.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+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;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty(value = "feign.okhttp.enabled")
+@ConditionalOnProperty("feign.okhttp.enabled")
+@Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancedConfiguration {

-	@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(okHttpClient != null) {
-				okHttpClient.dispatcher().executorService().shutdown();
-				okHttpClient.connectionPool().evictAll();
-			}
-		}
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(Client.class)
 	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-							  SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
+			SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 	}
+
 }
@@ -1,28 +1,32 @@
 /*
+ * Copyright 2013-2020 the original author or authors.
 *
- *  * Copyright 2013-2016 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.
+ * 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 java.io.IOException;
-import java.net.URI;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
@@ -40,71 +44,82 @@ import org.springframework.retry.backoff.NoBackOffPolicy;
 import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.StreamUtils;
-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;

 /**
 * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
+ *
 * @author Ryan Baxter
 * @author Gang Li
 */
-public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements ServiceInstanceChooser {
+public class RetryableFeignLoadBalancer extends FeignLoadBalancer
+		implements ServiceInstanceChooser {

 	private final LoadBalancedRetryFactory loadBalancedRetryFactory;

-	public RetryableFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig, ServerIntrospector serverIntrospector,
-									  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 {
+	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),
+			options = new Request.Options(ribbon.connectTimeout(this.connectTimeout),
 					ribbon.readTimeout(this.readTimeout));
 		}
 		else {
 			options = new Request.Options(this.connectTimeout, this.readTimeout);
 		}
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryFactory.createRetryPolicy(this.getClientName(), this);
+		final LoadBalancedRetryPolicy retryPolicy = this.loadBalancedRetryFactory
+				.createRetryPolicy(this.getClientName(), this);
 		RetryTemplate retryTemplate = new RetryTemplate();
-		BackOffPolicy backOffPolicy = loadBalancedRetryFactory.createBackOffPolicy(this.getClientName());
-		retryTemplate.setBackOffPolicy(backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
-		RetryListener[] retryListeners = this.loadBalancedRetryFactory.createRetryListeners(this.getClientName());
+		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()));
+				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this,
+						this.getClientName()));
 		return retryTemplate.execute(new RetryCallback<RibbonResponse, IOException>() {
 			@Override
-			public RibbonResponse doWithRetry(RetryContext retryContext) throws IOException {
+			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
+				// 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();
+					ServiceInstance service = ((LoadBalancedRetryContext) retryContext)
+							.getServiceInstance();
 					if (service != null) {
-						feignRequest = ((RibbonRequest) request.replaceUri(reconstructURIWithServer(new Server(service.getHost(), service.getPort()), request.getUri()))).toRequest();
+						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());
+				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,
+					throw new RibbonResponseStatusCodeException(
+							RetryableFeignLoadBalancer.this.clientName, response,
 							byteArray, request.getUri());
 				}
 				return new RibbonResponse(request.getUri(), response);
@@ -120,7 +135,8 @@ public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements Ser
 	@Override
 	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
 			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(), requestConfig);
+		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(),
+				requestConfig);
 	}

 	@Override
@@ -128,4 +144,5 @@ public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements Ser
 		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
 				this.getLoadBalancer().chooseServer(serviceId));
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -13,33 +13,37 @@
 * 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 java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URI;
 import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.util.StreamUtils;

 /**
- * A {@link RetryableStatusCodeException} for {@link Response}s
+ * A {@link RetryableStatusCodeException} for {@link Response}s.
+ *
 * @author Ryan Baxter
 */
 public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
-	private Response response;

-	public RibbonResponseStatusCodeException(String serviceId, Response response, byte[] body, URI uri) {
+	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)
+		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 response;
+		return this.response;
 	}

 }
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-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.support;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.function.Predicate;
+
+import feign.codec.EncodeException;
+import feign.form.multipart.AbstractWriter;
+import feign.form.multipart.Output;
+import feign.form.util.PojoUtil;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+
+import static feign.form.ContentProcessor.CRLF;
+import static feign.form.util.PojoUtil.isUserPojo;
+
+/**
+ * @author Darren Foong
+ */
+public abstract class AbstractFormWriter extends AbstractWriter {
+
+	@Override
+	public boolean isApplicable(Object object) {
+		return !isTypeOrCollection(object, o -> o instanceof MultipartFile)
+				&& isTypeOrCollection(object, PojoUtil::isUserPojo);
+	}
+
+	@Override
+	public void write(Output output, String key, Object object) throws EncodeException {
+		try {
+			String string = new StringBuilder()
+					.append("Content-Disposition: form-data; name=\"").append(key)
+					.append('"').append(CRLF).append("Content-Type: ")
+					.append(getContentType()).append("; charset=")
+					.append(output.getCharset().name()).append(CRLF).append(CRLF)
+					.append(writeAsString(object)).toString();
+
+			output.write(string);
+		}
+		catch (IOException e) {
+			throw new EncodeException(e.getMessage());
+		}
+	}
+
+	protected abstract MediaType getContentType();
+
+	protected abstract String writeAsString(Object object) throws IOException;
+
+	private boolean isTypeOrCollection(Object object, Predicate<Object> isType) {
+		if (object.getClass().isArray()) {
+			Object[] array = (Object[]) object;
+
+			return array.length > 1 && isType.test(array[0]);
+		}
+		else if (object instanceof Iterable) {
+			Iterable<?> iterable = (Iterable<?>) object;
+			Iterator<?> iterator = iterable.iterator();
+
+			return iterator.hasNext() && isType.test(iterator.next());
+		}
+		else {
+			return isType.test(object);
+		}
+	}
+
+}
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2013-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.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;
+		}
+	}
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013-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.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))));
+	}
+
+}
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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.support;

 import com.netflix.hystrix.HystrixCommand;
@@ -6,8 +22,11 @@ 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.
+ * 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> {
@@ -28,17 +47,21 @@ public class FallbackCommand<T> extends HystrixCommand<T> {
 		this.result = result;
 	}

-	public FallbackCommand(T result, HystrixCommandGroupKey group, int executionIsolationThreadTimeoutInMilliseconds) {
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			int executionIsolationThreadTimeoutInMilliseconds) {
 		super(group, executionIsolationThreadTimeoutInMilliseconds);
 		this.result = result;
 	}

-	public FallbackCommand(T result, HystrixCommandGroupKey group, HystrixThreadPoolKey threadPool) {
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			HystrixThreadPoolKey threadPool) {
 		super(group, threadPool);
 		this.result = result;
 	}

-	public FallbackCommand(T result, HystrixCommandGroupKey group, HystrixThreadPoolKey threadPool, int executionIsolationThreadTimeoutInMilliseconds) {
+	public FallbackCommand(T result, HystrixCommandGroupKey group,
+			HystrixThreadPoolKey threadPool,
+			int executionIsolationThreadTimeoutInMilliseconds) {
 		super(group, threadPool, executionIsolationThreadTimeoutInMilliseconds);
 		this.result = result;
 	}
@@ -52,4 +75,5 @@ public class FallbackCommand<T> extends HystrixCommand<T> {
 	protected T run() throws Exception {
 		return this.result;
 	}
+
 }
@@ -1,24 +1,23 @@
 /*
+ * Copyright 2013-2020 the original author or authors.
 *
- *  * Copyright 2013-2016 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.
+ * 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.util.concurrent.TimeUnit;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
@@ -26,26 +25,65 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 */
@ConfigurationProperties(prefix = "feign.httpclient")
 public class FeignHttpClientProperties {
+
+	/**
+	 * Default value for disabling SSL validation.
+	 */
 	public static final boolean DEFAULT_DISABLE_SSL_VALIDATION = false;
+
+	/**
+	 * Default value for max number od connections.
+	 */
 	public static final int DEFAULT_MAX_CONNECTIONS = 200;
+
+	/**
+	 * Default value for max number od connections per route.
+	 */
 	public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 50;
+
+	/**
+	 * Default value for time to live.
+	 */
 	public static final long DEFAULT_TIME_TO_LIVE = 900L;
+
+	/**
+	 * Default time to live unit.
+	 */
 	public static final TimeUnit DEFAULT_TIME_TO_LIVE_UNIT = TimeUnit.SECONDS;
+
+	/**
+	 * Default value for following redirects.
+	 */
 	public static final boolean DEFAULT_FOLLOW_REDIRECTS = true;
+
+	/**
+	 * Default value for connection timeout.
+	 */
 	public static final int DEFAULT_CONNECTION_TIMEOUT = 2000;
+
+	/**
+	 * Default value for connection timer repeat.
+	 */
 	public static final int DEFAULT_CONNECTION_TIMER_REPEAT = 3000;

 	private boolean disableSslValidation = DEFAULT_DISABLE_SSL_VALIDATION;
+
 	private int maxConnections = DEFAULT_MAX_CONNECTIONS;
+
 	private int maxConnectionsPerRoute = DEFAULT_MAX_CONNECTIONS_PER_ROUTE;
+
 	private long timeToLive = DEFAULT_TIME_TO_LIVE;
+
 	private TimeUnit timeToLiveUnit = DEFAULT_TIME_TO_LIVE_UNIT;
+
 	private boolean followRedirects = DEFAULT_FOLLOW_REDIRECTS;
+
 	private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
+
 	private int connectionTimerRepeat = DEFAULT_CONNECTION_TIMER_REPEAT;

 	public int getConnectionTimerRepeat() {
-		return connectionTimerRepeat;
+		return this.connectionTimerRepeat;
 	}

 	public void setConnectionTimerRepeat(int connectionTimerRepeat) {
@@ -53,7 +91,7 @@ public class FeignHttpClientProperties {
 	}

 	public boolean isDisableSslValidation() {
-		return disableSslValidation;
+		return this.disableSslValidation;
 	}

 	public void setDisableSslValidation(boolean disableSslValidation) {
@@ -61,7 +99,7 @@ public class FeignHttpClientProperties {
 	}

 	public int getMaxConnections() {
-		return maxConnections;
+		return this.maxConnections;
 	}

 	public void setMaxConnections(int maxConnections) {
@@ -69,7 +107,7 @@ public class FeignHttpClientProperties {
 	}

 	public int getMaxConnectionsPerRoute() {
-		return maxConnectionsPerRoute;
+		return this.maxConnectionsPerRoute;
 	}

 	public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
@@ -77,7 +115,7 @@ public class FeignHttpClientProperties {
 	}

 	public long getTimeToLive() {
-		return timeToLive;
+		return this.timeToLive;
 	}

 	public void setTimeToLive(long timeToLive) {
@@ -85,7 +123,7 @@ public class FeignHttpClientProperties {
 	}

 	public TimeUnit getTimeToLiveUnit() {
-		return timeToLiveUnit;
+		return this.timeToLiveUnit;
 	}

 	public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) {
@@ -93,7 +131,7 @@ public class FeignHttpClientProperties {
 	}

 	public boolean isFollowRedirects() {
-		return followRedirects;
+		return this.followRedirects;
 	}

 	public void setFollowRedirects(boolean followRedirects) {
@@ -101,10 +139,11 @@ public class FeignHttpClientProperties {
 	}

 	public int getConnectionTimeout() {
-		return connectionTimeout;
+		return this.connectionTimeout;
 	}

 	public void setConnectionTimeout(int connectionTimeout) {
 		this.connectionTimeout = connectionTimeout;
 	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -24,10 +24,17 @@ import java.util.Map;

 import org.springframework.http.HttpHeaders;

+import static java.util.Optional.ofNullable;
+
 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
-public class FeignUtils {
+public final class FeignUtils {
+
+	private FeignUtils() {
+		throw new IllegalStateException("Can't instantiate a utility class");
+	}

 	static HttpHeaders getHttpHeaders(Map<String, Collection<String>> headers) {
 		HttpHeaders httpHeaders = new HttpHeaders();
@@ -47,4 +54,12 @@ public class FeignUtils {
 		return headers;
 	}

+	static Collection<String> addTemplateParameter(Collection<String> possiblyNull,
+			String paramName) {
+		Collection<String> params = ofNullable(possiblyNull).map(ArrayList::new)
+				.orElse(new ArrayList<>());
+		params.add(String.format("{%s}", paramName));
+		return params;
+	}
+
 }
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013-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.support;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Darren Foong
+ */
+@Component
+public class JsonFormWriter extends AbstractFormWriter {
+
+	@Autowired
+	private ObjectMapper objectMapper;
+
+	@Override
+	protected MediaType getContentType() {
+		return MediaType.APPLICATION_JSON;
+	}
+
+	@Override
+	protected String writeAsString(Object object) throws IOException {
+		return objectMapper.writeValueAsString(object);
+	}
+
+}
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2013-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.support;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * This Jackson module provides support to deserialize Spring {@link Page} objects.
+ *
+ * @author Pascal Büttiker
+ */
+public class PageJacksonModule extends Module {
+
+	@Override
+	public String getModuleName() {
+		return "PageJacksonModule";
+	}
+
+	@Override
+	public Version version() {
+		return new Version(0, 1, 0, "", null, null);
+	}
+
+	@Override
+	public void setupModule(SetupContext context) {
+		context.setMixInAnnotations(Page.class, PageMixIn.class);
+	}
+
+	@JsonDeserialize(as = SimplePageImpl.class)
+	private interface PageMixIn {
+
+	}
+
+	static class SimplePageImpl<T> implements Page<T> {
+
+		private final Page<T> delegate;
+
+		SimplePageImpl(@JsonProperty("content") List<T> content,
+				@JsonProperty("number") int number, @JsonProperty("size") int size,
+				@JsonProperty("totalElements") long totalElements,
+				@JsonProperty("sort") Sort sort) {
+			PageRequest pageRequest;
+			if (sort != null) {
+				pageRequest = PageRequest.of(number, size, sort);
+			}
+			else {
+				pageRequest = PageRequest.of(number, size);
+			}
+			delegate = new PageImpl<>(content, pageRequest, totalElements);
+
+		}
+
+		@JsonProperty
+		@Override
+		public int getTotalPages() {
+			return delegate.getTotalPages();
+		}
+
+		@JsonProperty
+		@Override
+		public long getTotalElements() {
+			return delegate.getTotalElements();
+		}
+
+		@JsonProperty
+		@Override
+		public int getNumber() {
+			return delegate.getNumber();
+		}
+
+		@JsonProperty
+		@Override
+		public int getSize() {
+			return delegate.getSize();
+		}
+
+		@JsonProperty
+		@Override
+		public int getNumberOfElements() {
+			return delegate.getNumberOfElements();
+		}
+
+		@JsonProperty
+		@Override
+		public List<T> getContent() {
+			return delegate.getContent();
+		}
+
+		@JsonProperty
+		@Override
+		public boolean hasContent() {
+			return delegate.hasContent();
+		}
+
+		@JsonIgnore
+		@Override
+		public Sort getSort() {
+			return delegate.getSort();
+		}
+
+		@JsonProperty
+		@Override
+		public boolean isFirst() {
+			return delegate.isFirst();
+		}
+
+		@JsonProperty
+		@Override
+		public boolean isLast() {
+			return delegate.isLast();
+		}
+
+		@JsonIgnore
+		@Override
+		public boolean hasNext() {
+			return delegate.hasNext();
+		}
+
+		@JsonIgnore
+		@Override
+		public boolean hasPrevious() {
+			return delegate.hasPrevious();
+		}
+
+		@JsonIgnore
+		@Override
+		public Pageable nextPageable() {
+			return delegate.nextPageable();
+		}
+
+		@JsonIgnore
+		@Override
+		public Pageable previousPageable() {
+			return delegate.previousPageable();
+		}
+
+		@JsonIgnore
+		@Override
+		public <S> Page<S> map(Function<? super T, ? extends S> converter) {
+			return delegate.map(converter);
+		}
+
+		@JsonIgnore
+		@Override
+		public Iterator<T> iterator() {
+			return delegate.iterator();
+		}
+
+	}
+
+}
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013-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.support;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import feign.RequestTemplate;
+import feign.codec.EncodeException;
+import feign.codec.Encoder;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Provides support for encoding spring Pageable via composition.
+ *
+ * @author Pascal Büttiker
+ */
+public class PageableSpringEncoder implements Encoder {
+
+	private final Encoder delegate;
+
+	/**
+	 * Page index parameter name.
+	 */
+	private String pageParameter = "page";
+
+	/**
+	 * Page size parameter name.
+	 */
+	private String sizeParameter = "size";
+
+	/**
+	 * Sort parameter name.
+	 */
+	private String sortParameter = "sort";
+
+	/**
+	 * Creates a new PageableSpringEncoder with the given delegate for fallback. If no
+	 * delegate is provided and this encoder cant handle the request, an EncodeException
+	 * is thrown.
+	 * @param delegate The optional delegate.
+	 */
+	public PageableSpringEncoder(Encoder delegate) {
+		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 {
+
+		if (supports(object)) {
+			if (object instanceof Pageable) {
+				Pageable pageable = (Pageable) object;
+
+				if (pageable.isPaged()) {
+					template.query(pageParameter, pageable.getPageNumber() + "");
+					template.query(sizeParameter, pageable.getPageSize() + "");
+				}
+
+				if (pageable.getSort() != null) {
+					applySort(template, pageable.getSort());
+				}
+			}
+			else if (object instanceof Sort) {
+				Sort sort = (Sort) object;
+				applySort(template, sort);
+			}
+		}
+		else {
+			if (delegate != null) {
+				delegate.encode(object, bodyType, template);
+			}
+			else {
+				throw new EncodeException(
+						"PageableSpringEncoder does not support the given object "
+								+ object.getClass()
+								+ " and no delegate was provided for fallback!");
+			}
+		}
+	}
+
+	private void applySort(RequestTemplate template, Sort sort) {
+		Collection<String> existingSorts = template.queries().get("sort");
+		List<String> sortQueries = existingSorts != null ? new ArrayList<>(existingSorts)
+				: new ArrayList<>();
+		if (!sortParameter.equals("sort")) {
+			existingSorts = template.queries().get(sortParameter);
+			if (existingSorts != null) {
+				sortQueries.addAll(existingSorts);
+			}
+		}
+		for (Sort.Order order : sort) {
+			sortQueries.add(order.getProperty() + "," + order.getDirection());
+		}
+		if (!sortQueries.isEmpty()) {
+			template.query(sortParameter, sortQueries);
+		}
+	}
+
+	protected boolean supports(Object object) {
+		return object instanceof Pageable || object instanceof Sort;
+	}
+
+}
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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.support;

 import java.io.IOException;
@@ -5,20 +21,21 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.LinkedList;

+import feign.FeignException;
+import feign.Response;
+import feign.codec.Decoder;
+
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

-import feign.FeignException;
-import feign.Response;
-import feign.codec.Decoder;
-
 /**
 * Decoder adds compatibility for Spring MVC's ResponseEntity to any other decoder via
 * composition.
- * @author chadjaros
+ *
+ * @author chad jaros
 */
 public class ResponseEntityDecoder implements Decoder {

@@ -29,12 +46,12 @@ public class ResponseEntityDecoder implements Decoder {
 	}

 	@Override
-	public Object decode(final Response response, Type type) throws IOException,
-			FeignException {
+	public Object decode(final Response response, Type type)
+			throws IOException, FeignException {

 		if (isParameterizeHttpEntity(type)) {
 			type = ((ParameterizedType) type).getActualTypeArguments()[0];
-			Object decodedObject = decoder.decode(response, type);
+			Object decodedObject = this.decoder.decode(response, type);

 			return createResponse(decodedObject, response);
 		}
@@ -42,7 +59,7 @@ public class ResponseEntityDecoder implements Decoder {
 			return createResponse(null, response);
 		}
 		else {
-			return decoder.decode(response, type);
+			return this.decoder.decode(response, type);
 		}
 	}

@@ -69,7 +86,8 @@ public class ResponseEntityDecoder implements Decoder {
 			headers.put(key, new LinkedList<>(response.headers().get(key)));
 		}

-		return new ResponseEntity<>((T) instance, headers, HttpStatus.valueOf(response
-				.status()));
+		return new ResponseEntity<>((T) instance, headers,
+				HttpStatus.valueOf(response.status()));
 	}
-}
+
+}
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013-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.support;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.module.SimpleDeserializers;
+import com.fasterxml.jackson.databind.module.SimpleSerializers;
+
+import org.springframework.data.domain.Sort;
+
+/**
+ * This Jackson module provides support for serializing and deserializing for Spring
+ * {@link Sort} object.
+ *
+ * @author Can Bezmen
+ */
+public class SortJacksonModule extends Module {
+
+	@Override
+	public String getModuleName() {
+		return "SortModule";
+	}
+
+	@Override
+	public Version version() {
+		return new Version(0, 1, 0, "", null, null);
+	}
+
+	@Override
+	public void setupModule(SetupContext context) {
+		SimpleSerializers serializers = new SimpleSerializers();
+		serializers.addSerializer(Sort.class, new SortJsonComponent.SortSerializer());
+		context.addSerializers(serializers);
+
+		SimpleDeserializers deserializers = new SimpleDeserializers();
+		deserializers.addDeserializer(Sort.class,
+				new SortJsonComponent.SortDeserializer());
+		context.addDeserializers(deserializers);
+	}
+
+}
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2013-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.support;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.TreeNode;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import feign.codec.EncodeException;
+
+import org.springframework.data.domain.Sort;
+
+/**
+ * This class provides provides support for serializing and deserializing for Spring
+ * {@link Sort} object.
+ *
+ * @author Can Bezmen
+ */
+public class SortJsonComponent {
+
+	public static class SortSerializer extends JsonSerializer<Sort> {
+
+		@Override
+		public void serialize(Sort value, JsonGenerator gen,
+				SerializerProvider serializers) throws IOException {
+			gen.writeStartArray();
+			value.iterator().forEachRemaining(v -> {
+				try {
+					gen.writeObject(v);
+				}
+				catch (IOException e) {
+					throw new EncodeException("Couldn't serialize object " + v);
+				}
+			});
+			gen.writeEndArray();
+		}
+
+		@Override
+		public Class<Sort> handledType() {
+			return Sort.class;
+		}
+
+	}
+
+	public static class SortDeserializer extends JsonDeserializer<Sort> {
+
+		@Override
+		public Sort deserialize(JsonParser jsonParser,
+				DeserializationContext deserializationContext) throws IOException {
+			TreeNode treeNode = jsonParser.getCodec().readTree(jsonParser);
+			if (treeNode.isArray()) {
+				ArrayNode arrayNode = (ArrayNode) treeNode;
+				List<Sort.Order> orders = new ArrayList<>();
+				for (JsonNode jsonNode : arrayNode) {
+					Sort.Order order = new Sort.Order(
+							Sort.Direction.valueOf(jsonNode.get("direction").textValue()),
+							jsonNode.get("property").textValue());
+					orders.add(order);
+				}
+				return Sort.by(orders);
+			}
+			return null;
+		}
+
+		@Override
+		public Class<Sort> handledType() {
+			return Sort.class;
+		}
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,19 +12,21 @@
 * 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 static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;

+import feign.FeignException;
+import feign.Response;
+import feign.codec.DecodeException;
+import feign.codec.Decoder;
+
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.http.HttpHeaders;
@@ -32,10 +34,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.web.client.HttpMessageConverterExtractor;

-import feign.FeignException;
-import feign.Response;
-import feign.codec.DecodeException;
-import feign.codec.Decoder;
+import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;

 /**
 * @author Spencer Gibb
@@ -59,11 +58,12 @@ public class SpringDecoder implements Decoder {

 			return extractor.extractData(new FeignResponseAdapter(response));
 		}
-		throw new DecodeException(
-				"type is not an instance of Class or ParameterizedType: " + type);
+		throw new DecodeException(response.status(),
+				"type is not an instance of Class or ParameterizedType: " + type,
+				response.request());
 	}

-	private class FeignResponseAdapter implements ClientHttpResponse {
+	private final class FeignResponseAdapter implements ClientHttpResponse {

 		private final Response response;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,7 +12,6 @@
 * 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;
@@ -26,39 +25,53 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Objects;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
-import org.springframework.web.multipart.MultipartFile;
-
+import feign.Request;
 import feign.RequestTemplate;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
+import org.springframework.http.HttpHeaders;
+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;

 import static org.springframework.cloud.openfeign.support.FeignUtils.getHeaders;
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;

 /**
 * @author Spencer Gibb
- * @author ScienJus
+ * @author Scien Jus
+ * @author Ahmad Mozafarnia
+ * @author Aaron Whiteside
+ * @author Darren Foong
 */
 public class SpringEncoder implements Encoder {

 	private static final Log log = LogFactory.getLog(SpringEncoder.class);

-	private final SpringFormEncoder springFormEncoder = new SpringFormEncoder();
+	private final SpringFormEncoder springFormEncoder;

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

 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
+		this.springFormEncoder = new SpringFormEncoder();
+		this.messageConverters = messageConverters;
+	}
+
+	public SpringEncoder(SpringFormEncoder springFormEncoder,
+			ObjectFactory<HttpMessageConverters> messageConverters) {
+		this.springFormEncoder = springFormEncoder;
 		this.messageConverters = messageConverters;
 	}

@@ -67,8 +80,8 @@ public class SpringEncoder implements Encoder {
 			throws EncodeException {
 		// template.body(conversionService.convert(object, String.class));
 		if (requestBody != null) {
-			Class<?> requestType = requestBody.getClass();
-			Collection<String> contentTypes = request.headers().get("Content-Type");
+			Collection<String> contentTypes = request.headers()
+					.get(HttpEncoding.CONTENT_TYPE);

 			MediaType requestContentType = null;
 			if (contentTypes != null && !contentTypes.isEmpty()) {
@@ -76,43 +89,36 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}

-			if (bodyType != null && bodyType.equals(MultipartFile.class)) {
-				if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
-					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);
+			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");
 				}
 			}

-			for (HttpMessageConverter<?> messageConverter : this.messageConverters
+			for (HttpMessageConverter messageConverter : this.messageConverters
 					.getObject().getConverters()) {
-				if (messageConverter.canWrite(requestType, requestContentType)) {
-					if (log.isDebugEnabled()) {
-						if (requestContentType != null) {
-							log.debug("Writing [" + requestBody + "] as \""
-									+ requestContentType + "\" using ["
-									+ messageConverter + "]");
-						}
-						else {
-							log.debug("Writing [" + requestBody + "] using ["
-									+ messageConverter + "]");
-						}
-
+				FeignOutputMessage outputMessage;
+				try {
+					if (messageConverter instanceof GenericHttpMessageConverter) {
+						outputMessage = checkAndWrite(requestBody, bodyType,
+								requestContentType,
+								(GenericHttpMessageConverter) messageConverter, request);
 					}
-
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-					try {
-						@SuppressWarnings("unchecked")
-						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
-						copy.write(requestBody, requestContentType, outputMessage);
-					}
-					catch (IOException ex) {
-						throw new EncodeException("Error converting request body", ex);
+					else {
+						outputMessage = checkAndWrite(requestBody, requestContentType,
+								messageConverter, request);
 					}
+				}
+				catch (IOException | HttpMessageConversionException ex) {
+					throw new EncodeException("Error converting request body", ex);
+				}
+				if (outputMessage != null) {
 					// clear headers
 					request.headers(null);
 					// converters can modify headers, so update the request
@@ -123,18 +129,22 @@ public class SpringEncoder implements Encoder {
 					Charset charset;
 					if (messageConverter instanceof ByteArrayHttpMessageConverter) {
 						charset = null;
-					} else if (messageConverter instanceof ProtobufHttpMessageConverter &&
-							ProtobufHttpMessageConverter.PROTOBUF.isCompatibleWith(outputMessage.getHeaders().getContentType())) {
+					}
+					else if (messageConverter instanceof ProtobufHttpMessageConverter
+							&& ProtobufHttpMessageConverter.PROTOBUF.isCompatibleWith(
+									outputMessage.getHeaders().getContentType())) {
 						charset = null;
-					} else {
+					}
+					else {
 						charset = StandardCharsets.UTF_8;
 					}
-					request.body(outputMessage.getOutputStream().toByteArray(), charset);
+					request.body(Request.Body.encoded(
+							outputMessage.getOutputStream().toByteArray(), charset));
 					return;
 				}
 			}
 			String message = "Could not write request: no suitable HttpMessageConverter "
-					+ "found for request type [" + requestType.getName() + "]";
+					+ "found for request type [" + requestBody.getClass().getName() + "]";
 			if (requestContentType != null) {
 				message += " and content type [" + requestContentType + "]";
 			}
@@ -142,14 +152,57 @@ public class SpringEncoder implements Encoder {
 		}
 	}

-	private class FeignOutputMessage implements HttpOutputMessage {
+	@SuppressWarnings("unchecked")
+	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType,
+			HttpMessageConverter converter, RequestTemplate request) throws IOException {
+		if (converter.canWrite(body.getClass(), contentType)) {
+			logBeforeWrite(body, contentType, converter);
+			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+			converter.write(body, contentType, outputMessage);
+			return outputMessage;
+		}
+		else {
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private FeignOutputMessage checkAndWrite(Object body, Type genericType,
+			MediaType contentType, GenericHttpMessageConverter converter,
+			RequestTemplate request) throws IOException {
+		if (converter.canWrite(genericType, body.getClass(), contentType)) {
+			logBeforeWrite(body, contentType, converter);
+			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+			converter.write(body, genericType, contentType, outputMessage);
+			return outputMessage;
+		}
+		else {
+			return null;
+		}
+	}
+
+	private void logBeforeWrite(Object requestBody, MediaType requestContentType,
+			HttpMessageConverter messageConverter) {
+		if (log.isDebugEnabled()) {
+			if (requestContentType != null) {
+				log.debug("Writing [" + requestBody + "] as \"" + requestContentType
+						+ "\" using [" + messageConverter + "]");
+			}
+			else {
+				log.debug(
+						"Writing [" + requestBody + "] using [" + messageConverter + "]");
+			}
+		}
+	}
+
+	private final class FeignOutputMessage implements HttpOutputMessage {

 		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

 		private final HttpHeaders httpHeaders;

 		private FeignOutputMessage(RequestTemplate request) {
-			httpHeaders = getHttpHeaders(request.headers());
+			this.httpHeaders = getHttpHeaders(request.headers());
 		}

 		@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign.support;

 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,20 +28,35 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+
+import feign.Contract;
+import feign.Feign;
+import feign.MethodMetadata;
+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.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,16 +64,18 @@ import org.springframework.web.bind.annotation.RequestMethod;

 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
+import static org.springframework.cloud.openfeign.support.FeignUtils.addTemplateParameter;
 import static org.springframework.core.annotation.AnnotatedElementUtils.findMergedAnnotation;

-import feign.Contract;
-import feign.Feign;
-import feign.MethodMetadata;
-import feign.Param;
-
 /**
 * @author Spencer Gibb
 * @author Abhijit Sarkar
+ * @author Halvdan Hoem Grelland
+ * @author Aram Peres
+ * @author Olga Maciaszek-Sharma
+ * @author Aaron Whiteside
+ * @author Artyom Romanenko
+ * @author Darren Foong
 */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -66,13 +84,22 @@ public class SpringMvcContract extends Contract.BaseContract

 	private static final String CONTENT_TYPE = "Content-Type";

+	private static final TypeDescriptor STRING_TYPE_DESCRIPTOR = TypeDescriptor
+			.valueOf(String.class);
+
+	private static final TypeDescriptor ITERABLE_TYPE_DESCRIPTOR = TypeDescriptor
+			.valueOf(Iterable.class);
+
 	private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();

 	private final Map<Class<? extends Annotation>, AnnotatedParameterProcessor> annotatedArgumentProcessors;
+
 	private final Map<String, Method> processedMethods = new HashMap<>();

 	private final ConversionService conversionService;
-	private final Param.Expander expander;
+
+	private final ConvertingExpanderFactory convertingExpanderFactory;
+
 	private ResourceLoader resourceLoader = new DefaultResourceLoader();

 	public SpringMvcContract() {
@@ -91,16 +118,48 @@ public class SpringMvcContract extends Contract.BaseContract
 				"Parameter processors can not be null.");
 		Assert.notNull(conversionService, "ConversionService can not be null.");

-		List<AnnotatedParameterProcessor> processors;
-		if (!annotatedParameterProcessors.isEmpty()) {
-			processors = new ArrayList<>(annotatedParameterProcessors);
-		}
-		else {
-			processors = getDefaultAnnotatedArgumentsProcessors();
-		}
+		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
+		processors.addAll(annotatedParameterProcessors);
+
 		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
-		this.expander = new ConvertingExpander(conversionService);
+		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
+	}
+
+	private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) {
+		Parameter parameter = method.getParameters()[paramIndex];
+		MethodParameter methodParameter = MethodParameter.forParameter(parameter);
+		TypeDescriptor typeDescriptor = new TypeDescriptor(methodParameter);
+
+		// Feign applies the Param.Expander to each element of an Iterable, so in those
+		// cases we need to provide a TypeDescriptor of the element.
+		if (typeDescriptor.isAssignableTo(ITERABLE_TYPE_DESCRIPTOR)) {
+			TypeDescriptor elementTypeDescriptor = getElementTypeDescriptor(
+					typeDescriptor);
+
+			checkState(elementTypeDescriptor != null,
+					"Could not resolve element type of Iterable type %s. Not declared?",
+					typeDescriptor);
+
+			typeDescriptor = elementTypeDescriptor;
+		}
+		return typeDescriptor;
+	}
+
+	private static TypeDescriptor getElementTypeDescriptor(
+			TypeDescriptor typeDescriptor) {
+		TypeDescriptor elementTypeDescriptor = typeDescriptor.getElementTypeDescriptor();
+		// that means it's not a collection but it is iterable, gh-135
+		if (elementTypeDescriptor == null
+				&& Iterable.class.isAssignableFrom(typeDescriptor.getType())) {
+			ResolvableType type = typeDescriptor.getResolvableType().as(Iterable.class)
+					.getGeneric(0);
+			if (type.resolve() == null) {
+				return null;
+			}
+			return new TypeDescriptor(type, null, typeDescriptor.getAnnotations());
+		}
+		return elementTypeDescriptor;
 	}

 	@Override
@@ -113,15 +172,14 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (clz.getInterfaces().length == 0) {
 			RequestMapping classAnnotation = findMergedAnnotation(clz,
 					RequestMapping.class);
-			if (classAnnotation != null) {
+			if (classAnnotation != null && classAnnotation.value().length > 0) {
 				// Prepend path from class annotation if specified
-				if (classAnnotation.value().length > 0) {
-					String pathValue = emptyToNull(classAnnotation.value()[0]);
+				String pathValue = emptyToNull(classAnnotation.value()[0]);
+				if (pathValue != null) {
 					pathValue = resolve(pathValue);
-					if (!pathValue.startsWith("/")) {
-						pathValue = "/" + pathValue;
+					if (!pathValue.equals("/")) {
+						data.template().uri(pathValue);
 					}
-					data.template().insert(0, pathValue);
 				}
 			}
 		}
@@ -167,7 +225,7 @@ public class SpringMvcContract extends Contract.BaseContract
 			methods = new RequestMethod[] { RequestMethod.GET };
 		}
 		checkOne(method, methods, "method");
-		data.template().method(methods[0].name());
+		data.template().method(Request.HttpMethod.valueOf(methods[0].name()));

 		// path
 		checkAtMostOne(method, methodMapping.value(), "value");
@@ -175,12 +233,9 @@ public class SpringMvcContract extends Contract.BaseContract
 			String pathValue = emptyToNull(methodMapping.value()[0]);
 			if (pathValue != null) {
 				pathValue = resolve(pathValue);
-				// Append path from @RequestMapping if value is present on method
-				if (!pathValue.startsWith("/")
-						&& !data.template().toString().endsWith("/")) {
-					pathValue = "/" + pathValue;
+				if (!pathValue.equals("/")) {
+					data.template().uri(pathValue, true);
 				}
-				data.template().append(pathValue);
 			}
 		}

@@ -239,10 +294,18 @@ public class SpringMvcContract extends Contract.BaseContract
 						processParameterAnnotation, method);
 			}
 		}
-		if (isHttpAnnotation && data.indexToExpander().get(paramIndex) == null
-				&& this.conversionService.canConvert(
-						method.getParameterTypes()[paramIndex], String.class)) {
-			data.indexToExpander().put(paramIndex, this.expander);
+
+		if (!isMultipartFormData(data) && isHttpAnnotation
+				&& data.indexToExpander().get(paramIndex) == null) {
+			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
+			if (this.conversionService.canConvert(typeDescriptor,
+					STRING_TYPE_DESCRIPTOR)) {
+				Param.Expander expander = this.convertingExpanderFactory
+						.getExpander(typeDescriptor);
+				if (expander != null) {
+					data.indexToExpander().put(paramIndex, expander);
+				}
+			}
 		}
 		return isHttpAnnotation;
 	}
@@ -275,7 +338,7 @@ public class SpringMvcContract extends Contract.BaseContract
 				int index = header.indexOf('=');
 				if (!header.contains("!=") && index >= 0) {
 					md.template().header(resolve(header.substring(0, index)),
-						resolve(header.substring(index + 1).trim()));
+							resolve(header.substring(index + 1).trim()));
 				}
 			}
 		}
@@ -294,9 +357,12 @@ 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;
 	}
@@ -319,13 +385,63 @@ public class SpringMvcContract extends Contract.BaseContract
 				parameterAnnotation.annotationType(), null);
 	}

-	private boolean shouldAddParameterName(int parameterIndex, Type[] parameterTypes, String[] parameterNames) {
+	private boolean shouldAddParameterName(int parameterIndex, Type[] parameterTypes,
+			String[] parameterNames) {
 		// has a parameter name
 		return parameterNames != null && parameterNames.length > parameterIndex
-				// has a type
+		// has a type
 				&& parameterTypes != null && parameterTypes.length > parameterIndex;
 	}

+	private boolean isMultipartFormData(MethodMetadata data) {
+		Collection<String> contentTypes = data.template().headers()
+				.get(HttpEncoding.CONTENT_TYPE);
+
+		if (contentTypes != null && !contentTypes.isEmpty()) {
+			String type = contentTypes.iterator().next();
+			return Objects.equals(MediaType.valueOf(type), MediaType.MULTIPART_FORM_DATA);
+		}
+
+		return false;
+	}
+
+	/**
+	 * @deprecated Not used internally anymore. Will be removed in the future.
+	 */
+	@Deprecated
+	public static class ConvertingExpander implements Param.Expander {
+
+		private final ConversionService conversionService;
+
+		public ConvertingExpander(ConversionService conversionService) {
+			this.conversionService = conversionService;
+		}
+
+		@Override
+		public String expand(Object value) {
+			return this.conversionService.convert(value, String.class);
+		}
+
+	}
+
+	private static class ConvertingExpanderFactory {
+
+		private final ConversionService conversionService;
+
+		ConvertingExpanderFactory(ConversionService conversionService) {
+			this.conversionService = conversionService;
+		}
+
+		Param.Expander getExpander(TypeDescriptor typeDescriptor) {
+			return value -> {
+				Object converted = this.conversionService.convert(value, typeDescriptor,
+						STRING_TYPE_DESCRIPTOR);
+				return (String) converted;
+			};
+		}
+
+	}
+
 	private class SimpleAnnotatedParameterContext
 			implements AnnotatedParameterProcessor.AnnotatedParameterContext {

@@ -333,7 +449,7 @@ public class SpringMvcContract extends Contract.BaseContract

 		private final int parameterIndex;

-		public SimpleAnnotatedParameterContext(MethodMetadata methodMetadata,
+		SimpleAnnotatedParameterContext(MethodMetadata methodMetadata,
 				int parameterIndex) {
 			this.methodMetadata = methodMetadata;
 			this.parameterIndex = parameterIndex;
@@ -357,22 +473,9 @@ public class SpringMvcContract extends Contract.BaseContract
 		@Override
 		public Collection<String> setTemplateParameter(String name,
 				Collection<String> rest) {
-			return addTemplatedParam(rest, name);
-		}
-	}
-
-	public static class ConvertingExpander implements Param.Expander {
-
-		private final ConversionService conversionService;
-
-		public ConvertingExpander(ConversionService conversionService) {
-			this.conversionService = conversionService;
-		}
-
-		@Override
-		public String expand(Object value) {
-			return this.conversionService.convert(value, String.class);
+			return addTemplateParameter(rest, name);
 		}

 	}
+
 }
@@ -1,33 +1,42 @@
-{"groups": [
-], "properties": [
-	{
-	    "name": "feign.hystrix.enabled",
-	    "type": "java.lang.Boolean",
-	    "description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
-	    "defaultValue": "false"
-	},
-	{
-		"name": "feign.httpclient.enabled",
-		"type": "java.lang.Boolean",
-		"description": "Enables the use of the Apache HTTP Client by Feign.",
-		"defaultValue": "true"
-	},
-	{
-		"name": "feign.okhttp.enabled",
-		"type": "java.lang.Boolean",
-		"description": "Enables the use of the OK HTTP Client by Feign.",
-		"defaultValue": "false"
-	},
-	{
-		"name": "feign.compression.response.enabled",
-		"type": "java.lang.Boolean",
-		"description": "Enables the response from Feign to be compressed.",
-		"defaultValue": "false"
-	},
-	{
-		"name": "feign.compression.request.enabled",
-		"type": "java.lang.Boolean",
-		"description": "Enables the request sent by Feign to be compressed.",
-		"defaultValue": "false"
-	}
-]}
+{
+	"groups": [
+	],
+	"properties": [
+		{
+			"name": "feign.hystrix.enabled",
+			"type": "java.lang.Boolean",
+			"description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
+			"defaultValue": "false"
+		},
+		{
+			"name": "feign.httpclient.enabled",
+			"type": "java.lang.Boolean",
+			"description": "Enables the use of the Apache HTTP Client by Feign.",
+			"defaultValue": "true"
+		},
+		{
+			"name": "feign.okhttp.enabled",
+			"type": "java.lang.Boolean",
+			"description": "Enables the use of the OK HTTP Client by Feign.",
+			"defaultValue": "false"
+		},
+		{
+			"name": "feign.compression.response.enabled",
+			"type": "java.lang.Boolean",
+			"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",
+			"description": "Enables the request sent by Feign to be compressed.",
+			"defaultValue": "false"
+		}
+	]
+}
@@ -1,5 +1,7 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration,\
+org.springframework.cloud.openfeign.hateoas.FeignHalAutoConfiguration,\
 org.springframework.cloud.openfeign.FeignAutoConfiguration,\
 org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\
-org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration
+org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration,\
+org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2013-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.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"));
+		}
+
+	}
+
+}
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013-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.Encoder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = EnableFeignClientsSpringDataTests.PlainConfiguration.class)
+@DirtiesContext
+public class EnableFeignClientsSpringDataTests {
+
+	@Autowired
+	private FeignContext feignContext;
+
+	@Test
+	public void encoderDefaultCorrect() {
+
+		PageableSpringEncoder.class
+				.cast(this.feignContext.getInstance("foo", Encoder.class));
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			FeignAutoConfiguration.class })
+	protected static class PlainConfiguration {
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,24 +12,10 @@
 * 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 org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-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.SpringEncoder;
-import org.springframework.cloud.openfeign.support.SpringMvcContract;
-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 feign.Contract;
 import feign.Feign;
 import feign.Logger;
@@ -37,50 +23,74 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.optionals.OptionalDecoder;
 import feign.slf4j.Slf4jLogger;
+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.netflix.archaius.ArchaiusAutoConfiguration;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.cloud.openfeign.support.SpringMvcContract;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 /**
 * @author Spencer Gibb
 */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = EnableFeignClientsTests.PlainConfiguration.class)
-@DirtiesContext
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "spring-data-commons-*.jar" })
 public class EnableFeignClientsTests {

-	@Autowired
-	private FeignContext feignContext;
+	private ConfigurableApplicationContext context;
+
+	@Before
+	public void setUp() {
+		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("debug=true", "feign.httpclient.enabled=false")
+				.sources(EnableFeignClientsTests.PlainConfiguration.class).run();
+	}
+
+	@After
+	public void tearDown() {
+		if (context != null) {
+			context.close();
+		}
+	}

 	@Test
 	public void decoderDefaultCorrect() {
-		OptionalDecoder.class
-				.cast(this.feignContext.getInstance("foo", Decoder.class));
+		OptionalDecoder.class.cast(this.context.getBeansOfType(Decoder.class).get(0));
 	}

 	@Test
 	public void encoderDefaultCorrect() {
-		SpringEncoder.class.cast(this.feignContext.getInstance("foo", Encoder.class));
+		SpringEncoder.class.cast(this.context.getBeansOfType(Encoder.class).get(0));
 	}

 	@Test
 	public void loggerDefaultCorrect() {
-		Slf4jLogger.class.cast(this.feignContext.getInstance("foo", Logger.class));
+		Slf4jLogger.class.cast(this.context.getBeansOfType(Logger.class).get(0));
 	}

 	@Test
 	public void contractDefaultCorrect() {
-		SpringMvcContract.class
-				.cast(this.feignContext.getInstance("foo", Contract.class));
+		SpringMvcContract.class.cast(this.context.getBeansOfType(Contract.class).get(0));
 	}

 	@Test
 	public void builderDefaultCorrect() {
-		Feign.Builder.class
-				.cast(this.feignContext.getInstance("foo", Feign.Builder.class));
+		Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}

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

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -24,17 +24,20 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

+import feign.hystrix.FallbackFactory;
 import org.hamcrest.Matchers;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
+
 import org.springframework.cloud.openfeign.testclients.TestClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.ReflectionUtils;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Sven Döring
 */
@@ -65,14 +68,14 @@ public class FeignClientBuilderTests {
 				fieldName);
 		ReflectionUtils.makeAccessible(field);
 		final Object value = ReflectionUtils.getField(field, factoryBean);
-		Assert.assertEquals("Expected value for the field '" + fieldName + "':",
-				expectedValue, value);
+		assertThat(value).as("Expected value for the field '" + fieldName + "':")
+				.isEqualTo(expectedValue);
 	}

 	@Before
 	public void setUp() {
 		this.applicationContext = Mockito.mock(ApplicationContext.class);
-		this.feignClientBuilder = new FeignClientBuilder(applicationContext);
+		this.feignClientBuilder = new FeignClientBuilder(this.applicationContext);
 	}

 	@Test
@@ -91,20 +94,22 @@ public class FeignClientBuilderTests {
 		// on this builder class.
 		// (2) Or a new field was added and the builder class has to be extended with this
 		// new field.
-		Assert.assertThat(methodNames, Matchers.contains("decode404", "fallback",
-				"fallbackFactory", "name", "path", "url"));
+		assertThat(methodNames).containsExactly("contextId", "decode404", "fallback",
+				"fallbackFactory", "name", "path", "url");
 	}

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

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

 		// and:
 		assertFactoryBeanField(builder, "url",
@@ -122,37 +127,60 @@ public class FeignClientBuilderTests {
 	@Test
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
-		final FeignClientBuilder.Builder builder = feignClientBuilder
-				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
-				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
-				.url("Url/");
+		final FeignClientBuilder.Builder builder = this.feignClientBuilder
+				.forType(TestFeignClient.class, "TestClient").inheritParentContext(false)
+				.fallback(TestFeignClientFallback.class)
+				.fallbackFactory(TestFeignClientFallbackFactory.class).decode404(true)
+				.url("Url/").path("/Path").contextId("TestContext");

 		// then:
-		assertFactoryBeanField(builder, "applicationContext", applicationContext);
-		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
+		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
+		assertFactoryBeanField(builder, "type", TestFeignClient.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);
+		assertFactoryBeanField(builder, "inheritParentContext", false);
+		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
+		assertFactoryBeanField(builder, "fallbackFactory",
+				TestFeignClientFallbackFactory.class);
 	}

 	@Test
 	public void forType_build() {
 		// given:
-		Mockito.when(applicationContext.getBean(FeignContext.class))
+		Mockito.when(this.applicationContext.getBean(FeignContext.class))
 				.thenThrow(new ClosedFileSystemException()); // throw an unusual exception
 																// in the
 																// FeignClientFactoryBean
-		final FeignClientBuilder.Builder builder = feignClientBuilder
+		final FeignClientBuilder.Builder builder = this.feignClientBuilder
 				.forType(TestClient.class, "TestClient");

 		// expect: 'the build will fail right after calling build() with the mocked
 		// unusual exception'
-		thrown.expect(Matchers.isA(ClosedFileSystemException.class));
+		this.thrown.expect(Matchers.isA(ClosedFileSystemException.class));
 		builder.build();
 	}
+
+	private interface TestFeignClient {
+
+	}
+
+	private class TestFeignClientFallback implements TestFeignClient {
+
+	}
+
+	private class TestFeignClientFallbackFactory
+			implements FallbackFactory<TestFeignClient> {
+
+		@Override
+		public TestFeignClientFallback create(Throwable throwable) {
+			return new TestFeignClientFallback();
+		}
+
+	}
+
 }
@@ -0,0 +1,172 @@
+/*
+ * 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(
+				ReflectionTestUtils.getField(dispatch.get(key), "asyncResponseHandler"),
+				"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;
+		}
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,16 +16,30 @@

 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 java.util.Arrays;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;

 /**
 * @author Spencer Gibb
@@ -42,33 +56,107 @@ public class FeignClientFactoryTests {
 				getSpec("bar", BarConfig.class)));

 		Foo foo = context.getInstance("foo", Foo.class);
-		assertThat("foo was null", foo, is(notNullValue()));
+		assertThat(foo).as("foo was null").isNotNull();

 		Bar bar = context.getInstance("bar", Bar.class);
-		assertThat("bar was null", bar, is(notNullValue()));
+		assertThat(bar).as("bar was null").isNotNull();

 		Bar foobar = context.getInstance("foo", Bar.class);
-		assertThat("bar was not null", foobar, is(nullValue()));
+		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});
+		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
 		Foo foo() {
 			return new Foo();
 		}

 	}
-	static class Foo{}
+
+	static class Foo {
+
+	}

 	static class BarConfig {
+
 		@Bean
 		Bar bar() {
 			return new Bar();
 		}
+
 	}
-	static class Bar{}
+
+	static class Bar {
+
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -12,34 +12,15 @@
 * 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 org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-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.SpringEncoder;
-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;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 import feign.Contract;
+import feign.ExceptionPropagationPolicy;
 import feign.Feign;
 import feign.Logger;
+import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestLine;
@@ -51,7 +32,26 @@ 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.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;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Spencer Gibb
@@ -72,8 +72,8 @@ public class FeignClientOverrideDefaultsTests {

 	@Test
 	public void clientsAvailable() {
-		assertNotNull(this.foo);
-		assertNotNull(this.bar);
+		assertThat(this.foo).isNotNull();
+		assertThat(this.bar).isNotNull();
 	}

 	@Test
@@ -85,7 +85,7 @@ public class FeignClientOverrideDefaultsTests {
 	@Test
 	public void overrideEncoder() {
 		Encoder.Default.class.cast(this.context.getInstance("foo", Encoder.class));
-		SpringEncoder.class.cast(this.context.getInstance("bar", Encoder.class));
+		PageableSpringEncoder.class.cast(this.context.getInstance("bar", Encoder.class));
 	}

 	@Test
@@ -102,52 +102,88 @@ public class FeignClientOverrideDefaultsTests {

 	@Test
 	public void overrideLoggerLevel() {
-		assertNull(this.context.getInstance("foo", Logger.Level.class));
-		assertEquals(Logger.Level.HEADERS,
-				this.context.getInstance("bar", Logger.Level.class));
+		assertThat(this.context.getInstance("foo", Logger.Level.class)).isNull();
+		assertThat(this.context.getInstance("bar", Logger.Level.class))
+				.isEqualTo(Logger.Level.HEADERS);
 	}

 	@Test
 	public void overrideRetryer() {
-		assertEquals(Retryer.NEVER_RETRY, this.context.getInstance("foo", Retryer.class));
+		assertThat(this.context.getInstance("foo", Retryer.class))
+				.isEqualTo(Retryer.NEVER_RETRY);
 		Retryer.Default.class.cast(this.context.getInstance("bar", Retryer.class));
 	}

 	@Test
 	public void overrideErrorDecoder() {
-		assertNull(this.context.getInstance("foo", ErrorDecoder.class));
+		assertThat(this.context.getInstance("foo", ErrorDecoder.class)).isNull();
 		ErrorDecoder.Default.class
 				.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));
+		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() {
-		assertNull(this.context.getInstance("foo", Request.Options.class));
+		assertThat(this.context.getInstance("foo", Request.Options.class)).isNull();
 		Request.Options options = this.context.getInstance("bar", Request.Options.class);
-		assertEquals(1, options.connectTimeoutMillis());
-		assertEquals(1, options.readTimeoutMillis());
+		assertThat(options.connectTimeoutMillis()).isEqualTo(1);
+		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() {
-		assertEquals(1,
-				this.context.getInstances("foo", RequestInterceptor.class).size());
-		assertEquals(2,
-				this.context.getInstances("bar", RequestInterceptor.class).size());
+		assertThat(this.context.getInstances("foo", RequestInterceptor.class).size())
+				.isEqualTo(1);
+		assertThat(this.context.getInstances("bar", RequestInterceptor.class).size())
+				.isEqualTo(2);
 	}

-	@Configuration
+	@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)
+	interface FooClient {
+
+		@RequestLine("GET /")
+		String get();
+
+	}
+
+	@FeignClient(name = "bar", url = "https://bar",
+			configuration = BarConfiguration.class)
+	interface BarClient {
+
+		@RequestMapping(value = "/", method = RequestMethod.GET)
+		String get();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			FeignAutoConfiguration.class })
 	protected static class TestConfiguration {
+
 		@Bean
 		RequestInterceptor defaultRequestInterceptor() {
 			return new RequestInterceptor() {
@@ -156,16 +192,11 @@ public class FeignClientOverrideDefaultsTests {
 				}
 			};
 		}
-	}
-
-	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
-	interface FooClient {
-		@RequestLine("GET /")
-		String get();

 	}

 	public static class FooConfiguration {
+
 		@Bean
 		public Decoder feignDecoder() {
 			return new Decoder.Default();
@@ -190,15 +221,16 @@ public class FeignClientOverrideDefaultsTests {
 		public Feign.Builder feignBuilder() {
 			return HystrixFeign.builder();
 		}
-	}

-	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
-	interface BarClient {
-		@RequestMapping(value = "/", method = RequestMethod.GET)
-		String get();
+		@Bean
+		public QueryMapEncoder queryMapEncoder() {
+			return new feign.QueryMapEncoder.Default();
+		}
+
 	}

 	public static class BarConfiguration {
+
 		@Bean
 		Logger.Level feignLevel() {
 			return Logger.Level.HEADERS;
@@ -223,5 +255,17 @@ public class FeignClientOverrideDefaultsTests {
 		RequestInterceptor feignRequestInterceptor() {
 			return new BasicAuthRequestInterceptor("user", "pass");
 		}
+
+		@Bean
+		public QueryMapEncoder queryMapEncoder() {
+			return new BeanQueryMapEncoder();
+		}
+
+		@Bean
+		public ExceptionPropagationPolicy exceptionPropagationPolicy() {
+			return ExceptionPropagationPolicy.UNWRAP;
+		}
+
 	}
+
 }
@@ -0,0 +1,149 @@
+/*
+ * 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.lang.reflect.Field;
+import java.util.List;
+
+import feign.Feign;
+import feign.Logger;
+import feign.RequestInterceptor;
+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.clientconfig.FeignClientConfigurer;
+import org.springframework.context.ApplicationContext;
+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.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author matt king
+ */
+@DirtiesContext
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignClientUsingConfigurerTest.Application.class, value = {
+		"feign.client.config.default.loggerLevel=full",
+		"feign.client.config.default.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor",
+		"feign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
+public class FeignClientUsingConfigurerTest {
+
+	private static final String BEAN_NAME_PREFIX = "&org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	@Autowired
+	private FeignContext context;
+
+	@Test
+	public void testFeignClient() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "TestFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
+				"requestInterceptors");
+		assertThat(interceptors.size()).as("interceptors not set").isEqualTo(3);
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set")
+				.isEqualTo(Logger.Level.FULL);
+	}
+
+	private Object getBuilderValue(Feign.Builder builder, String member) {
+		Field builderField = ReflectionUtils.findField(Feign.Builder.class, member);
+		ReflectionUtils.makeAccessible(builderField);
+
+		return ReflectionUtils.getField(builderField, builder);
+	}
+
+	@Test
+	public void testNoInheritFeignClient() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
+				"requestInterceptors");
+
+		assertThat(interceptors).as("interceptors not set").isEmpty();
+		assertThat(factoryBean.isInheritParentContext())
+				.as("is inheriting from parent configuration").isFalse();
+	}
+
+	@Test
+	public void testNoInheritFeignClient_ignoreProperties() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set")
+				.isEqualTo(Logger.Level.HEADERS);
+	}
+
+	@EnableAutoConfiguration
+	@Configuration(proxyBeanMethods = false)
+	@EnableFeignClients(clients = { TestFeignClient.class, NoInheritFeignClient.class })
+	protected static class Application {
+
+		@Bean
+		public RequestInterceptor requestInterceptor() {
+			return requestTemplate -> {
+			};
+		}
+
+	}
+
+	public static class NoInheritConfiguration {
+
+		@Bean
+		public Logger.Level logLevel() {
+			return Logger.Level.HEADERS;
+		}
+
+		@Bean
+		public FeignClientConfigurer feignClientConfigurer() {
+			return new FeignClientConfigurer() {
+
+				@Override
+				public boolean inheritParentConfiguration() {
+					return false;
+				}
+			};
+
+		}
+
+	}
+
+	@FeignClient("testFeignClient")
+	interface TestFeignClient {
+
+	}
+
+	@FeignClient(name = "noInheritFeignClient",
+			configuration = NoInheritConfiguration.class)
+	interface NoInheritFeignClient {
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -16,6 +16,14 @@

 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.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -25,13 +33,15 @@ import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 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.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
@@ -41,19 +51,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+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;

 /**
 * @author Eko Kurniawan Khannedy
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
+		webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -71,41 +78,56 @@ public class FeignClientUsingPropertiesTests {

 	private FeignClientFactoryBean barFactoryBean;

+	private FeignClientFactoryBean unwrapFactoryBean;
+
 	private FeignClientFactoryBean formFactoryBean;

 	public FeignClientUsingPropertiesTests() {
-		fooFactoryBean = new FeignClientFactoryBean();
-		fooFactoryBean.setName("foo");
-		fooFactoryBean.setType(FeignClientFactoryBean.class);
+		this.fooFactoryBean = new FeignClientFactoryBean();
+		this.fooFactoryBean.setContextId("foo");
+		this.fooFactoryBean.setType(FeignClientFactoryBean.class);

-		barFactoryBean = new FeignClientFactoryBean();
-		barFactoryBean.setName("bar");
-		barFactoryBean.setType(FeignClientFactoryBean.class);
+		this.barFactoryBean = new FeignClientFactoryBean();
+		this.barFactoryBean.setContextId("bar");
+		this.barFactoryBean.setType(FeignClientFactoryBean.class);

-		formFactoryBean = new FeignClientFactoryBean();
-		formFactoryBean.setName("form");
-		formFactoryBean.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);
 	}

 	public FooClient fooClient() {
-		fooFactoryBean.setApplicationContext(applicationContext);
-		return fooFactoryBean.feign(context).target(FooClient.class, "http://localhost:" + this.port);
+		this.fooFactoryBean.setApplicationContext(this.applicationContext);
+		return this.fooFactoryBean.feign(this.context).target(FooClient.class,
+				"http://localhost:" + this.port);
 	}

 	public BarClient barClient() {
-		barFactoryBean.setApplicationContext(applicationContext);
-		return barFactoryBean.feign(context).target(BarClient.class, "http://localhost:" + this.port);
+		this.barFactoryBean.setApplicationContext(this.applicationContext);
+		return this.barFactoryBean.feign(this.context).target(BarClient.class,
+				"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() {
-		formFactoryBean.setApplicationContext(applicationContext);
-		return formFactoryBean.feign(context).target(FormClient.class, "http://localhost:" + this.port);
+		this.formFactoryBean.setApplicationContext(this.applicationContext);
+		return this.formFactoryBean.feign(this.context).target(FormClient.class,
+				"http://localhost:" + this.port);
 	}

 	@Test
 	public void testFoo() {
 		String response = fooClient().foo();
-		assertEquals("OK", response);
+		assertThat(response).isEqualTo("OK");
 	}

 	@Test(expected = RetryableException.class)
@@ -114,23 +136,38 @@ 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");
 		String response = formClient().form(request);
-		assertEquals("Data", response);
+		assertThat(response).isEqualTo("Data");
 	}

 	protected interface FooClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
 		String foo();
+
 	}

 	protected interface BarClient {

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

 	protected interface FormClient {
@@ -141,17 +178,19 @@ public class FeignClientUsingPropertiesTests {

 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
+	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
 		public String foo(HttpServletRequest request) throws IllegalAccessException {
-			if ("Foo".equals(request.getHeader("Foo")) &&
-					"Bar".equals(request.getHeader("Bar"))) {
+			if ("Foo".equals(request.getHeader("Foo"))
+					&& "Bar".equals(request.getHeader("Bar"))) {
 				return "OK";
-			} else {
+			}
+			else {
 				throw new IllegalAccessException("It should has Foo and Bar header");
 			}
 		}
@@ -171,17 +210,21 @@ public class FeignClientUsingPropertiesTests {
 	}

 	public static class FooRequestInterceptor implements RequestInterceptor {
+
 		@Override
 		public void apply(RequestTemplate template) {
 			template.header("Foo", "Foo");
 		}
+
 	}

 	public static class BarRequestInterceptor implements RequestInterceptor {
+
 		@Override
 		public void apply(RequestTemplate template) {
 			template.header("Bar", "Bar");
 		}
+
 	}

 	public static class NoRetryer implements Retryer {
@@ -195,24 +238,29 @@ public class FeignClientUsingPropertiesTests {
 		public Retryer clone() {
 			return this;
 		}
+
 	}

 	public static class DefaultErrorDecoder extends ErrorDecoder.Default {
+
 	}

 	public static class FormEncoder implements Encoder {

 		@Override
-		public void encode(Object o, Type type, RequestTemplate requestTemplate) throws EncodeException {
+		public void encode(Object o, Type type, RequestTemplate requestTemplate)
+				throws EncodeException {
 			Map<String, String> form = (Map<String, String>) o;
 			StringBuilder builder = new StringBuilder();
 			form.forEach((key, value) -> {
 				builder.append(key + "=" + value + "&");
 			});

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

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -12,7 +12,6 @@
 * 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;
@@ -20,6 +19,7 @@ package org.springframework.cloud.openfeign;
 import java.util.Collections;

 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
@@ -27,8 +27,7 @@ import org.springframework.mock.env.MockEnvironment;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Spencer Gibb
@@ -38,10 +37,9 @@ public class FeignClientsRegistrarTests {

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

-
 	@Test(expected = IllegalStateException.class)
 	public void badNameHttpsPrefix() {
 		testGetName("https://bad_hostname");
@@ -60,19 +58,19 @@ public class FeignClientsRegistrarTests {
 	@Test
 	public void goodName() {
 		String name = testGetName("good-name");
-		assertThat("name was wrong", name, is("good-name"));
+		assertThat(name).as("name was wrong").isEqualTo("good-name");
 	}

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

 	@Test
 	public void goodNameHttpsPrefix() {
 		String name = testGetName("https://goodname");
-		assertThat("name was wrong", name, is("https://goodname"));
+		assertThat(name).as("name was wrong").isEqualTo("https://goodname");
 	}

 	private String testGetName(String name) {
@@ -81,7 +79,6 @@ public class FeignClientsRegistrarTests {
 		return registrar.getName(Collections.<String, Object>singletonMap("name", name));
 	}

-
 	@Test(expected = IllegalArgumentException.class)
 	public void testFallback() {
 		new AnnotationConfigApplicationContext(FallbackTestConfig.class);
@@ -92,30 +89,37 @@ public class FeignClientsRegistrarTests {
 		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}

-	@Configuration
+	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/",
+			fallback = FallbackClient.class)
+	protected interface FallbackClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		String fallbackTest();
+
+	}
+
+	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/",
+			fallbackFactory = FallbackFactoryClient.class)
+	protected interface FallbackFactoryClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		String fallbackFactoryTest();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
-	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class})
+	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
 	protected static class FallbackTestConfig {

 	}

-	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
-	protected interface FallbackClient {
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		String fallbackTest();
-	}
-
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
-	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class})
+	@EnableFeignClients(
+			clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class })
 	protected static class FallbackFactoryTestConfig {

 	}

-	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/", fallbackFactory = FallbackFactoryClient.class)
-	protected interface FallbackFactoryClient {
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		String fallbackFactoryTest();
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-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.
@@ -12,15 +12,18 @@
 * 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 feign.Client;
+import feign.RequestInterceptor;
+import feign.httpclient.ApacheHttpClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -35,10 +38,6 @@ import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-import feign.Client;
-import feign.RequestInterceptor;
-import feign.httpclient.ApacheHttpClient;
-
 import static org.assertj.core.api.Assertions.assertThat;

 /**
@@ -72,7 +71,7 @@ public class FeignCompressionTests {
 				});
 	}

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

 		@Autowired
@@ -90,7 +89,9 @@ public class FeignCompressionTests {
 			 * a bean here of type ApacheHttpClient so that the configuration will be
 			 * loaded correctly.
 			 */
-			return (ApacheHttpClient) client;
+			return (ApacheHttpClient) this.client;
 		}
+
 	}
-}
+
+}
@@ -0,0 +1,126 @@
+/*
+ * 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.Collection;
+
+import feign.Logger;
+import feign.RequestInterceptor;
+import org.assertj.core.util.Lists;
+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;
+
+public class FeignContextTest {
+
+	@Test
+	public void getInstanceWithoutAncestors_verifyNullForMissing() {
+		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
+		parent.refresh();
+
+		FeignContext feignContext = new FeignContext();
+		feignContext.setApplicationContext(parent);
+		feignContext.setConfigurations(
+				Lists.newArrayList(getSpec("empty", EmptyConfiguration.class)));
+
+		Logger.Level level = feignContext.getInstanceWithoutAncestors("empty",
+				Logger.Level.class);
+
+		assertThat(level).as("Logger was not null").isNull();
+	}
+
+	private FeignClientSpecification getSpec(String name, Class<?> configClass) {
+		return new FeignClientSpecification(name, new Class[] { configClass });
+	}
+
+	@Test
+	public void getInstancesWithoutAncestors_verifyEmptyForMissing() {
+		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
+		parent.refresh();
+
+		FeignContext feignContext = new FeignContext();
+		feignContext.setApplicationContext(parent);
+		feignContext.setConfigurations(
+				Lists.newArrayList(getSpec("empty", EmptyConfiguration.class)));
+
+		Collection<RequestInterceptor> interceptors = feignContext
+				.getInstancesWithoutAncestors("empty", RequestInterceptor.class).values();
+
+		assertThat(interceptors).as("Interceptors is not empty").isEmpty();
+	}
+
+	@Test
+	public void getInstanceWithoutAncestors() {
+		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
+		parent.refresh();
+
+		FeignContext feignContext = new FeignContext();
+		feignContext.setApplicationContext(parent);
+		feignContext.setConfigurations(
+				Lists.newArrayList(getSpec("demo", DemoConfiguration.class)));
+
+		Logger.Level level = feignContext.getInstanceWithoutAncestors("demo",
+				Logger.Level.class);
+
+		assertThat(level).isEqualTo(Logger.Level.FULL);
+	}
+
+	@Test
+	public void getInstancesWithoutAncestors() {
+		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
+		parent.refresh();
+
+		FeignContext feignContext = new FeignContext();
+		feignContext.setApplicationContext(parent);
+		feignContext.setConfigurations(
+				Lists.newArrayList(getSpec("demo", DemoConfiguration.class)));
+
+		Collection<RequestInterceptor> interceptors = feignContext
+				.getInstancesWithoutAncestors("demo", RequestInterceptor.class).values();
+
+		assertThat(interceptors.size()).isEqualTo(1);
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignClientsConfiguration.class)
+	protected static class EmptyConfiguration {
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignClientsConfiguration.class)
+	protected static class DemoConfiguration {
+
+		@Bean
+		public Logger.Level loggerLevel() {
+			return Logger.Level.FULL;
+		}
+
+		@Bean
+		public RequestInterceptor requestInterceptor() {
+			return (requestTemplate) -> {
+			};
+		}
+
+	}
+
+}
--- a/Show More
+++ b/Show More