Update SNAPSHOT to 3.0.2

Fix previous merge.
Embed code in doc.
2021-03-17 21:45:22 +00:00 · 2021-03-16 12:24:04 +01:00 · 2021-03-12 16:00:51 +01:00 · 2021-03-11 16:25:45 +01:00 · 2021-03-11 16:06:21 +01:00 · 2021-03-11 14:14:34 +01:00
105 changed files with 5362 additions and 695 deletions
@@ -28,6 +28,8 @@ image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a648
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}

+:core_path: {project-root}/spring-cloud-openfeign-core
+
 This project provides OpenFeign integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms.

@@ -314,3 +316,7 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `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`.

 IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
+
+== License
+
+The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].
@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0-M5</version>
+		<version>3.0.2</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>
@@ -19,3 +19,7 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste
 == Contributing

 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+
+== License
+
+The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].
@@ -14,3 +14,5 @@
 :sc-ext: java
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}
+
+:core_path: {project-root}/spring-cloud-openfeign-core
@@ -1,7 +1,10 @@
 |===
 |Name | Default | Description

-|feign.client.config | `` | 
+|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
+|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
+|feign.client.config |  | 
+|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
 |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.
@@ -9,16 +12,22 @@
 |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.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
 |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.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
+|feign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
+|feign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
+|feign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
+|feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
 |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.httpclient.time-to-live-unit |  | 
+|feign.metrics.enabled | `true` | Enables metrics capability for Feign.
 |feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.

 |===
@@ -24,3 +24,18 @@ public class WebApplication {
 }

 ```
+
+## Contributing
+
+We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-openfeign/blob/master/README.adoc#3-contributing[here].
+
+## Community Support
+
+* You can report issues through https://github.com/spring-cloud/spring-cloud-openfeign/issues[Github].
+* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-feign` tag.
+* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter].
+
+## Commercial Support
+
+Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering.
+
@@ -15,7 +15,7 @@ To use Feign create an interface and annotate it.
 It has pluggable annotation support including Feign annotations and JAX-RS annotations.
 Feign also supports pluggable encoders and decoders.
 Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
-Spring Cloud integrates Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
+Spring Cloud integrates Eureka, Spring Cloud CircuitBreaker, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -32,9 +32,9 @@ Example spring boot app
@EnableFeignClients
 public class Application {

-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}

 }
 ----
@@ -44,14 +44,14 @@ public class Application {
 ----
@FeignClient("stores")
 public interface StoreClient {
-    @RequestMapping(method = RequestMethod.GET, value = "/stores")
-    List<Store> getStores();
+	@RequestMapping(method = RequestMethod.GET, value = "/stores")
+	List<Store> getStores();

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

@@ -59,13 +59,13 @@ In the `@FeignClient` annotation the String value ("stores" above) is an arbitra
 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
+To specify your own alias value you can use the `qualifiers` value
 of the `@FeignClient` annotation.

 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
+don't want to use Eureka, you can configure a list of servers
 in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].

 Spring Cloud OpenFeign supports all the features available for the blocking mode of Spring Cloud LoadBalancer. You can read more about them in the https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[project documentation].
@@ -84,7 +84,7 @@ Spring Cloud lets you take full control of the feign client by declaring additio
 ----
@FeignClient(name = "stores", configuration = FooConfiguration.class)
 public interface StoreClient {
-    //..
+	//..
 }
 ----

@@ -92,8 +92,6 @@ In this case the client is composed from the components already in `FeignClients

 NOTE: `FooConfiguration` does not need to be annotated with `@Configuration`. However, if it is, then take care to exclude it from any `@ComponentScan` that would otherwise include this configuration as it will become the default source for `feign.Decoder`, `feign.Encoder`, `feign.Contract`, etc., when specified. This can be avoided by putting it in a separate, non-overlapping package from any `@ComponentScan` or `@SpringBootApplication`, or it can be explicitly excluded in `@ComponentScan`.

-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.
@@ -106,7 +104,7 @@ Placeholders are supported in the `name` and `url` attributes.
 ----
@FeignClient(name = "${feign.name}", url = "${feign.url}")
 public interface StoreClient {
-    //..
+	//..
 }
 ----

@@ -115,15 +113,16 @@ Spring Cloud OpenFeign provides the following beans by default for feign (`BeanT
 * `Decoder` feignDecoder: `ResponseEntityDecoder` (which wraps a `SpringDecoder`)
 * `Encoder` feignEncoder: `SpringEncoder`
 * `Logger` feignLogger: `Slf4jLogger`
+* `MicrometerCapability` micrometerCapability: If `feign-micrometer` is on the classpath and `MeterRegistry` is available
 * `Contract` feignContract: `SpringMvcContract`
-* `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Client` feignClient: if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
-If none of them is in the classpath, the default feign client is used.
+* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
+* `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
+If none of them is on the classpath, the default feign client is used.

 NOTE: `spring-cloud-starter-openfeign` supports `spring-cloud-starter-loadbalancer`. However, as is an optional dependency, you need to make sure it been added to your project if you want to use it.

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

 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:

@@ -134,6 +133,7 @@ Spring Cloud OpenFeign _does not_ provide the following beans by default for fei
 * `Collection<RequestInterceptor>`
 * `SetterFactory`
 * `QueryMapEncoder`
+* `Capability` (`MicrometerCapability` is provided by default)

 A bean of `Retryer.NEVER_RETRY` with the type `Retryer` is created by default, which will disable retrying.
 Notice this retrying behavior is different from the Feign default one, where it will automatically retry IOExceptions,
@@ -145,15 +145,15 @@ Creating a bean of one of those type and placing it in a `@FeignClient` configur
 ----
@Configuration
 public class FooConfiguration {
-    @Bean
-    public Contract feignContract() {
-        return new feign.Contract.Default();
-    }
+	@Bean
+	public Contract feignContract() {
+		return new feign.Contract.Default();
+	}

-    @Bean
-    public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-        return new BasicAuthRequestInterceptor("user", "password");
-    }
+	@Bean
+	public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+		return new BasicAuthRequestInterceptor("user", "password");
+	}
 }
 ----

@@ -165,25 +165,29 @@ application.yml
 [source,yaml]
 ----
 feign:
-  client:
-    config:
-      feignName:
-        connectTimeout: 5000
-        readTimeout: 5000
-        loggerLevel: full
-        errorDecoder: com.example.SimpleErrorDecoder
-        retryer: com.example.SimpleRetryer
-       defaultQueryParameters:
-          query: queryValue
-        defaultRequestHeaders:
-          header: headerValue
-        requestInterceptors:
-          - com.example.FooRequestInterceptor
-          - com.example.BarRequestInterceptor
-        decode404: false
-        encoder: com.example.SimpleEncoder
-        decoder: com.example.SimpleDecoder
-        contract: com.example.SimpleContract
+	client:
+		config:
+			feignName:
+				connectTimeout: 5000
+				readTimeout: 5000
+				loggerLevel: full
+				errorDecoder: com.example.SimpleErrorDecoder
+				retryer: com.example.SimpleRetryer
+				defaultQueryParameters:
+					query: queryValue
+				defaultRequestHeaders:
+					header: headerValue
+				requestInterceptors:
+					- com.example.FooRequestInterceptor
+					- com.example.BarRequestInterceptor
+				decode404: false
+				encoder: com.example.SimpleEncoder
+				decoder: com.example.SimpleDecoder
+				contract: com.example.SimpleContract
+				capabilities:
+					- com.example.FooCapability
+					- com.example.BarCapability
+				metrics.enabled: false
 ----

 Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.
@@ -196,38 +200,18 @@ application.yml
 [source,yaml]
 ----
 feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-        loggerLevel: basic
+	client:
+		config:
+			default:
+				connectTimeout: 5000
+				readTimeout: 5000
+				loggerLevel: basic
 ----

 If we create both `@Configuration` bean and configuration properties, configuration properties will win.
 It will override `@Configuration` values. But if you want to change the priority to `@Configuration`,
 you can change `feign.client.default-to-properties` to `false`.

-NOTE: If you need to use `ThreadLocal` bound variables in your `RequestInterceptor`s you will need to either set the
-thread isolation strategy for Hystrix to `SEMAPHORE` or disable Hystrix in Feign.
-
-application.yml
-[source,yaml]
----
-# To disable Hystrix in Feign
-feign:
-  hystrix:
-    enabled: false
-
-# To set thread isolation to SEMAPHORE
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          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
@@ -237,7 +221,7 @@ collision of these configuration beans.
 ----
@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
 public interface FooClient {
-    //..
+	//..
 }
 ----

@@ -245,7 +229,7 @@ public interface FooClient {
 ----
@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
 public interface BarClient {
-    //..
+	//..
 }
 ----

@@ -272,6 +256,14 @@ public FeignClientConfigurer feignClientConfigurer() {
 }
 ----

+TIP: By default, Feign clients do not encode slash `/` characters. You can change this behaviour, by setting the value of `feign.client.decodeSlash` to `false`.
+
+==== `SpringEncoder` configuration
+
+In the `SpringEncoder` that we provide, we set `null` charset for binary content types and `UTF-8` for all the other ones.
+
+You can modify this behaviour to derive the charset from the `Content-Type` header charset instead by setting the value of `feign.encoder.charset-from-content-type` to `true`.
+
 [[timeout-handling]]
 === Timeout Handling

@@ -299,12 +291,13 @@ class FooController {

 	private FooClient adminClient;

-    	@Autowired
-	public FooController(Decoder decoder, Encoder encoder, Client client, Contract contract) {
+	@Autowired
+	public FooController(Client client, Encoder encoder, Decoder decoder, Contract contract, MicrometerCapability micrometerCapability) {
 		this.fooClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
+				.addCapability(micrometerCapability)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
 				.target(FooClient.class, "https://PROD-SVC");

@@ -312,9 +305,10 @@ class FooController {
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
+				.addCapability(micrometerCapability)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
 				.target(FooClient.class, "https://PROD-SVC");
-    }
+	}
 }
 ----

@@ -330,18 +324,18 @@ 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
+[[spring-cloud-feign-circuitbreaker]]
+=== Feign Spring Cloud CircuitBreaker Support

-If Hystrix is on the classpath and `feign.hystrix.enabled=true`, Feign will wrap all methods with a circuit breaker. Returning a `com.netflix.hystrix.HystrixCommand` is also available. This lets you use reactive patterns (with a call to `.toObservable()` or `.observe()` or asynchronous use (with a call to `.queue()`).
+If Spring Cloud CircuitBreaker is on the classpath and `feign.circuitbreaker.enabled=true`, Feign will wrap all methods with a circuit breaker.

-To disable Hystrix support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:
+To disable Spring Cloud CircuitBreaker support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:

 [source,java,indent=0]
 ----
@Configuration
 public class FooConfiguration {
-    	@Bean
+	@Bean
 	@Scope("prototype")
 	public Feign.Builder feignBuilder() {
 		return Feign.builder();
@@ -349,60 +343,86 @@ public class FooConfiguration {
 }
 ----

-WARNING:  Prior to the Spring Cloud Dalston release, if Hystrix was on the classpath Feign would have wrapped
-all methods in a circuit breaker by default.  This default behavior was changed in Spring Cloud Dalston in
-favor for an opt-in approach.
+The circuit breaker name follows this pattern `<feignClientName>#<calledMethod>`. When calling a `@FeignClient` with name `foo` and the called interface method is `bar` then the circuit breaker name will be `foo_bar`.

-[[spring-cloud-feign-hystrix-fallback]]
-=== Feign Hystrix Fallbacks
+[[spring-cloud-feign-circuitbreaker-fallback]]
+=== Feign Spring Cloud CircuitBreaker Fallbacks

-Hystrix supports the notion of a fallback: a default code path that is executed when they circuit is open or there is an error. To enable fallbacks for a given `@FeignClient` set the `fallback` attribute to the class name that implements the fallback. You also need to declare your implementation as a Spring bean.
+Spring Cloud CircuitBreaker supports the notion of a fallback: a default code path that is executed when they circuit is open or there is an error. To enable fallbacks for a given `@FeignClient` set the `fallback` attribute to the class name that implements the fallback. You also need to declare your implementation as a Spring bean.

 [source,java,indent=0]
 ----
-@FeignClient(name = "hello", fallback = HystrixClientFallback.class)
-protected interface HystrixClient {
-    @RequestMapping(method = RequestMethod.GET, value = "/hello")
-    Hello iFailSometimes();
-}
+@FeignClient(name = "test", url = "http://localhost:${server.port}/", fallback = Fallback.class)
+	protected interface TestClient {

-static class HystrixClientFallback implements HystrixClient {
-    @Override
-    public Hello iFailSometimes() {
-        return new Hello("fallback");
-    }
-}
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
+		String getException();
+
+	}
+
+	@Component
+	static class Fallback implements TestClient {
+
+		@Override
+		public Hello getHello() {
+			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
+		}
+
+		@Override
+		public String getException() {
+			return "Fixed response";
+		}
+
+	}
 ----

 If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.

 [source,java,indent=0]
 ----
-@FeignClient(name = "hello", fallbackFactory = HystrixClientFallbackFactory.class)
-protected interface HystrixClient {
-	@RequestMapping(method = RequestMethod.GET, value = "/hello")
-	Hello iFailSometimes();
-}
+@FeignClient(name = "testClientWithFactory", url = "http://localhost:${server.port}/",
+			fallbackFactory = TestFallbackFactory.class)
+	protected interface TestClientWithFactory {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
+		String getException();

-@Component
-static class HystrixClientFallbackFactory implements FallbackFactory<HystrixClient> {
-	@Override
-	public HystrixClient create(Throwable cause) {
-		return new HystrixClient() {
-			@Override
-			public Hello iFailSometimes() {
-				return new Hello("fallback; reason was: " + cause.getMessage());
-			}
-		};
 	}
-}
----

-WARNING: There is a limitation with the implementation of fallbacks in Feign and how Hystrix fallbacks work. Fallbacks are currently not supported for methods that return `com.netflix.hystrix.HystrixCommand` and `rx.Observable`.
+	@Component
+	static class TestFallbackFactory implements FallbackFactory<FallbackWithFactory> {
+
+		@Override
+		public FallbackWithFactory create(Throwable cause) {
+			return new FallbackWithFactory();
+		}
+
+	}
+
+	static class FallbackWithFactory implements TestClientWithFactory {
+
+		@Override
+		public Hello getHello() {
+			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
+		}
+
+		@Override
+		public String getException() {
+			return "Fixed response";
+		}
+
+	}
+----

 === Feign and `@Primary`

-When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
+When using Feign with Spring Cloud CircuitBreaker fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.

 [source,java,indent=0]
 ----
@@ -423,8 +443,8 @@ This allows grouping common operations into convenient base interfaces.
 ----
 public interface UserService {

-    @RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
-    User getUser(@PathVariable("id") long id);
+	@RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
+	User getUser(@PathVariable("id") long id);
 }
 ----

@@ -507,10 +527,63 @@ For example, the following would set the `Logger.Level` to `FULL`:
 ----
@Configuration
 public class FooConfiguration {
-    @Bean
-    Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
-    }
+	@Bean
+	Logger.Level feignLoggerLevel() {
+		return Logger.Level.FULL;
+	}
+}
+----
+
+=== Feign Capability support
+
+The Feign capabilities expose core Feign components so that these components can be modified. For example, the capabilities can take the `Client`, _decorate_ it, and give the decorated instance back to Feign.
+The support for metrics libraries is a good real-life example for this. See <<feign-metrics>>.
+
+Creating one or more `Capability` beans and placing them in a `@FeignClient` configuration lets you register them and modify the behavior of the involved client.
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+	@Bean
+	Capability customCapability() {
+		return new CustomCapability();
+	}
+}
+----
+
+=== Feign metrics
+
+If all of the following conditions are true, a `MicrometerCapability` bean is created and registered so that your Feign client publishes metrics to Micrometer:
+
+* `feign-micrometer` is on the classpath
+* A `MeterRegistry` bean is available
+* feign metrics properties are set to `true` (by default)
+	- `feign.metrics.enabled=true` (for all clients)
+	- `feign.client.config.feignName.metrics.enabled=true` (for a single client)
+
+NOTE: If your application already uses Micrometer, enabling metrics is as simple as putting `feign-micrometer` onto your classpath.
+
+You can also disable the feature by either:
+
+* excluding `feign-micrometer` from your classpath
+* setting one of the feign metrics properties to `false`
+	- `feign.metrics.enabled=false`
+	- `feign.client.config.feignName.metrics.enabled=false`
+
+NOTE: `feign.metrics.enabled=false` disables metrics support for *all* Feign clients regardless of the value of the client-level flags: `feign.client.config.feignName.metrics.enabled`.
+If you want to enable or disable merics per client, don't set `feign.metrics.enabled` and use `feign.client.config.feignName.metrics.enabled`.
+
+You can also customize the `MicrometerCapability` by registering your own bean:
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+	@Bean
+	public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
+		return new MicrometerCapability(meterRegistry);
+	}
 }
 ----

@@ -529,10 +602,10 @@ For example, the `Params` class defines parameters `param1` and `param2`:
 ----
 // Params.java
 public class Params {
-    private String param1;
-    private String param2;
+	private String param1;
+	private String param2;

-    // [Getters and setters omitted for brevity]
+	// [Getters and setters omitted for brevity]
 }
 ----

@@ -543,8 +616,8 @@ The following feign client uses the `Params` class by using the `@SpringQueryMap
@FeignClient("demo")
 public interface DemoTemplate {

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

@@ -565,8 +638,8 @@ and deserialize HATEOAS representation models: https://docs.spring.io/spring-hat
@FeignClient("demo")
 public interface DemoTemplate {

-    @GetMapping(path = "/stores")
-    CollectionModel<Store> getStores();
+	@GetMapping(path = "/stores")
+	CollectionModel<Store> getStores();
 }
 ----

@@ -595,13 +668,13 @@ Note that both variable name and the path segment placeholder are called `matrix
@FeignClient("demo")
 public interface DemoTemplate {

-    @GetMapping(path = "/stores")
-    CollectionModel<Store> getStores();
+	@GetMapping(path = "/stores")
+	CollectionModel<Store> getStores();
 }
 ----

 === Feign `CollectionFormat` support
-We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation. You can annotate a Feign client method with it by passing the desired `feign.CollectionFormat` as annotation value.
+We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation.You can annotate a Feign client method with it by passing the desired `feign.CollectionFormat` as annotation value.

 In the following example, the `CSV` format is used instead of the default `EXPLODED` to process the method.

@@ -620,7 +693,7 @@ In the following example, the `CSV` format is used instead of the default `EXPLO
 TIP: Set the `CSV` format while sending `Pageable` as a query parameter in order for it to be encoded correctly.

 === 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.
+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.

@@ -635,6 +708,15 @@ To work around this problem you can use an `ObjectProvider` when autowiring your
 ObjectProvider<TestFeginClient> testFeginClient;
 ----

+=== Spring Data Support
+
+You may consider enabling Jackson Modules for the support `org.springframework.data.domain.Page` and `org.springframework.data.domain.Sort` decoding.
+
+[source,java]
+----
+feign.autoconfiguration.jackson.enabled=true
+----
+
 == Configuration properties

-To see the list of all Sleuth related configuration properties please check link:appendix.html[the Appendix page].
+To see the list of all Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.0.0-M5</version>
+	<version>3.0.2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0-M5</version>
+		<version>3.0.2</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.0.0-M5</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.0.2</spring-cloud-commons.version>

 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0-M5</version>
+		<version>3.0.2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -99,11 +99,21 @@
 			<artifactId>feign-slf4j</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-micrometer</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-hc5</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
@@ -119,6 +129,11 @@
 			<artifactId>okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security.oauth.boot</groupId>
+			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
@@ -168,7 +183,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.13.0</version>
+			<version>3.14.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -0,0 +1,87 @@
+/*
+ * 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 org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import static feign.Util.checkNotNull;
+
+/**
+ * Used to control the fallback given its cause.
+ *
+ * Ex.
+ *
+ * <pre>
+ * {@code
+ * // This instance will be invoked if there are errors of any kind.
+ * FallbackFactory<GitHub> fallbackFactory = cause -> (owner, repo) -> {
+ *   if (cause instanceof FeignException && ((FeignException) cause).status() == 403) {
+ *     return Collections.emptyList();
+ *   } else {
+ *     return Arrays.asList("yogi");
+ *   }
+ * };
+ *
+ * GitHub github = FeignCircuitBreaker.builder()
+ *                             ...
+ *                             .target(GitHub.class, "https://api.github.com", fallbackFactory);
+ * }
+ * </pre>
+ *
+ * @param <T> the feign interface type
+ */
+public interface FallbackFactory<T> {
+
+	/**
+	 * Returns an instance of the fallback appropriate for the given cause.
+	 * @param cause cause of an exception.
+	 * @return fallback
+	 */
+	T create(Throwable cause);
+
+	final class Default<T> implements FallbackFactory<T> {
+
+		final Log logger;
+
+		final T constant;
+
+		public Default(T constant) {
+			this(constant, LogFactory.getLog(Default.class));
+		}
+
+		Default(T constant, Log logger) {
+			this.constant = checkNotNull(constant, "fallback");
+			this.logger = checkNotNull(logger, "logger");
+		}
+
+		@Override
+		public T create(Throwable cause) {
+			if (logger.isTraceEnabled()) {
+				logger.trace("fallback due to: " + cause.getMessage(), cause);
+			}
+			return constant;
+		}
+
+		@Override
+		public String toString() {
+			return constant.toString();
+		}
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,7 @@

 package org.springframework.cloud.openfeign;

+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
@@ -24,11 +25,16 @@ import java.util.concurrent.TimeUnit;

 import javax.annotation.PreDestroy;

+import com.fasterxml.jackson.databind.Module;
 import feign.Client;
 import feign.Feign;
+import feign.RequestInterceptor;
+import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import okhttp3.ConnectionPool;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
@@ -36,31 +42,51 @@ 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.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.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.actuator.HasFeatures;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 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.security.OAuth2FeignRequestInterceptor;
 import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
+import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.cloud.openfeign.support.PageJacksonModule;
+import org.springframework.cloud.openfeign.support.SortJacksonModule;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;

 /**
 * @author Spencer Gibb
 * @author Julien Roy
+ * @author Grzegorz Poznachowski
+ * @author Nikita Konev
+ * @author Tim Peeters
+ * @author Olga Maciaszek-Sharma
+ * @author Nguyen Ky Thanh
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Feign.class)
-@EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class })
+@EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class,
+		FeignEncoderProperties.class })
@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {

+	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);
+
 	@Autowired(required = false)
 	private List<FeignClientSpecification> configurations = new ArrayList<>();

@@ -77,6 +103,26 @@ public class FeignAutoConfiguration {
 	}

 	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
+	@ConditionalOnProperty(value = "feign.autoconfiguration.jackson.enabled", havingValue = "true")
+	protected static class FeignJacksonConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(PageJacksonModule.class)
+		public PageJacksonModule pageJacksonModule() {
+			return new PageJacksonModule();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(SortJacksonModule.class)
+		public SortJacksonModule sortModule() {
+			return new SortJacksonModule();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Conditional(FeignCircuitBreakerDisabledConditions.class)
 	protected static class DefaultFeignTargeterConfiguration {

 		@Bean
@@ -87,14 +133,35 @@ public class FeignAutoConfiguration {

 	}

+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(CircuitBreaker.class)
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "true")
+	protected static class CircuitBreakerPresentFeignTargeterConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(CircuitBreakerFactory.class)
+		public Targeter defaultFeignTargeter() {
+			return new DefaultTargeter();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		@ConditionalOnBean(CircuitBreakerFactory.class)
+		public Targeter circuitBreakerFeignTargeter(CircuitBreakerFactory circuitBreakerFactory) {
+			return new FeignCircuitBreakerTargeter(circuitBreakerFactory);
+		}
+
+	}
+
 	// the following configuration is for alternate feign clients if
 	// SC loadbalancer is not on the class path.
-	// see corresponding configurations in FeignRibbonClientAutoConfiguration
+	// see corresponding configurations in FeignLoadBalancerAutoConfiguration
 	// for load-balanced clients.
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+	@Conditional(HttpClient5DisabledConditions.class)
 	protected static class HttpClientFeignConfiguration {

 		private final Timer connectionManagerTimer = new Timer(
@@ -142,10 +209,17 @@ public class FeignAutoConfiguration {
 		}

 		@PreDestroy
-		public void destroy() throws Exception {
+		public void destroy() {
 			this.connectionManagerTimer.cancel();
 			if (this.httpClient != null) {
-				this.httpClient.close();
+				try {
+					this.httpClient.close();
+				}
+				catch (IOException e) {
+					if (LOG.isErrorEnabled()) {
+						LOG.error("Could not correctly close httpClient.");
+					}
+				}
 			}
 		}

@@ -197,4 +271,34 @@ public class FeignAutoConfiguration {

 	}

+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(ApacheHttp5Client.class)
+	@ConditionalOnMissingBean(org.apache.hc.client5.http.impl.classic.CloseableHttpClient.class)
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
+	@Import(org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration.class)
+	protected static class HttpClient5FeignConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(Client.class)
+		public Client feignClient(org.apache.hc.client5.http.impl.classic.CloseableHttpClient httpClient5) {
+			return new ApacheHttp5Client(httpClient5);
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(OAuth2ClientContext.class)
+	@ConditionalOnProperty("feign.oauth2.enabled")
+	protected static class Oauth2FeignConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(OAuth2FeignRequestInterceptor.class)
+		@ConditionalOnBean({ OAuth2ClientContext.class, OAuth2ProtectedResourceDetails.class })
+		public RequestInterceptor oauth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
+				OAuth2ProtectedResourceDetails resource) {
+			return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, resource);
+		}
+
+	}
+
 }
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import feign.Feign;
+import feign.Target;
+
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+
+/**
+ * Allows Feign interfaces to work with {@link CircuitBreaker}.
+ *
+ * @author Marcin Grzejszczak
+ * @since 3.0.0
+ */
+public final class FeignCircuitBreaker {
+
+	private FeignCircuitBreaker() {
+		throw new IllegalStateException("Don't instantiate a utility class");
+	}
+
+	/**
+	 * @return builder for Feign CircuitBreaker integration
+	 */
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	/**
+	 * Builder for Feign CircuitBreaker integration.
+	 */
+	public static final class Builder extends Feign.Builder {
+
+		private CircuitBreakerFactory circuitBreakerFactory;
+
+		private String feignClientName;
+
+		Builder circuitBreakerFactory(CircuitBreakerFactory circuitBreakerFactory) {
+			this.circuitBreakerFactory = circuitBreakerFactory;
+			return this;
+		}
+
+		Builder feignClientName(String feignClientName) {
+			this.feignClientName = feignClientName;
+			return this;
+		}
+
+		public <T> T target(Target<T> target, T fallback) {
+			return build(fallback != null ? new FallbackFactory.Default<T>(fallback) : null).newInstance(target);
+		}
+
+		public <T> T target(Target<T> target, FallbackFactory<? extends T> fallbackFactory) {
+			return build(fallbackFactory).newInstance(target);
+		}
+
+		@Override
+		public <T> T target(Target<T> target) {
+			return build(null).newInstance(target);
+		}
+
+		public Feign build(final FallbackFactory<?> nullableFallbackFactory) {
+			super.invocationHandlerFactory((target, dispatch) -> new FeignCircuitBreakerInvocationHandler(
+					circuitBreakerFactory, target, dispatch, nullableFallbackFactory));
+			return super.build();
+		}
+
+	}
+
+}
@@ -0,0 +1,39 @@
+/*
+ * 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 org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+class FeignCircuitBreakerDisabledConditions extends AnyNestedCondition {
+
+	FeignCircuitBreakerDisabledConditions() {
+		super(ConfigurationPhase.PARSE_CONFIGURATION);
+	}
+
+	@ConditionalOnMissingClass("org.springframework.cloud.client.circuitbreaker.CircuitBreaker")
+	static class CircuitBreakerClassMissing {
+
+	}
+
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "false", matchIfMissing = true)
+	static class CircuitBreakerDisabled {
+
+	}
+
+}
@@ -0,0 +1,145 @@
+/*
+ * 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.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import feign.Feign;
+import feign.InvocationHandlerFactory;
+import feign.Target;
+
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+
+import static feign.Util.checkNotNull;
+
+class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
+
+	private final CircuitBreakerFactory factory;
+
+	private final Target<?> target;
+
+	private final Map<Method, InvocationHandlerFactory.MethodHandler> dispatch;
+
+	private final FallbackFactory<?> nullableFallbackFactory;
+
+	private final Map<Method, Method> fallbackMethodMap;
+
+	FeignCircuitBreakerInvocationHandler(CircuitBreakerFactory factory, Target<?> target,
+			Map<Method, InvocationHandlerFactory.MethodHandler> dispatch, FallbackFactory<?> nullableFallbackFactory) {
+		this.factory = factory;
+		this.target = checkNotNull(target, "target");
+		this.dispatch = checkNotNull(dispatch, "dispatch");
+		this.fallbackMethodMap = toFallbackMethod(dispatch);
+		this.nullableFallbackFactory = nullableFallbackFactory;
+	}
+
+	@Override
+	public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
+		// early exit if the invoked method is from java.lang.Object
+		// code is the same as ReflectiveFeign.FeignInvocationHandler
+		if ("equals".equals(method.getName())) {
+			try {
+				Object otherHandler = args.length > 0 && args[0] != null ? Proxy.getInvocationHandler(args[0]) : null;
+				return equals(otherHandler);
+			}
+			catch (IllegalArgumentException e) {
+				return false;
+			}
+		}
+		else if ("hashCode".equals(method.getName())) {
+			return hashCode();
+		}
+		else if ("toString".equals(method.getName())) {
+			return toString();
+		}
+		String circuitName = Feign.configKey(target.type(), method);
+		CircuitBreaker circuitBreaker = this.factory.create(circuitName);
+		Supplier<Object> supplier = asSupplier(method, args);
+		if (this.nullableFallbackFactory != null) {
+			Function<Throwable, Object> fallbackFunction = throwable -> {
+				Object fallback = this.nullableFallbackFactory.create(throwable);
+				try {
+					return this.fallbackMethodMap.get(method).invoke(fallback, args);
+				}
+				catch (Exception e) {
+					throw new IllegalStateException(e);
+				}
+			};
+			return circuitBreaker.run(supplier, fallbackFunction);
+		}
+		return circuitBreaker.run(supplier);
+	}
+
+	private Supplier<Object> asSupplier(final Method method, final Object[] args) {
+		return () -> {
+			try {
+				return this.dispatch.get(method).invoke(args);
+			}
+			catch (RuntimeException throwable) {
+				throw throwable;
+			}
+			catch (Throwable throwable) {
+				throw new RuntimeException(throwable);
+			}
+		};
+	}
+
+	/**
+	 * If the method param of InvocationHandler.invoke is not accessible, i.e in a
+	 * package-private interface, the fallback call will cause of access restrictions. But
+	 * methods in dispatch are copied methods. So setting access to dispatch method
+	 * doesn't take effect to the method in InvocationHandler.invoke. Use map to store a
+	 * copy of method to invoke the fallback to bypass this and reducing the count of
+	 * reflection calls.
+	 * @return cached methods map for fallback invoking
+	 */
+	static Map<Method, Method> toFallbackMethod(Map<Method, InvocationHandlerFactory.MethodHandler> dispatch) {
+		Map<Method, Method> result = new LinkedHashMap<Method, Method>();
+		for (Method method : dispatch.keySet()) {
+			method.setAccessible(true);
+			result.put(method, method);
+		}
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof FeignCircuitBreakerInvocationHandler) {
+			FeignCircuitBreakerInvocationHandler other = (FeignCircuitBreakerInvocationHandler) obj;
+			return this.target.equals(other.target);
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		return this.target.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return this.target.toString();
+	}
+
+}
@@ -0,0 +1,87 @@
+/*
+ * 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.Feign;
+import feign.Target;
+
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+import org.springframework.util.StringUtils;
+
+@SuppressWarnings("unchecked")
+class FeignCircuitBreakerTargeter implements Targeter {
+
+	private final CircuitBreakerFactory circuitBreakerFactory;
+
+	FeignCircuitBreakerTargeter(CircuitBreakerFactory circuitBreakerFactory) {
+		this.circuitBreakerFactory = circuitBreakerFactory;
+	}
+
+	@Override
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
+			Target.HardCodedTarget<T> target) {
+		if (!(feign instanceof FeignCircuitBreaker.Builder)) {
+			return feign.target(target);
+		}
+		FeignCircuitBreaker.Builder builder = (FeignCircuitBreaker.Builder) feign;
+		String name = !StringUtils.hasText(factory.getContextId()) ? factory.getName() : factory.getContextId();
+		Class<?> fallback = factory.getFallback();
+		if (fallback != void.class) {
+			return targetWithFallback(name, context, target, builder, fallback);
+		}
+		Class<?> fallbackFactory = factory.getFallbackFactory();
+		if (fallbackFactory != void.class) {
+			return targetWithFallbackFactory(name, context, target, builder, fallbackFactory);
+		}
+		return builder(name, builder).target(target);
+	}
+
+	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
+			Target.HardCodedTarget<T> target, FeignCircuitBreaker.Builder builder, Class<?> fallbackFactoryClass) {
+		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext("fallbackFactory",
+				feignClientName, context, fallbackFactoryClass, FallbackFactory.class);
+		return builder(feignClientName, builder).target(target, fallbackFactory);
+	}
+
+	private <T> T targetWithFallback(String feignClientName, FeignContext context, Target.HardCodedTarget<T> target,
+			FeignCircuitBreaker.Builder builder, Class<?> fallback) {
+		T fallbackInstance = getFromContext("fallback", feignClientName, context, fallback, target.type());
+		return builder(feignClientName, builder).target(target, fallbackInstance);
+	}
+
+	private <T> T getFromContext(String fallbackMechanism, String feignClientName, FeignContext context,
+			Class<?> beanType, Class<T> targetType) {
+		Object fallbackInstance = context.getInstance(feignClientName, beanType);
+		if (fallbackInstance == null) {
+			throw new IllegalStateException(
+					String.format("No " + fallbackMechanism + " instance of type %s found for feign client %s",
+							beanType, feignClientName));
+		}
+
+		if (!targetType.isAssignableFrom(beanType)) {
+			throw new IllegalStateException(String.format("Incompatible " + fallbackMechanism
+					+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
+					beanType, targetType, feignClientName));
+		}
+		return (T) fallbackInstance;
+	}
+
+	private FeignCircuitBreaker.Builder builder(String feignClientName, FeignCircuitBreaker.Builder builder) {
+		return builder.circuitBreakerFactory(this.circuitBreakerFactory).feignClientName(feignClientName);
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -33,6 +33,7 @@ import org.springframework.core.annotation.AliasFor;
 *
 * @author Spencer Gibb
 * @author Venil Noronha
+ * @author Olga Maciaszek-Sharma
 */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -49,14 +50,6 @@ public @interface FeignClient {
 	@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 "";
-
 	/**
 	 * This will be used as the bean name instead of name if present, but will not be used
 	 * as a service id.
@@ -73,9 +66,28 @@ public @interface FeignClient {

 	/**
 	 * @return the <code>@Qualifier</code> value for the feign client.
+	 * @deprecated in favour of {@link #qualifiers()}.
+	 *
+	 * If both {@link #qualifier()} and {@link #qualifiers()} are present, we will use the
+	 * latter, unless the array returned by {@link #qualifiers()} is empty or only
+	 * contains <code>null</code> or whitespace values, in which case we'll fall back
+	 * first to {@link #qualifier()} and, if that's also not present, to the default =
+	 * <code>contextId + "FeignClient"</code>.
 	 */
+	@Deprecated
 	String qualifier() default "";

+	/**
+	 * @return the <code>@Qualifiers</code> value for the feign client.
+	 *
+	 * If both {@link #qualifier()} and {@link #qualifiers()} are present, we will use the
+	 * latter, unless the array returned by {@link #qualifiers()} is empty or only
+	 * contains <code>null</code> or whitespace values, in which case we'll fall back
+	 * first to {@link #qualifier()} and, if that's also not present, to the default =
+	 * <code>contextId + "FeignClient"</code>.
+	 */
+	String[] qualifiers() default {};
+
 	/**
 	 * @return an absolute URL or resolvable hostname (the protocol is optional).
 	 */
@@ -108,7 +120,7 @@ public @interface FeignClient {
 	 * factory must produce instances of fallback classes that implement the interface
 	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring bean.
 	 *
-	 * @see feign.hystrix.FallbackFactory for details.
+	 * @see FallbackFactory for details.
 	 * @return fallback factory for the specified Feign client interface
 	 */
 	Class<?> fallbackFactory() default void.class;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,6 +22,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

+import feign.Capability;
 import feign.Client;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
@@ -38,11 +39,14 @@ import feign.codec.ErrorDecoder;

 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 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.loadbalancer.RetryableFeignBlockingLoadBalancerClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -57,8 +61,11 @@ import org.springframework.util.StringUtils;
 * @author Matt King
 * @author Olga Maciaszek-Sharma
 * @author Ilia Ilinykh
+ * @author Marcin Grzejszczak
+ * @author Jonatan Ivanov
 */
-public class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean, ApplicationContextAware {
+public class FeignClientFactoryBean
+		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {

 	/***********************************
 	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
@@ -81,6 +88,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 	private ApplicationContext applicationContext;

+	private BeanFactory beanFactory;
+
 	private Class<?> fallback = void.class;

 	private Class<?> fallbackFactory = void.class;
@@ -89,6 +98,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 	private int connectTimeoutMillis = new Request.Options().connectTimeoutMillis();

+	private boolean followRedirects = new Request.Options().isFollowRedirects();
+
 	@Override
 	public void afterPropertiesSet() {
 		Assert.hasText(contextId, "Context id must be set");
@@ -125,7 +136,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}

 	protected void configureFeign(FeignContext context, Feign.Builder builder) {
-		FeignClientProperties properties = applicationContext.getBean(FeignClientProperties.class);
+		FeignClientProperties properties = beanFactory != null ? beanFactory.getBean(FeignClientProperties.class)
+				: applicationContext.getBean(FeignClientProperties.class);

 		FeignClientConfigurer feignClientConfigurer = getOptional(context, FeignClientConfigurer.class);
 		setInheritParentContext(feignClientConfigurer.inheritParentConfiguration());
@@ -172,6 +184,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			builder.options(options);
 			readTimeoutMillis = options.readTimeoutMillis();
 			connectTimeoutMillis = options.connectTimeoutMillis();
+			followRedirects = options.isFollowRedirects();
 		}
 		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(context,
 				RequestInterceptor.class);
@@ -192,6 +205,12 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		if (exceptionPropagationPolicy != null) {
 			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
 		}
+
+		Map<String, Capability> capabilities = getInheritedAwareInstances(context, Capability.class);
+		if (capabilities != null) {
+			capabilities.values().stream().sorted(AnnotationAwareOrderComparator.INSTANCE)
+					.forEach(builder::addCapability);
+		}
 	}

 	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config,
@@ -206,9 +225,10 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 		connectTimeoutMillis = config.getConnectTimeout() != null ? config.getConnectTimeout() : connectTimeoutMillis;
 		readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout() : readTimeoutMillis;
+		followRedirects = config.isFollowRedirects() != null ? config.isFollowRedirects() : followRedirects;

 		builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS, readTimeoutMillis,
-				TimeUnit.MILLISECONDS, true));
+				TimeUnit.MILLISECONDS, followRedirects));

 		if (config.getRetryer() != null) {
 			Retryer retryer = getOrInstantiate(config.getRetryer());
@@ -257,11 +277,15 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		if (Objects.nonNull(config.getExceptionPropagationPolicy())) {
 			builder.exceptionPropagationPolicy(config.getExceptionPropagationPolicy());
 		}
+
+		if (config.getCapabilities() != null) {
+			config.getCapabilities().stream().map(this::getOrInstantiate).forEach(builder::addCapability);
+		}
 	}

 	private <T> T getOrInstantiate(Class<T> tClass) {
 		try {
-			return applicationContext.getBean(tClass);
+			return beanFactory != null ? beanFactory.getBean(tClass) : applicationContext.getBean(tClass);
 		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
@@ -321,7 +345,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = applicationContext.getBean(FeignContext.class);
+		FeignContext context = beanFactory != null ? beanFactory.getBean(FeignContext.class)
+				: applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);

 		if (!StringUtils.hasText(url)) {
@@ -345,6 +370,11 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
 				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
 			}
+			if (client instanceof RetryableFeignBlockingLoadBalancerClient) {
+				// not load balancing because we have a url,
+				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
+				client = ((RetryableFeignBlockingLoadBalancerClient) client).getDelegate();
+			}
 			builder.client(client);
 		}
 		Targeter targeter = get(context, Targeter.class);
@@ -436,7 +466,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 	@Override
 	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.applicationContext = context;
+		applicationContext = context;
+		beanFactory = context;
 	}

 	public Class<?> getFallback() {
@@ -464,16 +495,20 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			return false;
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(applicationContext, that.applicationContext) && decode404 == that.decode404
+		return Objects.equals(applicationContext, that.applicationContext)
+				&& Objects.equals(beanFactory, that.beanFactory) && decode404 == that.decode404
 				&& inheritParentContext == that.inheritParentContext && 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);
+				&& Objects.equals(path, that.path) && Objects.equals(type, that.type) && Objects.equals(url, that.url)
+				&& Objects.equals(connectTimeoutMillis, that.connectTimeoutMillis)
+				&& Objects.equals(readTimeoutMillis, that.readTimeoutMillis)
+				&& Objects.equals(followRedirects, that.followRedirects);
 	}

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

 	@Override
@@ -482,8 +517,16 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 				.append(name).append("', ").append("url='").append(url).append("', ").append("path='").append(path)
 				.append("', ").append("decode404=").append(decode404).append(", ").append("inheritParentContext=")
 				.append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext)
-				.append(", ").append("fallback=").append(fallback).append(", ").append("fallbackFactory=")
-				.append(fallbackFactory).append("}").toString();
+				.append(", ").append("beanFactory=").append(beanFactory).append(", ").append("fallback=")
+				.append(fallback).append(", ").append("fallbackFactory=").append(fallbackFactory).append("}")
+				.append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}").append("readTimeoutMillis=")
+				.append(readTimeoutMillis).append("}").append("followRedirects=").append(followRedirects).append("}")
+				.toString();
+	}
+
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		this.beanFactory = beanFactory;
 	}

 }
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author Jonatan Ivanov
+ */
+class FeignClientMetricsEnabledCondition implements Condition {
+
+	@Override
+	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+		FeignClientProperties feignClientProperties = context.getBeanFactory()
+				.getBeanProvider(FeignClientProperties.class).getIfAvailable();
+		if (feignClientProperties != null) {
+			Map<String, FeignClientProperties.FeignClientConfiguration> feignClientConfigMap = feignClientProperties
+					.getConfig();
+			if (feignClientConfigMap != null) {
+				FeignClientProperties.FeignClientConfiguration feignClientConfig = feignClientConfigMap
+						.get(context.getEnvironment().getProperty("feign.client.name"));
+				if (feignClientConfig != null) {
+					FeignClientProperties.MetricsProperties metrics = feignClientConfig.getMetrics();
+					if (metrics != null && metrics.getEnabled() != null) {
+						return metrics.getEnabled();
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;

+import feign.Capability;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Logger;
@@ -36,6 +37,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 /**
 * @author Eko Kurniawan Khannedy
 * @author Ilia Ilinykh
+ * @author Ram Anaswara
+ * @author Jonatan Ivanov
+ * @author Olga Maciaszek-Sharma
 */
@ConfigurationProperties("feign.client")
 public class FeignClientProperties {
@@ -46,8 +50,14 @@ public class FeignClientProperties {

 	private Map<String, FeignClientConfiguration> config = new HashMap<>();

+	/**
+	 * Feign clients do not encode slash `/` characters by default. To change this
+	 * behavior, set the `decodeSlash` to `false`.
+	 */
+	private boolean decodeSlash = true;
+
 	public boolean isDefaultToProperties() {
-		return this.defaultToProperties;
+		return defaultToProperties;
 	}

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

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

 	public void setDefaultConfig(String defaultConfig) {
@@ -63,13 +73,21 @@ public class FeignClientProperties {
 	}

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

 	public void setConfig(Map<String, FeignClientConfiguration> config) {
 		this.config = config;
 	}

+	public boolean isDecodeSlash() {
+		return decodeSlash;
+	}
+
+	public void setDecodeSlash(boolean decodeSlash) {
+		this.decodeSlash = decodeSlash;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -79,13 +97,13 @@ public class FeignClientProperties {
 			return false;
 		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return this.defaultToProperties == that.defaultToProperties
-				&& Objects.equals(this.defaultConfig, that.defaultConfig) && Objects.equals(this.config, that.config);
+		return defaultToProperties == that.defaultToProperties && Objects.equals(defaultConfig, that.defaultConfig)
+				&& Objects.equals(config, that.config) && Objects.equals(decodeSlash, that.decodeSlash);
 	}

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

 	/**
@@ -119,8 +137,14 @@ public class FeignClientProperties {

 		private ExceptionPropagationPolicy exceptionPropagationPolicy;

+		private List<Class<Capability>> capabilities;
+
+		private MetricsProperties metrics;
+
+		private Boolean followRedirects;
+
 		public Logger.Level getLoggerLevel() {
-			return this.loggerLevel;
+			return loggerLevel;
 		}

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

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

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

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

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

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

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

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

 		public void setErrorDecoder(Class<ErrorDecoder> errorDecoder) {
@@ -160,7 +184,7 @@ public class FeignClientProperties {
 		}

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

 		public void setRequestInterceptors(List<Class<RequestInterceptor>> requestInterceptors) {
@@ -184,7 +208,7 @@ public class FeignClientProperties {
 		}

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

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

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

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

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

 		public void setEncoder(Class<Encoder> encoder) {
@@ -208,7 +232,7 @@ public class FeignClientProperties {
 		}

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

 		public void setContract(Class<Contract> contract) {
@@ -223,6 +247,30 @@ public class FeignClientProperties {
 			this.exceptionPropagationPolicy = exceptionPropagationPolicy;
 		}

+		public List<Class<Capability>> getCapabilities() {
+			return capabilities;
+		}
+
+		public void setCapabilities(List<Class<Capability>> capabilities) {
+			this.capabilities = capabilities;
+		}
+
+		public MetricsProperties getMetrics() {
+			return metrics;
+		}
+
+		public void setMetrics(MetricsProperties metrics) {
+			this.metrics = metrics;
+		}
+
+		public Boolean isFollowRedirects() {
+			return followRedirects;
+		}
+
+		public void setFollowRedirects(Boolean followRedirects) {
+			this.followRedirects = followRedirects;
+		}
+
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -232,23 +280,59 @@ public class FeignClientProperties {
 				return false;
 			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			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)
-					&& Objects.equals(this.defaultRequestHeaders, that.defaultRequestHeaders)
-					&& Objects.equals(this.defaultQueryParameters, that.defaultQueryParameters);
+			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)
+					&& Objects.equals(exceptionPropagationPolicy, that.exceptionPropagationPolicy)
+					&& Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders)
+					&& Objects.equals(defaultQueryParameters, that.defaultQueryParameters)
+					&& Objects.equals(capabilities, that.capabilities) && Objects.equals(metrics, that.metrics)
+					&& Objects.equals(followRedirects, that.followRedirects);
 		}

 		@Override
 		public int hashCode() {
-			return Objects.hash(this.loggerLevel, this.connectTimeout, this.readTimeout, this.retryer,
-					this.errorDecoder, this.requestInterceptors, this.decode404, this.encoder, this.decoder,
-					this.contract, this.exceptionPropagationPolicy, this.defaultQueryParameters,
-					this.defaultRequestHeaders);
+			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer, errorDecoder, requestInterceptors,
+					decode404, encoder, decoder, contract, exceptionPropagationPolicy, defaultQueryParameters,
+					defaultRequestHeaders, capabilities, metrics, followRedirects);
+		}
+
+	}
+
+	/**
+	 * Metrics configuration for Feign Client.
+	 */
+	public static class MetricsProperties {
+
+		private Boolean enabled = true;
+
+		public Boolean getEnabled() {
+			return enabled;
+		}
+
+		public void setEnabled(Boolean enabled) {
+			this.enabled = enabled;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+
+			MetricsProperties that = (MetricsProperties) o;
+			return Objects.equals(enabled, that.enabled);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(enabled);
 		}

 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,35 +19,42 @@ package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.List;

-import com.fasterxml.jackson.databind.Module;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
+import feign.QueryMapEncoder;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.form.MultipartFormContentProcessor;
 import feign.form.spring.SpringFormEncoder;
+import feign.micrometer.MicrometerCapability;
 import feign.optionals.OptionalDecoder;
+import io.micrometer.core.instrument.MeterRegistry;

 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.ConditionalOnBean;
 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.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 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.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
+import org.springframework.cloud.openfeign.support.PageableSpringQueryMapEncoder;
 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;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.convert.ConversionService;
@@ -60,6 +67,9 @@ import static feign.form.ContentType.MULTIPART;
 * @author Dave Syer
 * @author Venil Noronha
 * @author Darren Foong
+ * @author Jonatan Ivanov
+ * @author Olga Maciaszek-Sharma
+ * @author Hyeonmin Park
 */
@Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
@@ -79,6 +89,12 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private SpringDataWebProperties springDataWebProperties;

+	@Autowired(required = false)
+	private FeignClientProperties feignClientProperties;
+
+	@Autowired(required = false)
+	private FeignEncoderProperties encoderProperties;
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
@@ -89,14 +105,14 @@ public class FeignClientsConfiguration {
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
 	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
-		return springEncoder(formWriterProvider);
+		return springEncoder(formWriterProvider, encoderProperties);
 	}

 	@Bean
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider) {
-		PageableSpringEncoder encoder = new PageableSpringEncoder(springEncoder(formWriterProvider));
+		PageableSpringEncoder encoder = new PageableSpringEncoder(springEncoder(formWriterProvider, encoderProperties));

 		if (springDataWebProperties != null) {
 			encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
@@ -106,10 +122,18 @@ public class FeignClientsConfiguration {
 		return encoder;
 	}

+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
+	@ConditionalOnMissingBean
+	public QueryMapEncoder feignQueryMapEncoderPageable() {
+		return new PageableSpringQueryMapEncoder();
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
-		return new SpringMvcContract(this.parameterProcessors, feignConversionService);
+		boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash();
+		return new SpringMvcContract(this.parameterProcessors, feignConversionService, decodeSlash);
 	}

 	@Bean
@@ -127,31 +151,12 @@ public class FeignClientsConfiguration {
 		return Retryer.NEVER_RETRY;
 	}

-	@Bean
-	@Scope("prototype")
-	@ConditionalOnMissingBean
-	public Feign.Builder feignBuilder(Retryer retryer) {
-		return Feign.builder().retryer(retryer);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
 		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() {
@@ -159,14 +164,15 @@ public class FeignClientsConfiguration {
 		};
 	}

-	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
+			FeignEncoderProperties encoderProperties) {
 		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();

 		if (formWriter != null) {
-			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), this.messageConverters);
+			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), this.messageConverters, encoderProperties);
 		}
 		else {
-			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters);
+			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters, encoderProperties);
 		}
 	}

@@ -181,4 +187,54 @@ public class FeignClientsConfiguration {

 	}

+	@Configuration(proxyBeanMethods = false)
+	@Conditional(FeignCircuitBreakerDisabledConditions.class)
+	protected static class DefaultFeignBuilderConfiguration {
+
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean
+		public Feign.Builder feignBuilder(Retryer retryer) {
+			return Feign.builder().retryer(retryer);
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(CircuitBreaker.class)
+	@ConditionalOnProperty("feign.circuitbreaker.enabled")
+	protected static class CircuitBreakerPresentFeignBuilderConfiguration {
+
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean({ Feign.Builder.class, CircuitBreakerFactory.class })
+		public Feign.Builder defaultFeignBuilder(Retryer retryer) {
+			return Feign.builder().retryer(retryer);
+		}
+
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean
+		@ConditionalOnBean(CircuitBreakerFactory.class)
+		public Feign.Builder circuitBreakerFeignBuilder() {
+			return FeignCircuitBreaker.builder();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnBean(type = "io.micrometer.core.instrument.MeterRegistry")
+	@ConditionalOnClass(name = "feign.micrometer.MicrometerCapability")
+	@ConditionalOnProperty(name = "feign.metrics.enabled", matchIfMissing = true)
+	@Conditional(FeignClientMetricsEnabledCondition.class)
+	protected static class MetricsConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean
+		public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
+			return new MicrometerCapability(meterRegistry);
+		}
+
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -20,8 +20,12 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;

@@ -30,6 +34,9 @@ import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.BeanExpressionContext;
+import org.springframework.beans.factory.config.BeanExpressionResolver;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
@@ -45,6 +52,7 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -53,6 +61,8 @@ import org.springframework.util.StringUtils;
 * @author Venil Noronha
 * @author Gang Li
 * @author Michal Domagala
+ * @author Marcin Grzejszczak
+ * @author Olga Maciaszek-Sharma
 */
 class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {

@@ -156,7 +166,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo

 		LinkedHashSet<BeanDefinition> candidateComponents = new LinkedHashSet<>();
 		Map<String, Object> attrs = metadata.getAnnotationAttributes(EnableFeignClients.class.getName());
-		AnnotationTypeFilter annotationTypeFilter = new AnnotationTypeFilter(FeignClient.class);
 		final Class<?>[] clients = attrs == null ? null : (Class<?>[]) attrs.get("clients");
 		if (clients == null || clients.length == 0) {
 			ClassPathScanningCandidateComponentProvider scanner = getScanner();
@@ -194,35 +203,51 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	private void registerFeignClient(BeanDefinitionRegistry registry, AnnotationMetadata annotationMetadata,
 			Map<String, Object> attributes) {
 		String className = annotationMetadata.getClassName();
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(FeignClientFactoryBean.class);
-		validate(attributes);
-		definition.addPropertyValue("url", getUrl(attributes));
-		definition.addPropertyValue("path", getPath(attributes));
+		Class clazz = ClassUtils.resolveClassName(className, null);
+		ConfigurableBeanFactory beanFactory = registry instanceof ConfigurableBeanFactory
+				? (ConfigurableBeanFactory) registry : null;
+		String contextId = getContextId(beanFactory, 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"));
+		FeignClientFactoryBean factoryBean = new FeignClientFactoryBean();
+		factoryBean.setBeanFactory(beanFactory);
+		factoryBean.setName(name);
+		factoryBean.setContextId(contextId);
+		factoryBean.setType(clazz);
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(clazz, () -> {
+			factoryBean.setUrl(getUrl(beanFactory, attributes));
+			factoryBean.setPath(getPath(beanFactory, attributes));
+			factoryBean.setDecode404(Boolean.parseBoolean(String.valueOf(attributes.get("decode404"))));
+			Object fallback = attributes.get("fallback");
+			if (fallback != null) {
+				factoryBean.setFallback(fallback instanceof Class ? (Class<?>) fallback
+						: ClassUtils.resolveClassName(fallback.toString(), null));
+			}
+			Object fallbackFactory = attributes.get("fallbackFactory");
+			if (fallbackFactory != null) {
+				factoryBean.setFallbackFactory(fallbackFactory instanceof Class ? (Class<?>) fallbackFactory
+						: ClassUtils.resolveClassName(fallbackFactory.toString(), null));
+			}
+			return factoryBean.getObject();
+		});
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
+		definition.setLazyInit(true);
+		validate(attributes);

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

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

 		beanDefinition.setPrimary(primary);

-		String qualifier = getQualifier(attributes);
-		if (StringUtils.hasText(qualifier)) {
-			alias = qualifier;
+		String[] qualifiers = getQualifiers(attributes);
+		if (ObjectUtils.isEmpty(qualifiers)) {
+			qualifiers = new String[] { contextId + "FeignClient" };
 		}

-		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, new String[] { alias });
+		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers);
 		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
 	}

@@ -235,6 +260,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	}

 	/* for testing */ String getName(Map<String, Object> attributes) {
+		return getName(null, attributes);
+	}
+
+	String getName(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
 		String name = (String) attributes.get("serviceId");
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("name");
@@ -242,34 +271,42 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("value");
 		}
-		name = resolve(name);
+		name = resolve(beanFactory, name);
 		return getName(name);
 	}

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

-		contextId = resolve(contextId);
+		contextId = resolve(beanFactory, contextId);
 		return getName(contextId);
 	}

-	private String resolve(String value) {
+	private String resolve(ConfigurableBeanFactory beanFactory, String value) {
 		if (StringUtils.hasText(value)) {
-			return this.environment.resolvePlaceholders(value);
+			if (beanFactory == null) {
+				return this.environment.resolvePlaceholders(value);
+			}
+			BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver();
+			String resolved = beanFactory.resolveEmbeddedValue(value);
+			if (resolver == null) {
+				return resolved;
+			}
+			return String.valueOf(resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null)));
 		}
 		return value;
 	}

-	private String getUrl(Map<String, Object> attributes) {
-		String url = resolve((String) attributes.get("url"));
+	private String getUrl(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
+		String url = resolve(beanFactory, (String) attributes.get("url"));
 		return getUrl(url);
 	}

-	private String getPath(Map<String, Object> attributes) {
-		String path = resolve((String) attributes.get("path"));
+	private String getPath(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
+		String path = resolve(beanFactory, (String) attributes.get("path"));
 		return getPath(path);
 	}

@@ -324,6 +361,18 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		return null;
 	}

+	private String[] getQualifiers(Map<String, Object> client) {
+		if (client == null) {
+			return null;
+		}
+		List<String> qualifierList = new ArrayList<>(Arrays.asList((String[]) client.get("qualifiers")));
+		qualifierList.removeIf(qualifier -> !StringUtils.hasText(qualifier));
+		if (qualifierList.isEmpty() && getQualifier(client) != null) {
+			qualifierList = Collections.singletonList(getQualifier(client));
+		}
+		return !qualifierList.isEmpty() ? qualifierList.toArray(new String[0]) : null;
+	}
+
 	private String getClientName(Map<String, Object> client) {
 		if (client == null) {
 			return null;
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2021 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 org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * @author Nguyen Ky Thanh
+ */
+public class HttpClient5DisabledConditions extends AnyNestedCondition {
+
+	public HttpClient5DisabledConditions() {
+		super(ConfigurationPhase.PARSE_CONFIGURATION);
+	}
+
+	@ConditionalOnMissingClass("feign.hc5.ApacheHttp5Client")
+	static class ApacheHttp5ClientClassMissing {
+
+	}
+
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "false", matchIfMissing = true)
+	static class HttpClient5Disabled {
+
+	}
+
+}
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2013-2021 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.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.PreDestroy;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.http.ssl.TLS;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.pool.PoolConcurrencyPolicy;
+import org.apache.hc.core5.pool.PoolReusePolicy;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+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 Nguyen Ky Thanh
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnMissingBean(CloseableHttpClient.class)
+public class HttpClient5FeignConfiguration {
+
+	private static final Log LOG = LogFactory.getLog(HttpClient5FeignConfiguration.class);
+
+	private CloseableHttpClient httpClient5;
+
+	@Bean
+	@ConditionalOnMissingBean(HttpClientConnectionManager.class)
+	public HttpClientConnectionManager hc5ConnectionManager(FeignHttpClientProperties httpClientProperties) {
+		return PoolingHttpClientConnectionManagerBuilder.create()
+				.setSSLSocketFactory(httpsSSLConnectionSocketFactory(httpClientProperties.isDisableSslValidation()))
+				.setMaxConnTotal(httpClientProperties.getMaxConnections())
+				.setMaxConnPerRoute(httpClientProperties.getMaxConnectionsPerRoute())
+				.setConnPoolPolicy(PoolReusePolicy.valueOf(httpClientProperties.getHc5().getPoolReusePolicy().name()))
+				.setPoolConcurrencyPolicy(
+						PoolConcurrencyPolicy.valueOf(httpClientProperties.getHc5().getPoolConcurrencyPolicy().name()))
+				.setConnectionTimeToLive(
+						TimeValue.of(httpClientProperties.getTimeToLive(), httpClientProperties.getTimeToLiveUnit()))
+				.setDefaultSocketConfig(
+						SocketConfig.custom().setSoTimeout(Timeout.of(httpClientProperties.getHc5().getSocketTimeout(),
+								httpClientProperties.getHc5().getSocketTimeoutUnit())).build())
+				.build();
+	}
+
+	@Bean
+	public CloseableHttpClient httpClient5(HttpClientConnectionManager connectionManager,
+			FeignHttpClientProperties httpClientProperties) {
+		httpClient5 = HttpClients.custom().disableCookieManagement().useSystemProperties()
+				.setConnectionManager(connectionManager).evictExpiredConnections()
+				.setDefaultRequestConfig(RequestConfig.custom()
+						.setConnectTimeout(
+								Timeout.of(httpClientProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS))
+						.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build())
+				.build();
+		return httpClient5;
+	}
+
+	@PreDestroy
+	public void destroy() {
+		if (httpClient5 != null) {
+			httpClient5.close(CloseMode.GRACEFUL);
+		}
+	}
+
+	private LayeredConnectionSocketFactory httpsSSLConnectionSocketFactory(boolean isDisableSslValidation) {
+		final SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder
+				.create().setTlsVersions(TLS.V_1_3, TLS.V_1_2);
+
+		if (isDisableSslValidation) {
+			try {
+				final SSLContext sslContext = SSLContext.getInstance("SSL");
+				sslContext.init(null, new TrustManager[] { new DisabledValidationTrustManager() }, new SecureRandom());
+				sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
+			}
+			catch (NoSuchAlgorithmException e) {
+				LOG.warn("Error creating SSLContext", e);
+			}
+			catch (KeyManagementException e) {
+				LOG.warn("Error creating SSLContext", e);
+			}
+		}
+		else {
+			sslConnectionSocketFactoryBuilder.setSslContext(SSLContexts.createSystemDefault());
+		}
+
+		return sslConnectionSocketFactoryBuilder.build();
+	}
+
+	static class DisabledValidationTrustManager implements X509TrustManager {
+
+		DisabledValidationTrustManager() {
+		}
+
+		public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+		}
+
+		public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+		}
+
+		public X509Certificate[] getAcceptedIssuers() {
+			return null;
+		}
+
+	}
+
+}
@@ -16,11 +16,14 @@

 package org.springframework.cloud.openfeign.clientconfig;

+import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;

 import javax.annotation.PreDestroy;

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
@@ -48,6 +51,8 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnMissingBean(CloseableHttpClient.class)
 public class HttpClientFeignConfiguration {

+	private static final Log LOG = LogFactory.getLog(HttpClientFeignConfiguration.class);
+
 	private final Timer connectionManagerTimer = new Timer("FeignApacheHttpClientConfiguration.connectionManagerTimer",
 			true);

@@ -103,10 +108,17 @@ public class HttpClientFeignConfiguration {
 	}

 	@PreDestroy
-	public void destroy() throws Exception {
+	public void destroy() {
 		this.connectionManagerTimer.cancel();
 		if (this.httpClient != null) {
-			this.httpClient.close();
+			try {
+				this.httpClient.close();
+			}
+			catch (IOException e) {
+				if (LOG.isErrorEnabled()) {
+					LOG.error("Could not correctly close httpClient.");
+				}
+			}
 		}
 	}

@@ -25,7 +25,7 @@ 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.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -30,18 +30,18 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
 import org.springframework.cloud.client.loadbalancer.DefaultRequest;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
 import org.springframework.cloud.client.loadbalancer.DefaultResponse;
-import org.springframework.cloud.client.loadbalancer.HttpRequestContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycleValidator;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.RequestDataContext;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.Assert;

+import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.buildRequestData;
 import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing;

 /**
@@ -78,12 +78,12 @@ public class FeignBlockingLoadBalancerClient implements Client {
 		String serviceId = originalUri.getHost();
 		Assert.state(serviceId != null, "Request URI does not contain a valid hostname: " + originalUri);
 		String hint = getHint(serviceId);
-		DefaultRequest<DefaultRequestContext> lbRequest = new DefaultRequest<>(
-				new DefaultRequestContext(request, hint));
+		DefaultRequest<RequestDataContext> lbRequest = new DefaultRequest<>(
+				new RequestDataContext(buildRequestData(request), hint));
 		Set<LoadBalancerLifecycle> supportedLifecycleProcessors = LoadBalancerLifecycleValidator
 				.getSupportedLifecycleProcessors(
 						loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.class),
-						HttpRequestContext.class, ClientHttpResponse.class, ServiceInstance.class);
+						RequestDataContext.class, ResponseData.class, ServiceInstance.class);
 		supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStart(lbRequest));
 		ServiceInstance instance = loadBalancerClient.choose(serviceId, lbRequest);
 		org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
@@ -93,19 +93,23 @@ public class FeignBlockingLoadBalancerClient implements Client {
 			if (LOG.isWarnEnabled()) {
 				LOG.warn(message);
 			}
-			supportedLifecycleProcessors.forEach(
-					lifecycle -> lifecycle.onComplete(new CompletionContext<ClientHttpResponse, ServiceInstance>(
-							CompletionContext.Status.DISCARD, lbResponse)));
+			supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
+					.onComplete(new CompletionContext<ResponseData, ServiceInstance, RequestDataContext>(
+							CompletionContext.Status.DISCARD, lbRequest, lbResponse)));
 			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 executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbResponse,
+		Request newRequest = buildRequest(request, reconstructedUrl);
+		return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbRequest, lbResponse,
 				supportedLifecycleProcessors);
 	}

+	protected Request buildRequest(Request request, String reconstructedUrl) {
+		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
+				request.charset(), request.requestTemplate());
+	}
+
 	// Visible for Sleuth instrumentation
 	public Client getDelegate() {
 		return delegate;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,11 +19,14 @@ 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.client.loadbalancer.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
@@ -35,18 +38,20 @@ import org.springframework.context.annotation.Import;
 * of {@link Client}.
 *
 * @author Olga Maciaszek-Sharma
+ * @author Nguyen Ky Thanh
 * @since 2.2.0
 */
@ConditionalOnClass(Feign.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@AutoConfigureBefore(FeignAutoConfiguration.class)
+@AutoConfigureAfter({ BlockingLoadBalancerClientAutoConfiguration.class, LoadBalancerAutoConfiguration.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 })
+		HttpClient5FeignLoadBalancerConfiguration.class, DefaultFeignLoadBalancerConfiguration.class })
 public class FeignLoadBalancerAutoConfiguration {

 }
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-2021 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.hc5.ApacheHttp5Client;
+import org.apache.hc.client5.http.classic.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.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
+import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * that uses {@link ApacheHttp5Client} under the hood.
+ *
+ * @author Nguyen Ky Thanh
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(ApacheHttp5Client.class)
+@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
+@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
+@Import(HttpClient5FeignConfiguration.class)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
+class HttpClient5FeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	@Conditional(OnRetryNotEnabledCondition.class)
+	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
+		Client delegate = new ApacheHttp5Client(httpClient5);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
+	@ConditionalOnBean(LoadBalancedRetryFactory.class)
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
+			matchIfMissing = true)
+	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
+		Client delegate = new ApacheHttp5Client(httpClient5);
+		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
+				properties, loadBalancerClientFactory);
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,8 +27,9 @@ 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.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
+import org.springframework.cloud.openfeign.HttpClient5DisabledConditions;
 import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -40,12 +41,14 @@ import org.springframework.context.annotation.Import;
 * that uses {@link ApacheHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
+ * @author Nguyen Ky Thanh
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Conditional(HttpClient5DisabledConditions.class)
@Import(HttpClientFeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerProperties.class)
 class HttpClientFeignLoadBalancerConfiguration {
@@ -17,6 +17,9 @@
 package org.springframework.cloud.openfeign.loadbalancer;

 import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Set;

 import feign.Client;
@@ -26,6 +29,11 @@ import feign.Response;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
+import org.springframework.cloud.client.loadbalancer.RequestData;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;

 /**
 * @author Olga Maciaszek-Sharma
@@ -40,29 +48,47 @@ final class LoadBalancerUtils {
 	}

 	static Response executeWithLoadBalancerLifecycleProcessing(Client feignClient, Request.Options options,
-			Request feignRequest, org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
+			Request feignRequest, org.springframework.cloud.client.loadbalancer.Request lbRequest,
+			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
 			Set<LoadBalancerLifecycle> supportedLifecycleProcessors, boolean loadBalanced) throws IOException {
+		supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStartRequest(lbRequest, lbResponse));
 		try {
 			Response response = feignClient.execute(feignRequest, options);
 			if (loadBalanced) {
-				supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
-						.onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS, lbResponse, response)));
+				supportedLifecycleProcessors.forEach(
+						lifecycle -> lifecycle.onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS,
+								lbRequest, lbResponse, buildResponseData(response))));
 			}
 			return response;
 		}
 		catch (Exception exception) {
 			if (loadBalanced) {
-				supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
-						.onComplete(new CompletionContext<>(CompletionContext.Status.FAILED, exception, lbResponse)));
+				supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onComplete(
+						new CompletionContext<>(CompletionContext.Status.FAILED, exception, lbRequest, lbResponse)));
 			}
 			throw exception;
 		}
 	}

+	static ResponseData buildResponseData(Response response) {
+		HttpHeaders responseHeaders = new HttpHeaders();
+		response.headers().forEach((key, value) -> responseHeaders.put(key, new ArrayList<>(value)));
+		return new ResponseData(HttpStatus.resolve(response.status()), responseHeaders, null,
+				buildRequestData(response.request()));
+	}
+
+	static RequestData buildRequestData(Request request) {
+		HttpHeaders requestHeaders = new HttpHeaders();
+		request.headers().forEach((key, value) -> requestHeaders.put(key, new ArrayList<>(value)));
+		return new RequestData(HttpMethod.resolve(request.httpMethod().name()), URI.create(request.url()),
+				requestHeaders, null, new HashMap<>());
+	}
+
 	static Response executeWithLoadBalancerLifecycleProcessing(Client feignClient, Request.Options options,
-			Request feignRequest, org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
+			Request feignRequest, org.springframework.cloud.client.loadbalancer.Request lbRequest,
+			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
 			Set<LoadBalancerLifecycle> supportedLifecycleProcessors) throws IOException {
-		return executeWithLoadBalancerLifecycleProcessing(feignClient, options, feignRequest, lbResponse,
+		return executeWithLoadBalancerLifecycleProcessing(feignClient, options, feignRequest, lbRequest, lbResponse,
 				supportedLifecycleProcessors, true);
 	}

@@ -26,7 +26,7 @@ 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.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -35,7 +35,6 @@ import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
 import org.springframework.cloud.client.loadbalancer.DefaultRequest;
 import org.springframework.cloud.client.loadbalancer.DefaultResponse;
-import org.springframework.cloud.client.loadbalancer.HttpRequestContext;
 import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
@@ -44,14 +43,14 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycleValidator;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.cloud.client.loadbalancer.RetryableRequestContext;
 import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
-import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.retry.RetryListener;
 import org.springframework.retry.backoff.BackOffPolicy;
 import org.springframework.retry.backoff.NoBackOffPolicy;
@@ -59,7 +58,7 @@ import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;

-import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing;
+import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.buildRequestData;

 /**
 * A {@link Client} implementation that provides Spring Retry support for requests
@@ -107,7 +106,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 			Set<LoadBalancerLifecycle> supportedLifecycleProcessors = LoadBalancerLifecycleValidator
 					.getSupportedLifecycleProcessors(
 							loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.class),
-							HttpRequestContext.class, ClientHttpResponse.class, ServiceInstance.class);
+							RetryableRequestContext.class, ResponseData.class, ServiceInstance.class);
+			String hint = getHint(serviceId);
+			DefaultRequest<RetryableRequestContext> lbRequest = new DefaultRequest<>(
+					new RetryableRequestContext(null, buildRequestData(request), hint));
 			// On retries the policy will choose the server and set it in the context
 			// and extract the server and update the request being made
 			if (context instanceof LoadBalancedRetryContext) {
@@ -119,9 +121,7 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 								+ "Reattempting service instance selection");
 					}
 					ServiceInstance previousServiceInstance = lbContext.getPreviousServiceInstance();
-					String hint = getHint(serviceId);
-					DefaultRequest<RetryableRequestContext> lbRequest = new DefaultRequest<>(
-							new RetryableRequestContext(previousServiceInstance, request, hint));
+					lbRequest.getContext().setPreviousServiceInstance(previousServiceInstance);
 					supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStart(lbRequest));
 					retrievedServiceInstance = loadBalancerClient.choose(serviceId, lbRequest);
 					if (LOG.isDebugEnabled()) {
@@ -136,9 +136,9 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 					}
 					org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
 							retrievedServiceInstance);
-					supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onComplete(
-							new CompletionContext<ClientHttpResponse, ServiceInstance>(CompletionContext.Status.DISCARD,
-									lbResponse)));
+					supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
+							.onComplete(new CompletionContext<ResponseData, ServiceInstance, RetryableRequestContext>(
+									CompletionContext.Status.DISCARD, lbRequest, lbResponse)));
 					feignRequest = request;
 				}
 				else {
@@ -148,14 +148,14 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 					}
 					String reconstructedUrl = loadBalancerClient.reconstructURI(retrievedServiceInstance, originalUri)
 							.toString();
-					feignRequest = Request.create(request.httpMethod(), reconstructedUrl, request.headers(),
-							request.body(), request.charset(), request.requestTemplate());
+					feignRequest = buildRequest(request, reconstructedUrl);
 				}
 			}
 			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
 					retrievedServiceInstance);
-			Response response = executeWithLoadBalancerLifecycleProcessing(delegate, options, feignRequest, lbResponse,
-					supportedLifecycleProcessors, retrievedServiceInstance != null);
+			Response response = LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing(delegate, options,
+					feignRequest, lbRequest, lbResponse, supportedLifecycleProcessors,
+					retrievedServiceInstance != null);
 			int responseStatus = response.status();
 			if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) {
 				if (LOG.isDebugEnabled()) {
@@ -173,6 +173,11 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 		});
 	}

+	protected Request buildRequest(Request request, String reconstructedUrl) {
+		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
+				request.charset(), request.requestTemplate());
+	}
+
 	private RetryTemplate buildRetryTemplate(String serviceId, Request request, LoadBalancedRetryPolicy retryPolicy) {
 		RetryTemplate retryTemplate = new RetryTemplate();
 		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory.createBackOffPolicy(serviceId);
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2015-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.security;
+
+import java.util.Arrays;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.http.AccessTokenRequiredException;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
+import org.springframework.security.oauth2.client.token.AccessTokenProvider;
+import org.springframework.security.oauth2.client.token.AccessTokenProviderChain;
+import org.springframework.security.oauth2.client.token.AccessTokenRequest;
+import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider;
+import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeAccessTokenProvider;
+import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitAccessTokenProvider;
+import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+
+/**
+ * Pre-defined custom RequestInterceptor for Feign Requests. It uses the
+ * {@link OAuth2ClientContext OAuth2ClientContext} provided from the environment and
+ * construct a new header on the request before it is made by Feign.
+ *
+ * @author Joao Pedro Evangelista
+ * @author Tim Ysewyn
+ * @since 3.0.0
+ */
+public class OAuth2FeignRequestInterceptor implements RequestInterceptor {
+
+	/**
+	 * The name of the token.
+	 */
+	public static final String BEARER = "Bearer";
+
+	/**
+	 * The name of the header.
+	 */
+	public static final String AUTHORIZATION = "Authorization";
+
+	private final OAuth2ClientContext oAuth2ClientContext;
+
+	private final OAuth2ProtectedResourceDetails resource;
+
+	private final String tokenType;
+
+	private final String header;
+
+	private AccessTokenProvider accessTokenProvider = new AccessTokenProviderChain(Arrays.<AccessTokenProvider>asList(
+			new AuthorizationCodeAccessTokenProvider(), new ImplicitAccessTokenProvider(),
+			new ResourceOwnerPasswordAccessTokenProvider(), new ClientCredentialsAccessTokenProvider()));
+
+	/**
+	 * Default constructor which uses the provided OAuth2ClientContext and Bearer tokens
+	 * within Authorization header.
+	 * @param oAuth2ClientContext provided context
+	 * @param resource type of resource to be accessed
+	 */
+	public OAuth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
+			OAuth2ProtectedResourceDetails resource) {
+		this(oAuth2ClientContext, resource, BEARER, AUTHORIZATION);
+	}
+
+	/**
+	 * Fully customizable constructor for changing token type and header name, in cases of
+	 * Bearer and Authorization is not the default such as "bearer", "authorization".
+	 * @param oAuth2ClientContext current oAuth2 Context
+	 * @param resource type of resource to be accessed
+	 * @param tokenType type of token e.g. "token", "Bearer"
+	 * @param header name of the header e.g. "Authorization", "authorization"
+	 */
+	public OAuth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
+			OAuth2ProtectedResourceDetails resource, String tokenType, String header) {
+		this.oAuth2ClientContext = oAuth2ClientContext;
+		this.resource = resource;
+		this.tokenType = tokenType;
+		this.header = header;
+	}
+
+	/**
+	 * Create a template with the header of provided name and extracted extract.
+	 *
+	 * @see RequestInterceptor#apply(RequestTemplate)
+	 */
+	@Override
+	public void apply(RequestTemplate template) {
+		template.header(header); // Clears out the header, no "clear" method available.
+		template.header(header, extract(tokenType));
+	}
+
+	/**
+	 * Extracts the token extract id the access token exists or returning an empty extract
+	 * if there is no one on the context it may occasionally causes Unauthorized response
+	 * since the token extract is empty.
+	 * @param tokenType type name of token
+	 * @return token value from context if it exists otherwise empty String
+	 */
+	protected String extract(String tokenType) {
+		OAuth2AccessToken accessToken = getToken();
+		return String.format("%s %s", tokenType, accessToken.getValue());
+	}
+
+	/**
+	 * Extract the access token within the request or try to acquire a new one by
+	 * delegating it to {@link #acquireAccessToken()}.
+	 * @return valid token
+	 */
+	public OAuth2AccessToken getToken() {
+
+		OAuth2AccessToken accessToken = oAuth2ClientContext.getAccessToken();
+		if (accessToken == null || accessToken.isExpired()) {
+			try {
+				accessToken = acquireAccessToken();
+			}
+			catch (UserRedirectRequiredException e) {
+				oAuth2ClientContext.setAccessToken(null);
+				String stateKey = e.getStateKey();
+				if (stateKey != null) {
+					Object stateToPreserve = e.getStateToPreserve();
+					if (stateToPreserve == null) {
+						stateToPreserve = "NONE";
+					}
+					oAuth2ClientContext.setPreservedState(stateKey, stateToPreserve);
+				}
+				throw e;
+			}
+		}
+		return accessToken;
+	}
+
+	/**
+	 * Try to acquire the token using a access token provider.
+	 * @return valid access token
+	 * @throws UserRedirectRequiredException in case the user needs to be redirected to an
+	 * approval page or login page
+	 */
+	protected OAuth2AccessToken acquireAccessToken() throws UserRedirectRequiredException {
+		AccessTokenRequest tokenRequest = oAuth2ClientContext.getAccessTokenRequest();
+		if (tokenRequest == null) {
+			throw new AccessTokenRequiredException(
+					"Cannot find valid context on request for resource '" + resource.getId() + "'.", resource);
+		}
+		String stateKey = tokenRequest.getStateKey();
+		if (stateKey != null) {
+			tokenRequest.setPreservedState(oAuth2ClientContext.removePreservedState(stateKey));
+		}
+		OAuth2AccessToken existingToken = oAuth2ClientContext.getAccessToken();
+		if (existingToken != null) {
+			oAuth2ClientContext.setAccessToken(existingToken);
+		}
+		OAuth2AccessToken obtainableAccessToken;
+		obtainableAccessToken = accessTokenProvider.obtainAccessToken(resource, tokenRequest);
+		if (obtainableAccessToken == null || obtainableAccessToken.getValue() == null) {
+			throw new IllegalStateException(
+					" Access token provider returned a null token, which is illegal according to the contract.");
+		}
+		oAuth2ClientContext.setAccessToken(obtainableAccessToken);
+		return obtainableAccessToken;
+	}
+
+	public void setAccessTokenProvider(AccessTokenProvider accessTokenProvider) {
+		this.accessTokenProvider = accessTokenProvider;
+	}
+
+}
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2013-2021 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 org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Properties for {@link SpringEncoder}.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.8
+ */
+@ConfigurationProperties("feign.encoder")
+public class FeignEncoderProperties {
+
+	/**
+	 * Indicates whether the charset should be derived from the {@code Content-Type}
+	 * header.
+	 */
+	private boolean charsetFromContentType = false;
+
+	public boolean isCharsetFromContentType() {
+		return charsetFromContentType;
+	}
+
+	public void setCharsetFromContentType(boolean charsetFromContentType) {
+		this.charsetFromContentType = charsetFromContentType;
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,6 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
 * @author Ryan Baxter
+ * @author Nguyen Ky Thanh
 */
@ConfigurationProperties(prefix = "feign.httpclient")
 public class FeignHttpClientProperties {
@@ -82,6 +83,11 @@ public class FeignHttpClientProperties {

 	private int connectionTimerRepeat = DEFAULT_CONNECTION_TIMER_REPEAT;

+	/**
+	 * Apache HttpClient5 additional properties.
+	 */
+	private Hc5Properties hc5 = new Hc5Properties();
+
 	public int getConnectionTimerRepeat() {
 		return this.connectionTimerRepeat;
 	}
@@ -146,4 +152,124 @@ public class FeignHttpClientProperties {
 		this.connectionTimeout = connectionTimeout;
 	}

+	public Hc5Properties getHc5() {
+		return hc5;
+	}
+
+	public void setHc5(Hc5Properties hc5) {
+		this.hc5 = hc5;
+	}
+
+	public static class Hc5Properties {
+
+		/**
+		 * Default value for pool concurrency policy.
+		 */
+		public static final PoolConcurrencyPolicy DEFAULT_POOL_CONCURRENCY_POLICY = PoolConcurrencyPolicy.STRICT;
+
+		/**
+		 * Default value for pool reuse policy.
+		 */
+		public static final PoolReusePolicy DEFAULT_POOL_REUSE_POLICY = PoolReusePolicy.FIFO;
+
+		/**
+		 * Default value for socket timeout.
+		 */
+		public static final int DEFAULT_SOCKET_TIMEOUT = 5;
+
+		/**
+		 * Default value for socket timeout unit.
+		 */
+		public static final TimeUnit DEFAULT_SOCKET_TIMEOUT_UNIT = TimeUnit.SECONDS;
+
+		/**
+		 * Pool concurrency policies.
+		 */
+		private PoolConcurrencyPolicy poolConcurrencyPolicy = DEFAULT_POOL_CONCURRENCY_POLICY;
+
+		/**
+		 * Pool connection re-use policies.
+		 */
+		private PoolReusePolicy poolReusePolicy = DEFAULT_POOL_REUSE_POLICY;
+
+		/**
+		 * Default value for socket timeout.
+		 */
+		private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+
+		/**
+		 * Default value for socket timeout unit.
+		 */
+		private TimeUnit socketTimeoutUnit = DEFAULT_SOCKET_TIMEOUT_UNIT;
+
+		public PoolConcurrencyPolicy getPoolConcurrencyPolicy() {
+			return this.poolConcurrencyPolicy;
+		}
+
+		public void setPoolConcurrencyPolicy(PoolConcurrencyPolicy poolConcurrencyPolicy) {
+			this.poolConcurrencyPolicy = poolConcurrencyPolicy;
+		}
+
+		public PoolReusePolicy getPoolReusePolicy() {
+			return poolReusePolicy;
+		}
+
+		public void setPoolReusePolicy(PoolReusePolicy poolReusePolicy) {
+			this.poolReusePolicy = poolReusePolicy;
+		}
+
+		public TimeUnit getSocketTimeoutUnit() {
+			return socketTimeoutUnit;
+		}
+
+		public void setSocketTimeoutUnit(TimeUnit socketTimeoutUnit) {
+			this.socketTimeoutUnit = socketTimeoutUnit;
+		}
+
+		public int getSocketTimeout() {
+			return socketTimeout;
+		}
+
+		public void setSocketTimeout(int socketTimeout) {
+			this.socketTimeout = socketTimeout;
+		}
+
+		/**
+		 * Enumeration of pool concurrency policies.
+		 */
+		public enum PoolConcurrencyPolicy {
+
+			/**
+			 * Higher concurrency but with lax connection max limit guarantees.
+			 */
+			LAX,
+
+			/**
+			 * Strict connection max limit guarantees.
+			 */
+			STRICT
+
+		}
+
+		/**
+		 * Enumeration of pooled connection re-use policies.
+		 */
+		public enum PoolReusePolicy {
+
+			/**
+			 * Re-use as few connections as possible making it possible for connections to
+			 * become idle and expire.
+			 */
+			LIFO,
+
+			/**
+			 * Re-use all connections equally preventing them from becoming idle and
+			 * expiring.
+			 */
+			FIFO
+
+		}
+
+	}
+
 }
@@ -20,6 +20,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;

+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.Version;
@@ -36,6 +37,7 @@ import org.springframework.data.domain.Sort;
 * This Jackson module provides support to deserialize Spring {@link Page} objects.
 *
 * @author Pascal Büttiker
+ * @author Olga Maciaszek-Sharma
 */
 public class PageJacksonModule extends Module {

@@ -64,7 +66,8 @@ public class PageJacksonModule extends Module {
 		private final Page<T> delegate;

 		SimplePageImpl(@JsonProperty("content") List<T> content, @JsonProperty("number") int number,
-				@JsonProperty("size") int size, @JsonProperty("totalElements") long totalElements,
+				@JsonProperty("size") int size, @JsonProperty("totalElements") @JsonAlias({ "total-elements",
+						"total_elements", "totalelements", "TotalElements" }) long totalElements,
 				@JsonProperty("sort") Sort sort) {
 			PageRequest pageRequest;
 			if (sort != null) {
@@ -116,7 +116,7 @@ public class PageableSpringEncoder implements Encoder {
 			}
 		}
 		for (Sort.Order order : sort) {
-			sortQueries.add(order.getProperty() + "," + order.getDirection());
+			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
 		}
 		if (!sortQueries.isEmpty()) {
 			template.query(sortParameter, sortQueries);
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2021 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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import feign.querymap.BeanQueryMapEncoder;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Provides support for encoding Pageable annotated as
+ * {@link org.springframework.cloud.openfeign.SpringQueryMap}.
+ *
+ * @author Hyeonmin Park
+ * @since 2.2.8
+ */
+public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
+
+	@Override
+	public Map<String, Object> encode(Object object) {
+		if (supports(object)) {
+			Map<String, Object> queryMap = new HashMap<>();
+
+			if (object instanceof Pageable) {
+				Pageable pageable = (Pageable) object;
+
+				if (pageable.isPaged()) {
+					queryMap.put("page", pageable.getPageNumber());
+					queryMap.put("size", pageable.getPageSize());
+				}
+
+				if (pageable.getSort() != null) {
+					applySort(queryMap, pageable.getSort());
+				}
+			}
+			else if (object instanceof Sort) {
+				Sort sort = (Sort) object;
+				applySort(queryMap, sort);
+			}
+			return queryMap;
+		}
+		else {
+			return super.encode(object);
+		}
+	}
+
+	private void applySort(Map<String, Object> queryMap, Sort sort) {
+		List<String> sortQueries = new ArrayList<>();
+		for (Sort.Order order : sort) {
+			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
+		}
+		if (!sortQueries.isEmpty()) {
+			queryMap.put("sort", sortQueries);
+		}
+	}
+
+	protected boolean supports(Object object) {
+		return object instanceof Pageable || object instanceof Sort;
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -26,16 +26,16 @@ import feign.Response;
 import feign.codec.Decoder;

 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;

 /**
 * Decoder adds compatibility for Spring MVC's ResponseEntity to any other decoder via
 * composition.
 *
 * @author chad jaros
+ * @author Olga Maciaszek-Sharma
 */
 public class ResponseEntityDecoder implements Decoder {

@@ -80,7 +80,7 @@ public class ResponseEntityDecoder implements Decoder {
 	@SuppressWarnings("unchecked")
 	private <T> ResponseEntity<T> createResponse(Object instance, Response response) {

-		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+		HttpHeaders headers = new HttpHeaders();
 		for (String key : response.headers().keySet()) {
 			headers.put(key, new LinkedList<>(response.headers().get(key)));
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,10 +22,10 @@ import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Objects;
+import java.util.stream.Stream;

-import feign.Request;
 import feign.RequestTemplate;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
@@ -55,7 +55,9 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
 * @author Ahmad Mozafarnia
 * @author Aaron Whiteside
 * @author Darren Foong
+ * @author Olga Maciaszek-Sharma
 */
+@SuppressWarnings("rawtypes")
 public class SpringEncoder implements Encoder {

 	private static final Log log = LogFactory.getLog(SpringEncoder.class);
@@ -64,14 +66,21 @@ public class SpringEncoder implements Encoder {

 	private final ObjectFactory<HttpMessageConverters> messageConverters;

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

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

 	@Override
@@ -86,7 +95,7 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}

-			if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
+			if (isMultipartType(requestContentType)) {
 				this.springFormEncoder.encode(requestBody, bodyType, request);
 				return;
 			}
@@ -96,54 +105,67 @@ public class SpringEncoder implements Encoder {
 							+ "should be specified as MediaType.MULTIPART_FORM_DATA_VALUE");
 				}
 			}
-
-			for (HttpMessageConverter messageConverter : this.messageConverters.getObject().getConverters()) {
-				FeignOutputMessage outputMessage;
-				try {
-					if (messageConverter instanceof GenericHttpMessageConverter) {
-						outputMessage = checkAndWrite(requestBody, bodyType, requestContentType,
-								(GenericHttpMessageConverter) messageConverter, request);
-					}
-					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
-					// with the modified headers
-					request.headers(getHeaders(outputMessage.getHeaders()));
-
-					// do not use charset for binary data and protobuf
-					Charset charset;
-					if (messageConverter instanceof ByteArrayHttpMessageConverter) {
-						charset = null;
-					}
-					else if (messageConverter instanceof ProtobufHttpMessageConverter
-							&& ProtobufHttpMessageConverter.PROTOBUF
-									.isCompatibleWith(outputMessage.getHeaders().getContentType())) {
-						charset = null;
-					}
-					else {
-						charset = StandardCharsets.UTF_8;
-					}
-					request.body(Request.Body.encoded(outputMessage.getOutputStream().toByteArray(), charset));
-					return;
-				}
-			}
-			String message = "Could not write request: no suitable HttpMessageConverter " + "found for request type ["
-					+ requestBody.getClass().getName() + "]";
-			if (requestContentType != null) {
-				message += " and content type [" + requestContentType + "]";
-			}
-			throw new EncodeException(message);
+			encodeWithMessageConverter(requestBody, bodyType, request, requestContentType);
 		}
 	}

+	private void encodeWithMessageConverter(Object requestBody, Type bodyType, RequestTemplate request,
+			MediaType requestContentType) {
+		for (HttpMessageConverter messageConverter : this.messageConverters.getObject().getConverters()) {
+			FeignOutputMessage outputMessage;
+			try {
+				if (messageConverter instanceof GenericHttpMessageConverter) {
+					outputMessage = checkAndWrite(requestBody, bodyType, requestContentType,
+							(GenericHttpMessageConverter) messageConverter, request);
+				}
+				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
+				// with the modified headers
+				request.headers(getHeaders(outputMessage.getHeaders()));
+
+				// do not use charset for binary data and protobuf
+				Charset charset;
+
+				MediaType contentType = outputMessage.getHeaders().getContentType();
+				Charset charsetFromContentType = contentType != null ? contentType.getCharset() : null;
+
+				if (encoderProperties != null && encoderProperties.isCharsetFromContentType()
+						&& charsetFromContentType != null) {
+					charset = charsetFromContentType;
+				}
+				else if (shouldHaveNullCharset(messageConverter, outputMessage)) {
+					charset = null;
+				}
+				else {
+					charset = StandardCharsets.UTF_8;
+				}
+				request.body(outputMessage.getOutputStream().toByteArray(), charset);
+				return;
+			}
+		}
+		String message = "Could not write request: no suitable HttpMessageConverter " + "found for request type ["
+				+ requestBody.getClass().getName() + "]";
+		if (requestContentType != null) {
+			message += " and content type [" + requestContentType + "]";
+		}
+		throw new EncodeException(message);
+	}
+
+	private boolean shouldHaveNullCharset(HttpMessageConverter messageConverter, FeignOutputMessage outputMessage) {
+		return binaryContentType(outputMessage) || messageConverter instanceof ByteArrayHttpMessageConverter
+				|| messageConverter instanceof ProtobufHttpMessageConverter && ProtobufHttpMessageConverter.PROTOBUF
+						.isCompatibleWith(outputMessage.getHeaders().getContentType());
+	}
+
 	@SuppressWarnings("unchecked")
 	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType, HttpMessageConverter converter,
 			RequestTemplate request) throws IOException {
@@ -185,6 +207,19 @@ public class SpringEncoder implements Encoder {
 		}
 	}

+	private boolean isMultipartType(MediaType requestContentType) {
+		return Arrays.asList(MediaType.MULTIPART_FORM_DATA, MediaType.MULTIPART_MIXED, MediaType.MULTIPART_RELATED)
+				.contains(requestContentType);
+	}
+
+	private boolean binaryContentType(FeignOutputMessage outputMessage) {
+		MediaType contentType = outputMessage.getHeaders().getContentType();
+		return contentType == null || Stream
+				.of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF,
+						MediaType.IMAGE_GIF, MediaType.IMAGE_JPEG, MediaType.IMAGE_PNG)
+				.anyMatch(mediaType -> mediaType.includes(contentType));
+	}
+
 	private final class FeignOutputMessage implements HttpOutputMessage {

 		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -78,6 +78,7 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
 * @author Aaron Whiteside
 * @author Artyom Romanenko
 * @author Darren Foong
+ * @author Ram Anaswara
 */
 public class SpringMvcContract extends Contract.BaseContract implements ResourceLoaderAware {

@@ -101,6 +102,8 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource

 	private ResourceLoader resourceLoader = new DefaultResourceLoader();

+	private boolean decodeSlash;
+
 	public SpringMvcContract() {
 		this(Collections.emptyList());
 	}
@@ -111,6 +114,11 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource

 	public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors,
 			ConversionService conversionService) {
+		this(annotatedParameterProcessors, conversionService, true);
+	}
+
+	public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors,
+			ConversionService conversionService, boolean decodeSlash) {
 		Assert.notNull(annotatedParameterProcessors, "Parameter processors can not be null.");
 		Assert.notNull(conversionService, "ConversionService can not be null.");

@@ -120,6 +128,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 		annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
 		convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
+		this.decodeSlash = decodeSlash;
 	}

 	private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) {
@@ -171,6 +180,9 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 						pathValue = "/" + pathValue;
 					}
 					data.template().uri(pathValue);
+					if (data.template().decodeSlash() != decodeSlash) {
+						data.template().decodeSlash(decodeSlash);
+					}
 				}
 			}
 		}
@@ -232,6 +244,9 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 					pathValue = "/" + pathValue;
 				}
 				data.template().uri(pathValue, true);
+				if (data.template().decodeSlash() != decodeSlash) {
+					data.template().decodeSlash(decodeSlash);
+				}
 			}
 		}

@@ -386,25 +401,6 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 		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 conversionService.convert(value, String.class);
-		}
-
-	}
-
 	private static class ConvertingExpanderFactory {

 		private final ConversionService conversionService;
@@ -3,9 +3,15 @@
 	],
 	"properties": [
 		{
-			"name": "feign.hystrix.enabled",
+			"name": "feign.autoconfiguration.jackson.enabled",
 			"type": "java.lang.Boolean",
-			"description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
+			"description": "If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.",
+			"defaultValue": "false"
+		},
+		{
+			"name": "feign.circuitbreaker.enabled",
+			"type": "java.lang.Boolean",
+			"description": "If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.",
 			"defaultValue": "false"
 		},
 		{
@@ -14,6 +20,12 @@
 			"description": "Enables the use of the Apache HTTP Client by Feign.",
 			"defaultValue": "true"
 		},
+		{
+			"name": "feign.httpclient.hc5.enabled",
+			"type": "java.lang.Boolean",
+			"description": "Enables the use of the Apache HTTP Client 5 by Feign.",
+			"defaultValue": "false"
+		},
 		{
 			"name": "feign.okhttp.enabled",
 			"type": "java.lang.Boolean",
@@ -37,6 +49,12 @@
 			"type": "java.lang.Boolean",
 			"description": "Enables the request sent by Feign to be compressed.",
 			"defaultValue": "false"
+		},
+		{
+			"name": "feign.metrics.enabled",
+			"type": "java.lang.Boolean",
+			"description": "Enables metrics capability for Feign.",
+			"defaultValue": "true"
 		}
 	]
 }
@@ -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 org.assertj.core.api.Condition;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+/**
+ * @author Tim Peeters
+ * @author Olga Maciaszek-Sharma
+ */
+class FeignAutoConfigurationTests {
+
+	private final ApplicationContextRunner runner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class))
+			.withPropertyValues("feign.httpclient.enabled=false");
+
+	@Test
+	void shouldInstantiateDefaultTargeterWhenFeignCircuitBreakerIsDisabled() {
+		runner.withPropertyValues("feign.circuitbreaker.enabled=false")
+				.run(ctx -> assertOnlyOneTargeterPresent(ctx, DefaultTargeter.class));
+	}
+
+	@Test
+	void shouldInstantiateFeignCircuitBreakerTargeterWhenEnabled() {
+		runner.withBean(CircuitBreakerFactory.class, () -> mock(CircuitBreakerFactory.class))
+				.withPropertyValues("feign.circuitbreaker.enabled=true")
+				.run(ctx -> assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class));
+	}
+
+	private void assertOnlyOneTargeterPresent(ConfigurableApplicationContext ctx, Class<?> beanClass) {
+		assertThat(ctx.getBeansOfType(Targeter.class)).hasSize(1).hasValueSatisfying(new Condition<>(
+				beanClass::isInstance, String.format("Targeter should be an instance of %s", beanClass)));
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -80,8 +80,8 @@ public class FeignClientBuilderTests {
 		for (final Method method : FeignClient.class.getMethods()) {
 			methodNames.add(method.getName());
 		}
-		methodNames.removeAll(Arrays.asList("annotationType", "value", "serviceId", "qualifier", "configuration",
-				"primary", "equals", "hashCode", "toString"));
+		methodNames.removeAll(Arrays.asList("annotationType", "value", "serviceId", "qualifier", "qualifiers",
+				"configuration", "primary", "equals", "hashCode", "toString"));
 		Collections.sort(methodNames);
 		// If this safety check fails the Builder has to be updated.
 		// (1) Either a field was removed from the FeignClient annotation and so it has to
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2021-2021 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 java.util.List;
+import java.util.Map;
+
+import feign.Capability;
+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.assertj.core.util.Lists;
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsAndHashCodeConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsReflexivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsSymmetricity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsTransitivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertHashCodeConsistency;
+
+/**
+ * @author Jonatan Ivanov
+ */
+class FeignClientConfigurationTests {
+
+	@Test
+	void shouldDefaultToValuesWhenFieldsNotSet() {
+		FeignClientProperties.FeignClientConfiguration config = new FeignClientProperties.FeignClientConfiguration();
+
+		assertThat(config.getLoggerLevel()).isNull();
+		assertThat(config.getConnectTimeout()).isNull();
+		assertThat(config.getReadTimeout()).isNull();
+		assertThat(config.getRetryer()).isNull();
+		assertThat(config.getErrorDecoder()).isNull();
+		assertThat(config.getRequestInterceptors()).isNull();
+		assertThat(config.getDefaultRequestHeaders()).isNull();
+		assertThat(config.getDefaultQueryParameters()).isNull();
+		assertThat(config.getDecode404()).isNull();
+		assertThat(config.getDecoder()).isNull();
+		assertThat(config.getEncoder()).isNull();
+		assertThat(config.getContract()).isNull();
+		assertThat(config.getExceptionPropagationPolicy()).isNull();
+		assertThat(config.getCapabilities()).isNull();
+		assertThat(config.getMetrics()).isNull();
+	}
+
+	@Test
+	void shouldReturnValuesWhenSet() {
+		FeignClientProperties.FeignClientConfiguration config = new FeignClientProperties.FeignClientConfiguration();
+		config.setLoggerLevel(Logger.Level.FULL);
+		config.setConnectTimeout(21);
+		config.setReadTimeout(42);
+		config.setRetryer(Retryer.class);
+		config.setErrorDecoder(ErrorDecoder.class);
+		List<Class<RequestInterceptor>> requestInterceptors = Lists.list(RequestInterceptor.class);
+		config.setRequestInterceptors(requestInterceptors);
+		Map<String, Collection<String>> defaultRequestHeaders = Maps.newHashMap("default", Lists.emptyList());
+		config.setDefaultRequestHeaders(defaultRequestHeaders);
+		Map<String, Collection<String>> defaultQueryParameters = Maps.newHashMap("default", Lists.emptyList());
+		config.setDefaultQueryParameters(defaultQueryParameters);
+		config.setDecode404(true);
+		config.setDecoder(Decoder.class);
+		config.setEncoder(Encoder.class);
+		config.setContract(Contract.class);
+		config.setExceptionPropagationPolicy(ExceptionPropagationPolicy.UNWRAP);
+		List<Class<Capability>> capabilities = Lists.list(Capability.class);
+		config.setCapabilities(capabilities);
+		FeignClientProperties.MetricsProperties metrics = new FeignClientProperties.MetricsProperties();
+		config.setMetrics(metrics);
+
+		assertThat(config.getLoggerLevel()).isSameAs(Logger.Level.FULL);
+		assertThat(config.getConnectTimeout()).isEqualTo(21);
+		assertThat(config.getReadTimeout()).isEqualTo(42);
+		assertThat(config.getRetryer()).isSameAs(Retryer.class);
+		assertThat(config.getErrorDecoder()).isSameAs(ErrorDecoder.class);
+		assertThat(config.getRequestInterceptors()).isSameAs(requestInterceptors);
+		assertThat(config.getDefaultRequestHeaders()).isSameAs(defaultRequestHeaders);
+		assertThat(config.getDefaultQueryParameters()).isSameAs(defaultQueryParameters);
+		assertThat(config.getDecode404()).isTrue();
+		assertThat(config.getDecoder()).isSameAs(Decoder.class);
+		assertThat(config.getEncoder()).isSameAs(Encoder.class);
+		assertThat(config.getContract()).isSameAs(Contract.class);
+		assertThat(config.getExceptionPropagationPolicy()).isSameAs(ExceptionPropagationPolicy.UNWRAP);
+		assertThat(config.getCapabilities()).isSameAs(capabilities);
+		assertThat(config.getMetrics()).isSameAs(metrics);
+	}
+
+	/**
+	 * Sanity-checks equals and hashCode contracts but does not check every variation of
+	 * the fields.
+	 */
+	@Test
+	void shouldHaveSomewhatValidEqualsAndHashCode() {
+		FeignClientProperties.FeignClientConfiguration configOne = new FeignClientProperties.FeignClientConfiguration();
+		FeignClientProperties.FeignClientConfiguration configTwo = new FeignClientProperties.FeignClientConfiguration();
+		FeignClientProperties.FeignClientConfiguration configThree = new FeignClientProperties.FeignClientConfiguration();
+		FeignClientProperties.FeignClientConfiguration differentConfig = new FeignClientProperties.FeignClientConfiguration();
+		differentConfig.setDecode404(true);
+
+		assertEqualsReflexivity(configOne);
+
+		assertEqualsSymmetricity(configOne, configTwo);
+		assertEqualsSymmetricity(configOne, differentConfig);
+		assertEqualsSymmetricity(configOne, 42);
+
+		assertEqualsTransitivity(configOne, configTwo, configThree);
+
+		assertEqualsConsistency(configOne, configTwo);
+		assertEqualsConsistency(configOne, differentConfig);
+		assertEqualsConsistency(configOne, 42);
+		assertEqualsConsistency(configOne, null);
+
+		assertHashCodeConsistency(configOne);
+		assertEqualsAndHashCodeConsistency(configOne, configTwo);
+	}
+
+}
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import feign.Capability;
+import feign.Contract;
+import feign.RequestLine;
+import feign.micrometer.MicrometerCapability;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Jonatan Ivanov
+ */
+@DirtiesContext
+@ActiveProfiles("no-foo-metrics")
+@SpringBootTest(classes = FeignClientDisabledClientLevelFeaturesTests.TestConfiguration.class)
+class FeignClientDisabledClientLevelFeaturesTests {
+
+	@Autowired
+	private FeignContext context;
+
+	@Autowired
+	private FooClient foo;
+
+	@Autowired
+	private BarClient bar;
+
+	@Test
+	void clientsAvailable() {
+		assertThat(foo).isNotNull();
+		assertThat(bar).isNotNull();
+	}
+
+	@Test
+	void capabilitiesShouldNotBeAvailableWhenDisabled() {
+		assertThat(context.getInstance("foo", MicrometerCapability.class)).isNull();
+		assertThat(context.getInstances("foo", Capability.class)).isEmpty();
+
+		assertThat(context.getInstance("bar", MicrometerCapability.class)).isNotNull();
+		Map<String, Capability> barCapabilities = context.getInstances("bar", Capability.class);
+		assertThat(barCapabilities).hasSize(2);
+		assertThat(barCapabilities.get("micrometerCapability")).isExactlyInstanceOf(MicrometerCapability.class);
+		assertThat(barCapabilities.get("noOpCapability")).isExactlyInstanceOf(NoOpCapability.class);
+	}
+
+	@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)
+	@EnableAutoConfiguration
+	@EnableConfigurationProperties(FeignClientProperties.class)
+	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
+	protected static class TestConfiguration {
+
+	}
+
+	public static class FooConfiguration {
+
+		@Bean // if the feign configuration empty, the context is not able to start
+		public Contract feignContract() {
+			return new Contract.Default();
+		}
+
+	}
+
+	public static class BarConfiguration {
+
+		@Bean
+		public Capability noOpCapability() {
+			return new NoOpCapability();
+		}
+
+	}
+
+	private static class NoOpCapability implements Capability {
+
+	}
+
+}
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import feign.Capability;
+import feign.Contract;
+import feign.RequestLine;
+import feign.micrometer.MicrometerCapability;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Jonatan Ivanov
+ */
+@DirtiesContext
+@ActiveProfiles("no-metrics")
+@SpringBootTest(classes = FeignClientDisabledFeaturesTests.TestConfiguration.class)
+class FeignClientDisabledFeaturesTests {
+
+	@Autowired
+	private FeignContext context;
+
+	@Autowired
+	private FooClient foo;
+
+	@Autowired
+	private BarClient bar;
+
+	@Test
+	void clientsAvailable() {
+		assertThat(foo).isNotNull();
+		assertThat(bar).isNotNull();
+	}
+
+	@Test
+	void capabilitiesShouldNotBeAvailable() {
+		assertThat(context.getInstance("foo", MicrometerCapability.class)).isNull();
+		assertThat(context.getInstances("foo", Capability.class)).isEmpty();
+
+		assertThat(context.getInstance("bar", MicrometerCapability.class)).isNull();
+		Map<String, Capability> barCapabilities = context.getInstances("bar", Capability.class);
+		assertThat(barCapabilities).hasSize(1);
+		assertThat(barCapabilities.get("noOpCapability")).isExactlyInstanceOf(NoOpCapability.class);
+	}
+
+	@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)
+	@EnableAutoConfiguration
+	@EnableConfigurationProperties(FeignClientProperties.class)
+	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
+	protected static class TestConfiguration {
+
+	}
+
+	public static class FooConfiguration {
+
+		@Bean // if the feign configuration empty, the context is not able to start
+		public Contract feignContract() {
+			return new Contract.Default();
+		}
+
+	}
+
+	public static class BarConfiguration {
+
+		@Bean
+		public Capability noOpCapability() {
+			return new NoOpCapability();
+		}
+
+	}
+
+	private static class NoOpCapability implements Capability {
+
+	}
+
+}
@@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Michael Cramer
+ * @author Jonatan Ivanov
 */
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = FeignClientErrorDecoderTests.TestConfiguration.class)
@@ -85,7 +86,8 @@ public class FeignClientErrorDecoderTests {

 	@SuppressWarnings({ "unchecked", "ConstantConditions" })
 	private Object getErrorDecoderFromClient(final Object client) {
-		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
+		Object invocationHandlerLambda = ReflectionTestUtils.getField(client, "h");
+		Object invocationHandler = ReflectionTestUtils.getField(invocationHandlerLambda, "arg$2");
 		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
 				.getField(invocationHandler, "dispatch");
 		Method key = new ArrayList<>(dispatch.keySet()).get(0);
@@ -29,7 +29,7 @@ import org.junit.Test;

 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2021-2021 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.HashMap;
+
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Jonatan Ivanov
+ */
+@ExtendWith({ MockitoExtension.class })
+class FeignClientMetricsEnabledConditionTests {
+
+	@Mock
+	private ConditionContext context;
+
+	@Mock
+	private AnnotatedTypeMetadata metadata;
+
+	@Mock
+	private ConfigurableListableBeanFactory beanFactory;
+
+	@Mock
+	private ObjectProvider<FeignClientProperties> beanProvider;
+
+	@Mock
+	private Environment environment;
+
+	private final FeignClientMetricsEnabledCondition condition = new FeignClientMetricsEnabledCondition();
+
+	@BeforeEach
+	void setUp() {
+		when(context.getBeanFactory()).thenReturn(beanFactory);
+		when(beanFactory.getBeanProvider(FeignClientProperties.class)).thenReturn(beanProvider);
+	}
+
+	@AfterEach
+	void tearDown() {
+		verify(context).getBeanFactory();
+		verify(beanFactory).getBeanProvider(FeignClientProperties.class);
+		verify(beanProvider).getIfAvailable();
+	}
+
+	@Test
+	void shouldMatchWhenFeignClientPropertiesBeanIsMissing() {
+		when(beanProvider.getIfAvailable()).thenReturn(null);
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment, never()).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenConfigMapIsMissing() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(feignClientProperties.getConfig()).thenReturn(null);
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment, never()).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenConfigMapDoesNotContainTheConfig() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenClientNameIsNull() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn(null);
+		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenClientNameIsEmpty() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("");
+		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenConfigMapContainsNullConfig() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", null));
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenMetricsConfigurationIsMissing() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		FeignClientProperties.FeignClientConfiguration feignClientConfig = mock(
+				FeignClientProperties.FeignClientConfiguration.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
+		when(feignClientConfig.getMetrics()).thenReturn(null);
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenEnabledFlagIsNotSet() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		FeignClientProperties.FeignClientConfiguration feignClientConfig = mock(
+				FeignClientProperties.FeignClientConfiguration.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
+		when(feignClientConfig.getMetrics()).thenReturn(new FeignClientProperties.MetricsProperties());
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenEnabledFlagIsNull() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		FeignClientProperties.FeignClientConfiguration feignClientConfig = mock(
+				FeignClientProperties.FeignClientConfiguration.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
+		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
+		metricsProperties.setEnabled(null);
+		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldMatchWhenMetricsConfigurationIsEnabled() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		FeignClientProperties.FeignClientConfiguration feignClientConfig = mock(
+				FeignClientProperties.FeignClientConfiguration.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
+		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
+		metricsProperties.setEnabled(true);
+		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);
+
+		assertThat(condition.matches(context, metadata)).isTrue();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+	@Test
+	void shouldNotMatchWhenMetricsConfigurationIsEnabled() {
+		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
+		FeignClientProperties.FeignClientConfiguration feignClientConfig = mock(
+				FeignClientProperties.FeignClientConfiguration.class);
+		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
+		when(context.getEnvironment()).thenReturn(environment);
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
+		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
+		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
+		metricsProperties.setEnabled(false);
+		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);
+
+		assertThat(condition.matches(context, metadata)).isFalse();
+		verify(environment).getProperty("feign.client.name");
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,10 @@

 package org.springframework.cloud.openfeign;

+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import feign.Capability;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Logger;
@@ -28,6 +32,7 @@ import feign.auth.BasicAuthRequestInterceptor;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.micrometer.MicrometerCapability;
 import feign.optionals.OptionalDecoder;
 import feign.querymap.BeanQueryMapEncoder;
 import feign.slf4j.Slf4jLogger;
@@ -41,13 +46,14 @@ 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.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;

 import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Spencer Gibb
+ * @author Jonatan Ivanov
+ * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignClientOverrideDefaultsTests.TestConfiguration.class)
@DirtiesContext
@@ -116,6 +122,7 @@ class FeignClientOverrideDefaultsTests {
 		Request.Options options = context.getInstance("bar", Request.Options.class);
 		assertThat(options.connectTimeoutMillis()).isEqualTo(1);
 		assertThat(options.readTimeoutMillis()).isEqualTo(1);
+		assertThat(options.isFollowRedirects()).isFalse();
 	}

 	@Test
@@ -137,6 +144,22 @@ class FeignClientOverrideDefaultsTests {
 				.containsValues(ExceptionPropagationPolicy.UNWRAP);
 	}

+	@Test
+	void shouldOverrideMicrometerCapability() {
+		assertThat(context.getInstance("foo", MicrometerCapability.class))
+				.isExactlyInstanceOf(TestMicrometerCapability.class);
+		Map<String, Capability> fooCapabilities = context.getInstances("foo", Capability.class);
+		assertThat(fooCapabilities).hasSize(1);
+		assertThat(fooCapabilities.get("micrometerCapability")).isExactlyInstanceOf(TestMicrometerCapability.class);
+
+		assertThat(context.getInstance("bar", MicrometerCapability.class))
+				.isExactlyInstanceOf(TestMicrometerCapability.class);
+		Map<String, Capability> barCapabilities = context.getInstances("bar", Capability.class);
+		assertThat(barCapabilities).hasSize(2);
+		assertThat(barCapabilities.get("micrometerCapability")).isExactlyInstanceOf(TestMicrometerCapability.class);
+		assertThat(barCapabilities.get("noOpCapability")).isExactlyInstanceOf(NoOpCapability.class);
+	}
+
 	@FeignClient(name = "foo", url = "https://foo", configuration = FooConfiguration.class)
 	interface FooClient {

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

-		@RequestMapping(value = "/", method = RequestMethod.GET)
+		@GetMapping("/")
 		String get();

 	}
@@ -164,6 +187,11 @@ class FeignClientOverrideDefaultsTests {
 			};
 		}

+		@Bean
+		MicrometerCapability micrometerCapability() {
+			return new TestMicrometerCapability();
+		}
+
 	}

 	public static class FooConfiguration {
@@ -214,7 +242,7 @@ class FeignClientOverrideDefaultsTests {

 		@Bean
 		Request.Options feignRequestOptions() {
-			return new Request.Options(1, 1);
+			return new Request.Options(1, TimeUnit.MILLISECONDS, 1, TimeUnit.MILLISECONDS, false);
 		}

 		@Bean
@@ -232,6 +260,19 @@ class FeignClientOverrideDefaultsTests {
 			return ExceptionPropagationPolicy.UNWRAP;
 		}

+		@Bean
+		public Capability noOpCapability() {
+			return new NoOpCapability();
+		}
+
+	}
+
+	private static class TestMicrometerCapability extends feign.micrometer.MicrometerCapability {
+
+	}
+
+	private static class NoOpCapability implements Capability {
+
 	}

 }
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsAndHashCodeConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsReflexivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsSymmetricity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsTransitivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertHashCodeConsistency;
+
+/**
+ * @author Jonatan Ivanov
+ */
+class FeignClientPropertiesTests {
+
+	@Test
+	void shouldDefaultToValuesWhenFieldsNotSet() {
+		FeignClientProperties properties = new FeignClientProperties();
+		assertThat(properties.isDefaultToProperties()).isTrue();
+		assertThat(properties.getDefaultConfig()).isEqualTo("default");
+		assertThat(properties.getConfig()).isEmpty();
+		assertThat(properties.isDecodeSlash()).isTrue();
+	}
+
+	@Test
+	void shouldReturnValuesWhenSet() {
+		FeignClientProperties properties = new FeignClientProperties();
+		properties.setDefaultToProperties(false);
+		properties.setDefaultConfig("custom");
+		Map<String, FeignClientProperties.FeignClientConfiguration> configMap = Maps.newHashMap("foo", null);
+		properties.setConfig(configMap);
+		properties.setDecodeSlash(false);
+
+		assertThat(properties.isDefaultToProperties()).isFalse();
+		assertThat(properties.getDefaultConfig()).isEqualTo("custom");
+		assertThat(properties.getConfig()).isSameAs(configMap);
+		assertThat(properties.isDecodeSlash()).isFalse();
+	}
+
+	/**
+	 * Sanity-checks equals and hashCode contracts but does not check every variation of
+	 * the fields.
+	 */
+	@Test
+	void shouldHaveSomewhatValidEqualsAndHashCode() {
+		FeignClientProperties propsOne = new FeignClientProperties();
+		FeignClientProperties propsTwo = new FeignClientProperties();
+		FeignClientProperties propsThree = new FeignClientProperties();
+		FeignClientProperties differentProps = new FeignClientProperties();
+		differentProps.setDecodeSlash(false);
+
+		assertEqualsReflexivity(propsOne);
+
+		assertEqualsSymmetricity(propsOne, propsTwo);
+		assertEqualsSymmetricity(propsOne, differentProps);
+		assertEqualsSymmetricity(propsOne, 42);
+
+		assertEqualsTransitivity(propsOne, propsTwo, propsThree);
+
+		assertEqualsConsistency(propsOne, propsTwo);
+		assertEqualsConsistency(propsOne, differentProps);
+		assertEqualsConsistency(propsOne, 42);
+		assertEqualsConsistency(propsOne, null);
+
+		assertHashCodeConsistency(propsOne);
+		assertEqualsAndHashCodeConsistency(propsOne, propsTwo);
+	}
+
+}
@@ -19,17 +19,19 @@ package org.springframework.cloud.openfeign;
 import java.lang.reflect.Field;
 import java.util.List;

+import feign.Capability;
 import feign.Feign;
 import feign.Logger;
 import feign.RequestInterceptor;
+import feign.micrometer.MicrometerCapability;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 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;
@@ -40,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author matt king
+ * @author Jonatan Ivanov
 */
@DirtiesContext
@RunWith(SpringJUnit4ClassRunner.class)
@@ -49,23 +52,28 @@ import static org.assertj.core.api.Assertions.assertThat;
 		"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$";
+	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";

 	@Autowired
-	private ApplicationContext applicationContext;
+	private ConfigurableListableBeanFactory beanFactory;

 	@Autowired
 	private FeignContext context;

 	@Test
 	public void testFeignClient() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
-				.getBean(BEAN_NAME_PREFIX + "TestFeignClient");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
+				.getBeanDefinition(BEAN_NAME_PREFIX + "TestFeignClient")
+				.getAttribute("feignClientsRegistrarFactoryBean");
 		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);
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerCapability.class);
 	}

 	private Object getBuilderValue(Feign.Builder builder, String member) {
@@ -77,23 +85,32 @@ public class FeignClientUsingConfigurerTest {

 	@Test
 	public void testNoInheritFeignClient() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
-				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
+				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
+				.getAttribute("feignClientsRegistrarFactoryBean");
 		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();
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerCapability.class);
 	}

 	@Test
 	public void testNoInheritFeignClient_ignoreProperties() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
-				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
+				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
+				.getAttribute("feignClientsRegistrarFactoryBean");
 		Feign.Builder builder = factoryBean.feign(context);

 		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set").isEqualTo(Logger.Level.HEADERS);
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerCapability.class);
 	}

 	@EnableAutoConfiguration
@@ -107,6 +124,11 @@ public class FeignClientUsingConfigurerTest {
 			};
 		}

+		@Bean
+		public NoOpCapability noOpCapability() {
+			return new NoOpCapability();
+		}
+
 	}

 	public static class NoInheritConfiguration {
@@ -116,6 +138,11 @@ public class FeignClientUsingConfigurerTest {
 			return Logger.Level.HEADERS;
 		}

+		@Bean
+		public NoOpCapability noOpCapability() {
+			return new NoOpCapability();
+		}
+
 		@Bean
 		public FeignClientConfigurer feignClientConfigurer() {
 			return new FeignClientConfigurer() {
@@ -140,4 +167,8 @@ public class FeignClientUsingConfigurerTest {

 	}

+	private static class NoOpCapability implements Capability {
+
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -34,6 +34,8 @@ import java.util.stream.Stream;

 import javax.servlet.http.HttpServletRequest;

+import feign.Capability;
+import feign.Feign;
 import feign.InvocationHandlerFactory;
 import feign.Request;
 import feign.RequestInterceptor;
@@ -43,6 +45,7 @@ import feign.Retryer;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.micrometer.MicrometerCapability;
 import org.junit.Test;
 import org.junit.runner.RunWith;

@@ -76,6 +79,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Eko Kurniawan Khannedy
 * @author Olga Maciaszek-Sharma
 * @author Ilia Ilinykh
+ * @author Jonatan Ivanov
 */
@SuppressWarnings("FieldMayBeFinal")
@RunWith(SpringJUnit4ClassRunner.class)
@@ -232,8 +236,36 @@ public class FeignClientUsingPropertiesTests {
 		assertThat(options.readTimeoutMillis()).isEqualTo(5000);
 	}

+	@Test
+	public void clientShouldContainCapabilities() {
+		fooFactoryBean.setApplicationContext(applicationContext);
+		Feign.Builder feignBuilder = fooFactoryBean.feign(context);
+		FooClient fooClient = feignBuilder.target(FooClient.class, "http://localhost:" + port);
+
+		String response = fooClient.foo();
+		assertThat(response).isEqualTo("OK");
+		List<Capability> capabilities = (List) ReflectionTestUtils.getField(feignBuilder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerCapability.class);
+	}
+
+	@Test
+	public void shouldSetFollowRedirects() {
+		FeignClientFactoryBean testFactoryBean = new FeignClientFactoryBean();
+		testFactoryBean.setContextId("test");
+		testFactoryBean.setType(FeignClientFactoryBean.class);
+		testFactoryBean.setApplicationContext(applicationContext);
+
+		TimeoutClient client = testFactoryBean.feign(context).target(TimeoutClient.class, "http://localhost:" + port);
+
+		Request.Options options = getRequestOptions((Proxy) client);
+
+		assertThat(options.isFollowRedirects()).isFalse();
+	}
+
 	private Request.Options getRequestOptions(Proxy client) {
-		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
+		Object invocationHandlerLambda = ReflectionTestUtils.getField(client, "h");
+		Object invocationHandler = ReflectionTestUtils.getField(invocationHandlerLambda, "arg$2");
 		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
 				.getField(Objects.requireNonNull(invocationHandler), "dispatch");
 		Method key = new ArrayList<>(dispatch.keySet()).get(0);
@@ -385,4 +417,8 @@ public class FeignClientUsingPropertiesTests {

 	}

+	public static class NoOpCapability implements Capability {
+
+	}
+
 }
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2013-2021 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 org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+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.test.NoSecurityConfiguration;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Tests for {@link FeignClientsRegistrar}.
+ *
+ * @author Olga Maciaszek-Sharma
+ */
+@SpringBootTest(classes = FeignClientsRegistrarIntegrationTests.QualifiersTestConfig.class)
+class FeignClientsRegistrarIntegrationTests {
+
+	@Autowired
+	ConfigurableApplicationContext context;
+
+	@Test
+	void shouldUseQualifiersIfPresent() {
+		assertThat(context.getBean("qualifier1")).isNotNull();
+		assertThat(context.getBean("qualifier2")).isNotNull();
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> context.getBean("qualifier3"));
+	}
+
+	@Test
+	void shouldUseQualifierIfQualifiersArrayNotPresent() {
+		assertThat(context.getBean("qualifier4")).isNotNull();
+	}
+
+	@Test
+	void shouldUseDefaultQualifierWhenNonePresent() {
+		assertThat(context.getBean("noQualifiersFeignClient")).isNotNull();
+	}
+
+	@Test
+	void shouldUseQualifierWhenEmptyQualifiers() {
+		assertThat(context.getBean("test1")).isNotNull();
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
+				.isThrownBy(() -> context.getBean("emptyQualifiersFeignClient"));
+	}
+
+	@Test
+	void shouldUseQualifierWhenWhitespaceQualifiers() {
+		assertThat(context.getBean("test2")).isNotNull();
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
+				.isThrownBy(() -> context.getBean("whitespaceQualifiersFeignClient"));
+	}
+
+	@Test
+	void shouldUseDefaultQualifierWhenEmptyQualifiers() {
+		assertThat(context.getBean("emptyQualifiersNoQualifierFeignClient")).isNotNull();
+	}
+
+	@Test
+	void shouldUseDefaultQualifierWhenWhitespaceQualifiers() {
+		assertThat(context.getBean("whitespaceQualifiersNoQualifierFeignClient")).isNotNull();
+	}
+
+	@FeignClient(name = "qualifiersClient", qualifiers = { "qualifier1", "qualifier2" }, qualifier = "qualifier3")
+	protected interface QualifiersClient {
+
+	}
+
+	@FeignClient(name = "qualifierClient", qualifier = "qualifier4")
+	protected interface QualifierClient {
+
+	}
+
+	@FeignClient(name = "noQualifiers")
+	protected interface NoQualifiersClient {
+
+	}
+
+	@FeignClient(name = "emptyQualifiers", qualifier = "test1", qualifiers = {})
+	protected interface EmptyQualifiersClient {
+
+	}
+
+	@FeignClient(name = "whitespaceQualifiers", qualifier = "test2", qualifiers = { " " })
+	protected interface WhitespaceQualifiersClient {
+
+	}
+
+	@FeignClient(name = "emptyQualifiersNoQualifier", qualifiers = {})
+	protected interface EmptyQualifiersNoQualifierClient {
+
+	}
+
+	@FeignClient(name = "whitespaceQualifiersNoQualifier", qualifiers = { " " })
+	protected interface WhitespaceQualifiersNoQualifierClient {
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@Import(NoSecurityConfiguration.class)
+	@EnableFeignClients(clients = { QualifiersClient.class, QualifierClient.class, NoQualifiersClient.class,
+			EmptyQualifiersClient.class, WhitespaceQualifiersClient.class, EmptyQualifiersNoQualifierClient.class,
+			WhitespaceQualifiersNoQualifierClient.class })
+	protected static class QualifiersTestConfig {
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -79,7 +79,7 @@ public class FeignClientsRegistrarTests {
 	private String testGetName(String name) {
 		FeignClientsRegistrar registrar = new FeignClientsRegistrar();
 		registrar.setEnvironment(new MockEnvironment());
-		return registrar.getName(Collections.<String, Object>singletonMap("name", name));
+		return registrar.getName(Collections.singletonMap("name", name));
 	}

 	@Test(expected = IllegalArgumentException.class)
@@ -100,7 +100,6 @@ public class FeignClientsRegistrarTests {
 		assertThatCode(() -> config.refresh())
 				.as("Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved")
 				.doesNotThrowAnyException();
-
 	}

 	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2013-2021 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.Client;
+import feign.hc5.ApacheHttp5Client;
+import feign.httpclient.ApacheHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Nguyen Ky Thanh
+ */
+public class FeignHttpClient5ConfigurationTests {
+
+	private static void verifyHc4BeansAvailable(ConfigurableApplicationContext context) {
+		org.apache.http.impl.client.CloseableHttpClient httpClient4 = context
+				.getBean(org.apache.http.impl.client.CloseableHttpClient.class);
+		assertThat(httpClient4).isNotNull();
+		org.apache.http.conn.HttpClientConnectionManager connectionManager4 = context
+				.getBean(org.apache.http.conn.HttpClientConnectionManager.class);
+		assertThat(connectionManager4).isInstanceOf(org.apache.http.impl.conn.PoolingHttpClientConnectionManager.class);
+		Client client = context.getBean(Client.class);
+		assertThat(client).isInstanceOf(ApacheHttpClient.class);
+	}
+
+	private static void verifyHc5BeansAvailable(ConfigurableApplicationContext context) {
+		CloseableHttpClient httpClient = context.getBean(CloseableHttpClient.class);
+		assertThat(httpClient).isNotNull();
+		HttpClientConnectionManager connectionManager = context.getBean(HttpClientConnectionManager.class);
+		assertThat(connectionManager).isInstanceOf(PoolingHttpClientConnectionManager.class);
+		Client client = context.getBean(Client.class);
+		assertThat(client).isInstanceOf(ApacheHttp5Client.class);
+	}
+
+	@RunWith(ModifiedClassPathRunner.class)
+	@ClassPathExclusions("ribbon-loadbalancer-{version:\\d.*}.jar")
+	public static class WithoutLoadBalancerInClasspath {
+
+		@Test
+		public void verifyHttpClient5AutoConfig() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=false")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			verifyHc5BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+		@Test
+		public void hc5ShouldWinIfTheBothVersionsAvailable() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=true")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			Client client = context.getBean(Client.class);
+			assertThat(client).isInstanceOf(ApacheHttp5Client.class);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+		@Test
+		public void hc4ShouldBeTheDefaultIfHc5NotEnabled() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=false", "feign.httpclient.enabled=true")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			verifyHc4BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+	}
+
+	@RunWith(ModifiedClassPathRunner.class)
+	@ClassPathExclusions({ "ribbon-loadbalancer-{version:\\d.*}.jar", "feign-hc5-{version:\\d.*}.jar",
+			"httpclient5-{version:\\d.*}.jar", "httpcore5-{version:\\d.*}.jar", "httpcore5-h2-{version:\\d.*}.jar" })
+	public static class WithoutLoadBalancerAndHc5InClasspath {
+
+		@Test
+		public void hc4ShouldWinEvenHc5ConfigEnabled() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=true").web(WebApplicationType.NONE)
+					.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
+
+			verifyHc4BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+		@Test
+		public void hc4ShouldBeTheDefault() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+					.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
+
+			verifyHc4BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.
@@ -46,9 +46,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = DEFINED_PORT,
-		value = { "spring.application.name=feignclienturltest", "feign.hystrix.enabled=false",
+		value = { "spring.application.name=feignclienturltest", "feign.circuitbreaker.enabled=false",
 				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class FeignHttpClientUrlTests {
@@ -65,13 +66,13 @@ class FeignHttpClientUrlTests {
 	private BeanUrlClient beanClient;

 	@BeforeAll
-	public static void beforeClass() {
+	static void beforeClass() {
 		port = SocketUtils.findAvailableTcpPort();
 		System.setProperty("server.port", String.valueOf(port));
 	}

 	@AfterAll
-	public static void afterClass() {
+	static void afterClass() {
 		System.clearProperty("server.port");
 	}

@@ -91,7 +92,7 @@ class FeignHttpClientUrlTests {
 	}

 	@Test
-	public void testBeanUrlNoProtocol() {
+	void testBeanUrlNoProtocol() {
 		Hello hello = beanClientNoProtocol.getHello();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2013-2021 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.Objects;
+
+import feign.Client;
+import feign.Feign;
+import feign.Target;
+import feign.httpclient.ApacheHttpClient;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+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.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
+
+/**
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@SpringBootTest(classes = FeignHttpClientUrlTestsWithRetryableLoadBalancer.TestConfig.class,
+		webEnvironment = DEFINED_PORT,
+		value = { "spring.application.name=feignclienturlwithretryableloadbalancertest", "feign.hystrix.enabled=false",
+				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.ribbon.enabled=false" })
+@DirtiesContext
+class FeignHttpClientUrlTestsWithRetryableLoadBalancer {
+
+	static int port;
+
+	@Autowired
+	BeanUrlClientNoProtocol beanClientNoProtocol;
+
+	@Autowired
+	private UrlClient urlClient;
+
+	@Autowired
+	private BeanUrlClient beanClient;
+
+	@BeforeAll
+	static void beforeClass() {
+		port = SocketUtils.findAvailableTcpPort();
+		System.setProperty("server.port", String.valueOf(port));
+	}
+
+	@AfterAll
+	static void afterClass() {
+		System.clearProperty("server.port");
+	}
+
+	@Test
+	void testUrlHttpClient() {
+		assertThat(urlClient).as("UrlClient was null").isNotNull();
+		Hello hello = urlClient.getHello();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+	}
+
+	@Test
+	void testBeanUrl() {
+		Hello hello = beanClient.getHello();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+	}
+
+	@Test
+	void testBeanUrlNoProtocol() {
+		Hello hello = beanClientNoProtocol.getHello();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+	}
+
+	// this tests that
+	@FeignClient(name = "localappurl", url = "http://localhost:${server.port}/")
+	protected interface UrlClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+	}
+
+	@FeignClient(name = "beanappurl", url = "#{SERVER_URL}path")
+	protected interface BeanUrlClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+	}
+
+	@FeignClient(name = "beanappurlnoprotocol", url = "#{SERVER_URL_NO_PROTOCOL}path")
+	protected interface BeanUrlClientNoProtocol {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class, BeanUrlClientNoProtocol.class })
+	@Import(NoSecurityConfiguration.class)
+	protected static class TestConfig {
+
+		@GetMapping("/hello")
+		public Hello getHello() {
+			return new Hello("hello world 1");
+		}
+
+		@GetMapping("/path/hello")
+		public Hello getHelloWithPath() {
+			return getHello();
+		}
+
+		@Bean(name = "SERVER_URL")
+		public String serverUrl() {
+			return "http://localhost:" + port + "/";
+		}
+
+		@Bean(name = "SERVER_URL_NO_PROTOCOL")
+		public String serverUrlNoProtocol() {
+			return "localhost:" + port + "/";
+		}
+
+		@Bean
+		public Targeter feignTargeter() {
+			return new Targeter() {
+				@Override
+				public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
+						Target.HardCodedTarget<T> target) {
+					Field field = ReflectionUtils.findField(Feign.Builder.class, "client");
+					ReflectionUtils.makeAccessible(field);
+					Client client = (Client) ReflectionUtils.getField(field, feign);
+					if (target.name().equals("localappurl")) {
+						assertThat(client).isInstanceOf(ApacheHttpClient.class).as("client was wrong type");
+					}
+					return feign.target(target);
+				}
+			};
+		}
+
+	}
+
+	public 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);
+		}
+
+	}
+
+}
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021-2021 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 org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsAndHashCodeConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsConsistency;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsReflexivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsSymmetricity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertEqualsTransitivity;
+import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.assertHashCodeConsistency;
+
+/**
+ * @author Jonatan Ivanov
+ */
+class MetricsPropertiesTests {
+
+	@Test
+	void shouldBeEnabledByDefault() {
+		FeignClientProperties.MetricsProperties properties = new FeignClientProperties.MetricsProperties();
+		assertThat(properties.getEnabled()).isTrue();
+	}
+
+	@Test
+	void shouldBeDisabledWhenSet() {
+		FeignClientProperties.MetricsProperties properties = new FeignClientProperties.MetricsProperties();
+		properties.setEnabled(false);
+		assertThat(properties.getEnabled()).isFalse();
+	}
+
+	/**
+	 * Sanity-checks equals and hashCode contracts but does not check every variation of
+	 * the fields.
+	 */
+	@Test
+	void shouldHaveSomewhatValidEqualsAndHashCode() {
+		FeignClientProperties.MetricsProperties propertyOne = new FeignClientProperties.MetricsProperties();
+		FeignClientProperties.MetricsProperties propertyTwo = new FeignClientProperties.MetricsProperties();
+		FeignClientProperties.MetricsProperties propertyThree = new FeignClientProperties.MetricsProperties();
+		FeignClientProperties.MetricsProperties differentProperty = new FeignClientProperties.MetricsProperties();
+		differentProperty.setEnabled(false);
+
+		assertEqualsReflexivity(propertyOne);
+
+		assertEqualsSymmetricity(propertyOne, propertyTwo);
+		assertEqualsSymmetricity(propertyOne, differentProperty);
+		assertEqualsSymmetricity(propertyOne, 42);
+
+		assertEqualsTransitivity(propertyOne, propertyTwo, propertyThree);
+
+		assertEqualsConsistency(propertyOne, propertyTwo);
+		assertEqualsConsistency(propertyOne, differentProperty);
+		assertEqualsConsistency(propertyOne, 42);
+		assertEqualsConsistency(propertyOne, null);
+
+		assertHashCodeConsistency(propertyOne);
+		assertEqualsAndHashCodeConsistency(propertyOne, propertyTwo);
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,7 +32,9 @@ import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -45,6 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SpringDecoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
@@ -142,6 +145,13 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 		assertThat(response.getBody()).as("response body was not null").isNull();
 	}

+	@Test
+	// Issue: https://github.com/spring-cloud/spring-cloud-openfeign/issues/456
+	public void testResponseEntityHeaders() {
+		ResponseEntity<String> response = testClient().getContentType();
+		assertThat(response.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
+	}
+
 	protected interface TestClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/helloresponse")
@@ -165,6 +175,9 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 		@GetMapping("/helloWildcard")
 		ResponseEntity<?> getWildcard();

+		@GetMapping(path = "/contentType", produces = MediaType.APPLICATION_JSON_VALUE)
+		ResponseEntity<String> getContentType();
+
 	}

 	public static class Hello {
@@ -252,6 +265,11 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 			return ResponseEntity.ok(new Hello("wildcard"));
 		}

+		@Override
+		public ResponseEntity<String> getContentType() {
+			return ResponseEntity.ok().header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).body("test");
+		}
+
 	}

 }
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2013-2021 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.circuitbreaker;
+
+import java.util.function.Function;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+import org.springframework.cloud.client.circuitbreaker.ConfigBuilder;
+import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Component;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT, value = {
+		"spring.application.name=springcircuittest", "spring.jmx.enabled=false", "feign.circuitbreaker.enabled=true" })
+@DirtiesContext
+public class CircuitBreakerTests {
+
+	@Autowired
+	MyCircuitBreaker myCircuitBreaker;
+
+	@Autowired
+	TestClient testClient;
+
+	@Autowired
+	TestClientWithFactory testClientWithFactory;
+
+	@BeforeAll
+	public static void beforeClass() {
+		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
+	}
+
+	@AfterAll
+	public static void afterClass() {
+		System.clearProperty("server.port");
+	}
+
+	@Before
+	public void setup() {
+		this.myCircuitBreaker.clear();
+	}
+
+	@Test
+	public void testSimpleTypeWithFallback() {
+		Hello hello = testClient.getHello();
+
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called").isTrue();
+	}
+
+	@Test
+	public void test404WithFallback() {
+		assertThat(testClient.getException()).isEqualTo("Fixed response");
+	}
+
+	@Test
+	public void testSimpleTypeWithFallbackFactory() {
+		Hello hello = testClientWithFactory.getHello();
+
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called").isTrue();
+	}
+
+	@Test
+	public void test404WithFallbackFactory() {
+		assertThat(testClientWithFactory.getException()).isEqualTo("Fixed response");
+	}
+
+	@FeignClient(name = "test", url = "http://localhost:${server.port}/", fallback = Fallback.class)
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
+		String getException();
+
+	}
+
+	@Component
+	static class Fallback implements TestClient {
+
+		@Override
+		public Hello getHello() {
+			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
+		}
+
+		@Override
+		public String getException() {
+			return "Fixed response";
+		}
+
+	}
+
+	@FeignClient(name = "testClientWithFactory", url = "http://localhost:${server.port}/",
+			fallbackFactory = TestFallbackFactory.class)
+	protected interface TestClientWithFactory {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
+		String getException();
+
+	}
+
+	@Component
+	static class TestFallbackFactory implements FallbackFactory<FallbackWithFactory> {
+
+		@Override
+		public FallbackWithFactory create(Throwable cause) {
+			return new FallbackWithFactory();
+		}
+
+	}
+
+	static class FallbackWithFactory implements TestClientWithFactory {
+
+		@Override
+		public Hello getHello() {
+			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
+		}
+
+		@Override
+		public String getException() {
+			return "Fixed response";
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class })
+	@Import(NoSecurityConfiguration.class)
+	protected static class Application implements TestClient {
+
+		static final Log log = LogFactory.getLog(Application.class);
+
+		@Bean
+		MyCircuitBreaker myCircuitBreaker() {
+			return new MyCircuitBreaker();
+		}
+
+		@Bean
+		CircuitBreakerFactory circuitBreakerFactory(MyCircuitBreaker myCircuitBreaker) {
+			return new CircuitBreakerFactory() {
+				@Override
+				public CircuitBreaker create(String id) {
+					log.info("Creating a circuit breaker with id [" + id + "]");
+					return myCircuitBreaker;
+				}
+
+				@Override
+				protected ConfigBuilder configBuilder(String id) {
+					return Object::new;
+				}
+
+				@Override
+				public void configureDefault(Function defaultConfiguration) {
+
+				}
+			};
+		}
+
+		@Override
+		public Hello getHello() {
+			return new Hello("hello world 1");
+		}
+
+		@Override
+		public String getException() {
+			throw new IllegalStateException("BOOM!");
+		}
+
+		@Bean
+		Fallback fallback() {
+			return new Fallback();
+		}
+
+		@Bean
+		TestFallbackFactory testFallbackFactory() {
+			return new TestFallbackFactory();
+		}
+
+	}
+
+}
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2013-2021 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.circuitbreaker;
+
+import java.util.function.Function;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
+import org.springframework.cloud.client.circuitbreaker.ConfigBuilder;
+import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Tests for Feign calls with CircuitBreaker, without fallbacks.
+ *
+ * @author Olga Maciaszek-Sharma
+ */
+@SpringBootTest(classes = CircuitBreakerWithNoFallbackTests.Application.class,
+		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
+		value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
+				"feign.circuitbreaker.enabled=true" })
+@DirtiesContext
+public class CircuitBreakerWithNoFallbackTests {
+
+	@Autowired
+	MyCircuitBreaker myCircuitBreaker;
+
+	@Autowired
+	CircuitBreakerTestClient testClient;
+
+	@BeforeAll
+	public static void beforeClass() {
+		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
+	}
+
+	@AfterAll
+	public static void afterClass() {
+		System.clearProperty("server.port");
+	}
+
+	@BeforeEach
+	public void setup() {
+		this.myCircuitBreaker.clear();
+	}
+
+	@Test
+	public void testSimpleTypeWithFallback() {
+		Hello hello = testClient.getHello();
+
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
+		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called").isTrue();
+	}
+
+	@Test
+	public void test404WithoutFallback() {
+		assertThatThrownBy(() -> testClient.getException()).isInstanceOf(NoFallbackAvailableException.class);
+	}
+
+	@FeignClient(name = "test", url = "http://localhost:${server.port}/")
+	protected interface CircuitBreakerTestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
+		String getException();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = { CircuitBreakerTestClient.class })
+	@Import(NoSecurityConfiguration.class)
+	protected static class Application implements CircuitBreakerTestClient {
+
+		static final Log log = LogFactory.getLog(Application.class);
+
+		@Bean
+		MyCircuitBreaker myCircuitBreaker() {
+			return new MyCircuitBreaker();
+		}
+
+		@Bean
+		CircuitBreakerFactory circuitBreakerFactory(MyCircuitBreaker myCircuitBreaker) {
+			return new CircuitBreakerFactory() {
+				@Override
+				public CircuitBreaker create(String id) {
+					log.info("Creating a circuit breaker with id [" + id + "]");
+					return myCircuitBreaker;
+				}
+
+				@Override
+				protected ConfigBuilder configBuilder(String id) {
+					return Object::new;
+				}
+
+				@Override
+				public void configureDefault(Function defaultConfiguration) {
+
+				}
+			};
+		}
+
+		@Override
+		public Hello getHello() {
+			return new Hello("hello world 1");
+		}
+
+		@Override
+		public String getException() {
+			throw new IllegalStateException("BOOM!");
+		}
+
+	}
+
+}
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013-2021 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.circuitbreaker;
+
+import java.util.Objects;
+
+/**
+ * @author Marcin Grzejszczak
+ */
+class Hello {
+
+	private String message;
+
+	public Hello() {
+	}
+
+	public Hello(String message) {
+		this.message = message;
+	}
+
+	public String getMessage() {
+		return this.message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	@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(this.message, that.message);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(this.message);
+	}
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013-2021 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.circuitbreaker;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
+import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
+
+/**
+ * @author Marcin Grzejszczak
+ * @author Olga Maciaszek-Sharma
+ */
+class MyCircuitBreaker implements CircuitBreaker {
+
+	AtomicBoolean runWasCalled = new AtomicBoolean();
+
+	@Override
+	public <T> T run(Supplier<T> toRun) {
+		try {
+			this.runWasCalled.set(true);
+			return toRun.get();
+		}
+		catch (Throwable throwable) {
+			throw new NoFallbackAvailableException("No fallback available.", throwable);
+		}
+	}
+
+	@Override
+	public <T> T run(Supplier<T> toRun, Function<Throwable, T> fallback) {
+		try {
+			return run(toRun);
+		}
+		catch (Throwable throwable) {
+			return fallback.apply(throwable);
+		}
+	}
+
+	public void clear() {
+		this.runWasCalled.set(false);
+	}
+
+}
@@ -25,8 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -34,7 +36,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -86,8 +87,9 @@ public class FeignAcceptEncodingTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

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

@@ -89,8 +88,9 @@ public class FeignContentEncodingTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

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

 package org.springframework.cloud.openfeign.encoding;

+import java.util.List;
 import java.util.Optional;

 import org.junit.Test;
@@ -26,17 +27,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -53,11 +54,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * Tests the pagination encoding.
 *
 * @author Charlie Mordant.
+ * @author Hyeonmin Park
 */
@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "feign.compression.request.enabled=true",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"ribbon.OkToRetryOnAllOperations=false" })
+		value = { "feign.compression.request.enabled=true", "feign.autoconfiguration.jackson.enabled=true" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignPageableEncodingTests {

@@ -66,7 +66,6 @@ public class FeignPageableEncodingTests {

 	@Test
 	public void testPageable() {
-
 		// given
 		Pageable pageable = PageRequest.of(0, 10, Sort.Direction.ASC, "sortProperty");

@@ -85,7 +84,187 @@ public class FeignPageableEncodingTests {
 			assertThat(order.getDirection()).isEqualTo(Sort.Direction.ASC);
 			assertThat(order.getProperty()).isEqualTo("sortProperty");
 		}
+	}

+	@Test
+	public void testPageableWithDescDirection() {
+		// given
+		Pageable pageable = PageRequest.of(0, 10, Sort.Direction.DESC, "sortProperty");
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPaged(pageable);
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
+
+		Sort sort = response.getBody().getPageable().getSort();
+		assertThat(sort).hasSize(1);
+		assertThat(sort.get()).hasSize(1);
+
+		Optional<Sort.Order> optionalOrder = sort.get().findFirst();
+		assertThat(optionalOrder.isPresent()).isTrue();
+
+		Sort.Order order = optionalOrder.get();
+		assertThat(order.getDirection()).isEqualTo(Sort.Direction.DESC);
+		assertThat(order.getProperty()).isEqualTo("sortProperty");
+	}
+
+	@Test
+	public void testPageableWithMultipleSort() {
+		// given
+		Pageable pageable = PageRequest.of(0, 10,
+				Sort.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2")));
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPaged(pageable);
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
+
+		Sort sort = response.getBody().getPageable().getSort();
+		assertThat(sort).hasSize(2);
+
+		List<Sort.Order> orderList = sort.toList();
+		assertThat(orderList).hasSize(2);
+
+		Sort.Order firstOrder = orderList.get(0);
+		assertThat(firstOrder.getDirection()).isEqualTo(Sort.Direction.DESC);
+		assertThat(firstOrder.getProperty()).isEqualTo("sortProperty1");
+
+		Sort.Order secondOrder = orderList.get(1);
+		assertThat(secondOrder.getDirection()).isEqualTo(Sort.Direction.ASC);
+		assertThat(secondOrder.getProperty()).isEqualTo("sortProperty2");
+	}
+
+	@Test
+	public void testPageableWithoutSort() {
+		// given
+		Pageable pageable = PageRequest.of(0, 10);
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPaged(pageable);
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
+		assertThat(response.getBody().getPageable().getSort().isSorted()).isFalse();
+
+		List<Invoice> invoiceList = response.getBody().getContent();
+		assertThat(invoiceList).hasSizeGreaterThanOrEqualTo(1);
+	}
+
+	@Test
+	public void testPageableWithoutSortWithBody() {
+		// given
+		Pageable pageable = PageRequest.of(0, 10);
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPagedWithBody(pageable,
+				"InvoiceTitleFromBody");
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
+
+		List<Invoice> invoiceList = response.getBody().getContent();
+		assertThat(invoiceList).hasSizeGreaterThanOrEqualTo(1);
+
+		Invoice firstInvoice = invoiceList.get(0);
+		assertThat(firstInvoice.getTitle()).startsWith("InvoiceTitleFromBody");
+	}
+
+	@Test
+	public void testPageableWithBody() {
+		// given
+		Pageable pageable = PageRequest.of(0, 10,
+				Sort.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2")));
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPagedWithBody(pageable,
+				"InvoiceTitleFromBody");
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
+
+		List<Invoice> invoiceList = response.getBody().getContent();
+		assertThat(invoiceList).hasSizeGreaterThanOrEqualTo(1);
+
+		Invoice firstInvoice = invoiceList.get(0);
+		assertThat(firstInvoice.getTitle()).startsWith("InvoiceTitleFromBody");
+
+		Sort sort = response.getBody().getPageable().getSort();
+		assertThat(sort).hasSize(2);
+
+		List<Sort.Order> orderList = sort.toList();
+		assertThat(orderList).hasSize(2);
+
+		Sort.Order firstOrder = orderList.get(0);
+		assertThat(firstOrder.getDirection()).isEqualTo(Sort.Direction.DESC);
+		assertThat(firstOrder.getProperty()).isEqualTo("sortProperty1");
+
+		Sort.Order secondOrder = orderList.get(1);
+		assertThat(secondOrder.getDirection()).isEqualTo(Sort.Direction.ASC);
+		assertThat(secondOrder.getProperty()).isEqualTo("sortProperty2");
+	}
+
+	@Test
+	public void testUnpagedWithBody() {
+		// given
+		Pageable unpaged = Pageable.unpaged();
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesPagedWithBody(unpaged,
+				"InvoiceTitleFromBody");
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+
+		List<Invoice> invoiceList = response.getBody().getContent();
+		assertThat(invoiceList).hasSizeGreaterThanOrEqualTo(1);
+
+		Invoice firstInvoice = invoiceList.get(0);
+		assertThat(firstInvoice.getTitle()).startsWith("InvoiceTitleFromBody");
+	}
+
+	@Test
+	public void testSortWithBody() {
+		// given
+		Sort sort = Sort.by(Sort.Order.desc("amount"));
+
+		// when
+		final ResponseEntity<Page<Invoice>> response = this.invoiceClient.getInvoicesSortedWithBody(sort,
+				"InvoiceTitleFromBody");
+
+		// then
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.getBody()).isNotNull();
+		assertThat(sort).isEqualTo(response.getBody().getSort());
+
+		List<Invoice> invoiceList = response.getBody().getContent();
+		assertThat(invoiceList).hasSizeGreaterThanOrEqualTo(1);
+
+		Invoice firstInvoice = invoiceList.get(0);
+		assertThat(firstInvoice.getTitle()).startsWith("InvoiceTitleFromBody");
+
+		for (int ind = 0; ind < invoiceList.size() - 1; ind++) {
+			assertThat(invoiceList.get(ind).getAmount()).isGreaterThanOrEqualTo(invoiceList.get(ind + 1).getAmount());
+		}
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
@@ -93,7 +272,7 @@ public class FeignPageableEncodingTests {
 	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
 			exclude = { RepositoryRestMvcAutoConfiguration.class })
 	@EnableSpringDataWebSupport
-	@Import({ NoSecurityConfiguration.class, FeignClientsConfiguration.class })
+	@Import({ NoSecurityConfiguration.class })
 	public static class Application {

 	}
@@ -105,8 +284,9 @@ public class FeignPageableEncodingTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -19,10 +19,12 @@ package org.springframework.cloud.openfeign.encoding.app.client;
 import java.util.List;

 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 * Simple Feign client for retrieving the invoice list.
 *
 * @author Jakub Narloch
+ * @author Hyeonmin Park
 */
@FeignClient("local")
 public interface InvoiceClient {
@@ -37,6 +40,16 @@ public interface InvoiceClient {
 	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<Page<Invoice>> getInvoicesPaged(org.springframework.data.domain.Pageable pageable);

+	@RequestMapping(value = "invoicesPagedWithBody", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	ResponseEntity<Page<Invoice>> getInvoicesPagedWithBody(
+			@SpringQueryMap org.springframework.data.domain.Pageable pageable, @RequestBody String titlePrefix);
+
+	@RequestMapping(value = "invoicesSortedWithBody", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	ResponseEntity<Page<Invoice>> getInvoicesSortedWithBody(@SpringQueryMap org.springframework.data.domain.Sort sort,
+			@RequestBody String titlePrefix);
+
 	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> getInvoices();

@@ -18,12 +18,14 @@ package org.springframework.cloud.openfeign.encoding.app.resource;

 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;

 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
 * An sample REST controller, that potentially returns large response - used for testing.
 *
 * @author Jakub Narloch
+ * @author Hyeonmin Park
 */
@RestController
 public class InvoiceResource {
@@ -42,7 +45,7 @@ public class InvoiceResource {
 	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Invoice>> getInvoices() {

-		return ResponseEntity.ok(createInvoiceList(100));
+		return ResponseEntity.ok(createInvoiceList(null, 100, null));
 	}

 	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -54,18 +57,69 @@ public class InvoiceResource {

 	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<Invoice>> getInvoicesPaged(org.springframework.data.domain.Pageable pageable) {
-		Page<Invoice> page = new PageImpl<>(createInvoiceList(pageable.getPageSize()), pageable, 100);
+		Page<Invoice> page = new PageImpl<>(createInvoiceList(null, pageable.getPageSize(), pageable.getSort()),
+				pageable, 100);
 		return ResponseEntity.ok(page);
 	}

-	private List<Invoice> createInvoiceList(int count) {
+	@RequestMapping(value = "invoicesPagedWithBody", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Page<Invoice>> getInvoicesPagedWithBody(org.springframework.data.domain.Pageable pageable,
+			@RequestBody String titlePrefix) {
+		Page<Invoice> page = new PageImpl<>(createInvoiceList(titlePrefix, pageable.getPageSize(), pageable.getSort()),
+				pageable, 100);
+		return ResponseEntity.ok(page);
+	}
+
+	@RequestMapping(value = "invoicesSortedWithBody", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Page<Invoice>> getInvoicesSortedWithBody(org.springframework.data.domain.Sort sort,
+			@RequestBody String titlePrefix) {
+		Page<Invoice> page = new PageImpl<>(createInvoiceList(titlePrefix, 100, sort), PageRequest.of(0, 100, sort),
+				100);
+		return ResponseEntity.ok(page);
+	}
+
+	private List<Invoice> createInvoiceList(String titlePrefix, int count, org.springframework.data.domain.Sort sort) {
+		if (titlePrefix == null) {
+			titlePrefix = "Invoice";
+		}
 		final List<Invoice> invoices = new ArrayList<>();
 		for (int ind = 0; ind < count; ind++) {
 			final Invoice invoice = new Invoice();
-			invoice.setTitle("Invoice " + (ind + 1));
+			invoice.setTitle(titlePrefix + " " + (ind + 1));
 			invoice.setAmount(new BigDecimal(String.format(Locale.US, "%.2f", Math.random() * 1000)));
 			invoices.add(invoice);
 		}
+		if (sort != null) {
+			Comparator<Invoice> comparatorForSort = null;
+			for (org.springframework.data.domain.Sort.Order order : sort) {
+				Comparator<Invoice> comparatorForOrder;
+				if (order.getProperty().equals("title")) {
+					comparatorForOrder = Comparator.comparing(Invoice::getTitle);
+				}
+				else if (order.getProperty().equals("amount")) {
+					comparatorForOrder = Comparator.comparing(Invoice::getAmount);
+				}
+				else {
+					continue;
+				}
+
+				if (order.isDescending()) {
+					comparatorForOrder = comparatorForOrder.reversed();
+				}
+
+				if (comparatorForSort == null) {
+					comparatorForSort = comparatorForOrder;
+				}
+				else {
+					comparatorForSort = comparatorForSort.thenComparing(comparatorForOrder);
+				}
+			}
+			if (comparatorForSort != null) {
+				invoices.sort(comparatorForSort);
+			}
+		}
 		return invoices;
 	}

@@ -20,7 +20,6 @@ import feign.RequestTemplate;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
@@ -41,12 +40,8 @@ public class ProtobufNotInClasspathTest {

 	@Test
 	public void testEncodeWhenProtobufNotInClasspath() {
-		ObjectFactory<HttpMessageConverters> converters = new ObjectFactory<HttpMessageConverters>() {
-			@Override
-			public HttpMessageConverters getObject() throws BeansException {
-				return new HttpMessageConverters(new StringHttpMessageConverter());
-			}
-		};
+		ObjectFactory<HttpMessageConverters> converters = () -> new HttpMessageConverters(
+				new StringHttpMessageConverter());
 		RequestTemplate requestTemplate = new RequestTemplate();
 		requestTemplate.method(POST);
 		new SpringEncoder(converters).encode("a=b", String.class, requestTemplate);
@@ -40,11 +40,9 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.BDDMockito;
 import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;

-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
@@ -72,7 +70,7 @@ public class ProtobufSpringEncoderTest {
 			.setMsg("Erlang/OTP 最初是爱立信为开发电信设备系统设计的编程语言平台，" + "电信设备(路由器、接入网关、…)典型设计是通过背板连接主控板卡与多块业务板卡的分布式系统。").build();

 	@Test
-	public void testProtobuf() throws IOException, URISyntaxException {
+	public void testProtobuf() throws IOException {
 		// protobuf convert to request by feign and ProtobufHttpMessageConverter
 		RequestTemplate requestTemplate = newRequestTemplate();
 		newEncoder().encode(this.request, Request.class, requestTemplate);
@@ -108,12 +106,8 @@ public class ProtobufSpringEncoderTest {
 	}

 	private SpringEncoder newEncoder() {
-		ObjectFactory<HttpMessageConverters> converters = new ObjectFactory<HttpMessageConverters>() {
-			@Override
-			public HttpMessageConverters getObject() throws BeansException {
-				return new HttpMessageConverters(new ProtobufHttpMessageConverter());
-			}
-		};
+		ObjectFactory<HttpMessageConverters> converters = () -> new HttpMessageConverters(
+				new ProtobufHttpMessageConverter());
 		return new SpringEncoder(converters);
 	}

@@ -123,15 +117,12 @@ public class ProtobufSpringEncoderTest {
 		return requestTemplate;
 	}

-	private HttpEntity toApacheHttpEntity(RequestTemplate requestTemplate) throws IOException, URISyntaxException {
+	private HttpEntity toApacheHttpEntity(RequestTemplate requestTemplate) throws IOException {
 		final List<HttpUriRequest> request = new ArrayList<>(1);
-		BDDMockito.given(this.httpClient.execute(ArgumentMatchers.<HttpUriRequest>any()))
-				.will(new Answer<HttpResponse>() {
-					@Override
-					public HttpResponse answer(InvocationOnMock invocationOnMock) throws Throwable {
-						request.add((HttpUriRequest) invocationOnMock.getArguments()[0]);
-						return new BasicHttpResponse(new BasicStatusLine(new ProtocolVersion("http", 1, 1), 200, null));
-					}
+		BDDMockito.given(this.httpClient.execute(ArgumentMatchers.any()))
+				.will((Answer<HttpResponse>) invocationOnMock -> {
+					request.add((HttpUriRequest) invocationOnMock.getArguments()[0]);
+					return new BasicHttpResponse(new BasicStatusLine(new ProtocolVersion("http", 1, 1), 200, null));
 				});
 		new ApacheHttpClient(this.httpClient).execute(requestTemplate.resolve(new HashMap<>()).request(),
 				new feign.Request.Options());
@@ -19,13 +19,14 @@ package org.springframework.cloud.openfeign.hateoas.app;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;

 /**
 * Test HATEOAS application.
@@ -49,8 +50,9 @@ class LocalHalClientConfiguration {
 	private int port = 0;

 	@Bean
-	public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-		return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+	public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+		return ServiceInstanceListSuppliers.from("local",
+				new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 	}

 }
@@ -71,7 +71,7 @@ public class FeignClientValidationTests {
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
 	protected static class NameAndServiceIdConfiguration {

-		@FeignClient(name = "bar", serviceId = "foo")
+		@FeignClient(name = "bar")
 		interface Client {

 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -37,9 +37,10 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.RequestDataContext;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpHeaders;
@@ -134,6 +135,7 @@ class FeignBlockingLoadBalancerClientTests {
 	@Test
 	void shouldExecuteLoadBalancerLifecycleCallbacks() throws IOException {
 		Request request = testRequest();
+		when(delegate.execute(any(), any())).thenReturn(Response.builder().status(200).request(request).build());
 		Request.Options options = new Request.Options();
 		String url = "http://127.0.0.1/path";
 		ServiceInstance serviceInstance = new DefaultServiceInstance("test-1", "test", "test-host", 8888, false);
@@ -148,16 +150,21 @@ class FeignBlockingLoadBalancerClientTests {
 		when(loadBalancerClientFactory.getInstances("test", LoadBalancerLifecycle.class))
 				.thenReturn(loadBalancerLifecycleBeans);

-		Object actualResult = feignBlockingLoadBalancerClient.execute(request, options);
+		feignBlockingLoadBalancerClient.execute(request, options);

-		Collection<org.springframework.cloud.client.loadbalancer.Request<Object>> lifecycleLogRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
+		Collection<org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> lifecycleLogRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
 				.get("loadBalancerLifecycle")).getStartLog().values();
-		Collection<CompletionContext<Object, ServiceInstance>> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) loadBalancerLifecycleBeans
+		Collection<org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> lifecycleLogStartedRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
+				.get("loadBalancerLifecycle")).getStartRequestLog().values();
+		Collection<CompletionContext<ResponseData, ServiceInstance, RequestDataContext>> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) loadBalancerLifecycleBeans
 				.get("anotherLoadBalancerLifecycle")).getCompleteLog().values();
-		assertThat(lifecycleLogRequests)
-				.extracting(lbRequest -> ((DefaultRequestContext) lbRequest.getContext()).getHint())
+		assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
 				.contains(callbackTestHint);
-		assertThat(anotherLifecycleLogRequests).extracting(CompletionContext::getClientResponse).contains(actualResult);
+		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
+				.contains(callbackTestHint);
+		assertThat(anotherLifecycleLogRequests)
+				.extracting(completionContext -> completionContext.getClientResponse().getHttpStatus())
+				.contains(HttpStatus.OK);
 	}

 	private Request testRequest() {
@@ -176,30 +183,43 @@ class FeignBlockingLoadBalancerClientTests {

 	}

-	protected static class TestLoadBalancerLifecycle implements LoadBalancerLifecycle<Object, Object, ServiceInstance> {
+	protected static class TestLoadBalancerLifecycle
+			implements LoadBalancerLifecycle<RequestDataContext, ResponseData, ServiceInstance> {

-		final ConcurrentHashMap<String, org.springframework.cloud.client.loadbalancer.Request<Object>> startLog = new ConcurrentHashMap<>();
+		final Map<String, org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> startLog = new ConcurrentHashMap<>();

-		final ConcurrentHashMap<String, CompletionContext<Object, ServiceInstance>> completeLog = new ConcurrentHashMap<>();
+		final Map<String, org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> startRequestLog = new ConcurrentHashMap<>();
+
+		final Map<String, CompletionContext<ResponseData, ServiceInstance, RequestDataContext>> completeLog = new ConcurrentHashMap<>();

 		@Override
-		public void onStart(org.springframework.cloud.client.loadbalancer.Request<Object> request) {
+		public void onStart(org.springframework.cloud.client.loadbalancer.Request<RequestDataContext> request) {
 			startLog.put(getName() + UUID.randomUUID(), request);
 		}

 		@Override
-		public void onComplete(CompletionContext<Object, ServiceInstance> completionContext) {
+		public void onStartRequest(org.springframework.cloud.client.loadbalancer.Request<RequestDataContext> request,
+				org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse) {
+			startRequestLog.put(getName() + UUID.randomUUID(), request);
+		}
+
+		@Override
+		public void onComplete(CompletionContext<ResponseData, ServiceInstance, RequestDataContext> completionContext) {
 			completeLog.put(getName() + UUID.randomUUID(), completionContext);
 		}

-		ConcurrentHashMap<String, org.springframework.cloud.client.loadbalancer.Request<Object>> getStartLog() {
+		Map<String, org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> getStartLog() {
 			return startLog;
 		}

-		ConcurrentHashMap<String, CompletionContext<Object, ServiceInstance>> getCompleteLog() {
+		Map<String, CompletionContext<ResponseData, ServiceInstance, RequestDataContext>> getCompleteLog() {
 			return completeLog;
 		}

+		Map<String, org.springframework.cloud.client.loadbalancer.Request<RequestDataContext>> getStartRequestLog() {
+			return startRequestLog;
+		}
+
 		protected String getName() {
 			return this.getClass().getSimpleName();
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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,6 +19,7 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import java.util.Map;

 import feign.Client;
+import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import org.junit.jupiter.api.Test;
@@ -35,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Olga Maciaszek-Sharma
+ * @author Nguyen Ky Thanh
 */
 class FeignLoadBalancerAutoConfigurationTests {

@@ -61,29 +63,62 @@ class FeignLoadBalancerAutoConfigurationTests {
 		assertLoadBalanced(context, OkHttpClient.class);
 	}

+	@Test
+	void shouldInstantiateHttpFeignClient5WhenEnabled() {
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true",
+				"spring.cloud.loadbalancer.retry.enabled=false");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, ApacheHttp5Client.class);
+	}
+
+	@Test
+	void shouldInstantiateHttpFeignClient5WhenBothHttpClientAndHttpClient5Enabled() {
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=true",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true",
+				"spring.cloud.loadbalancer.retry.enabled=false");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, ApacheHttp5Client.class);
+	}
+
 	@Test
 	void shouldInstantiateRetryableDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.loadbalancer.ribbon.enabled=false",
-				"feign.httpclient.enabled=false");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, Client.Default.class);
 	}

 	@Test
 	void shouldInstantiateRetryableHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.loadbalancer.ribbon.enabled=false");
+		ConfigurableApplicationContext context = initContext();
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, ApacheHttpClient.class);
 	}

 	@Test
 	void shouldInstantiateRetryableOkHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.loadbalancer.ribbon.enabled=false",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=true");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, OkHttpClient.class);
 	}

+	@Test
+	void shouldInstantiateRetryableHttpFeignClient5WhenEnabled() {
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalancedWithRetries(context, ApacheHttp5Client.class);
+	}
+
+	@Test
+	void shouldInstantiateRetryableHttpFeignClient5WhenBothHttpClientAndHttpClient5Enabled() {
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=true",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalancedWithRetries(context, ApacheHttp5Client.class);
+	}
+
 	private ConfigurableApplicationContext initContext(String... properties) {
 		return new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
 				.sources(HttpClientConfiguration.class, LoadBalancerAutoConfiguration.class,
@@ -38,14 +38,16 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.CompletionContext;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
-import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
+import org.springframework.cloud.client.loadbalancer.RetryableRequestContext;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.blocking.retry.BlockingLoadBalancedRetryPolicy;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -192,16 +194,21 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 		when(loadBalancerClientFactory.getInstances("test", LoadBalancerLifecycle.class))
 				.thenReturn(loadBalancerLifecycleBeans);

-		Object actualResult = feignBlockingLoadBalancerClient.execute(request, options);
+		feignBlockingLoadBalancerClient.execute(request, options);

-		Collection<org.springframework.cloud.client.loadbalancer.Request<Object>> lifecycleLogRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
+		Collection<org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> lifecycleLogRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
 				.get("loadBalancerLifecycle")).getStartLog().values();
-		Collection<CompletionContext<Object, ServiceInstance>> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) loadBalancerLifecycleBeans
+		Collection<org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> lifecycleLogStartedRequests = ((TestLoadBalancerLifecycle) loadBalancerLifecycleBeans
+				.get("loadBalancerLifecycle")).getStartRequestLog().values();
+		Collection<CompletionContext<ResponseData, ServiceInstance, RetryableRequestContext>> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) loadBalancerLifecycleBeans
 				.get("anotherLoadBalancerLifecycle")).getCompleteLog().values();
-		assertThat(lifecycleLogRequests)
-				.extracting(lbRequest -> ((DefaultRequestContext) lbRequest.getContext()).getHint())
+		assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
 				.contains(callbackTestHint);
-		assertThat(anotherLifecycleLogRequests).extracting(CompletionContext::getClientResponse).contains(actualResult);
+		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
+				.contains(callbackTestHint);
+		assertThat(anotherLifecycleLogRequests)
+				.extracting(completionContext -> completionContext.getClientResponse().getHttpStatus())
+				.contains(HttpStatus.OK);
 	}

 	private Request testRequest() {
@@ -220,30 +227,45 @@ class RetryableFeignBlockingLoadBalancerClientTests {

 	}

-	protected static class TestLoadBalancerLifecycle implements LoadBalancerLifecycle<Object, Object, ServiceInstance> {
+	protected static class TestLoadBalancerLifecycle
+			implements LoadBalancerLifecycle<RetryableRequestContext, ResponseData, ServiceInstance> {

-		final ConcurrentHashMap<String, org.springframework.cloud.client.loadbalancer.Request<Object>> startLog = new ConcurrentHashMap<>();
+		final Map<String, org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> startLog = new ConcurrentHashMap<>();

-		final ConcurrentHashMap<String, CompletionContext<Object, ServiceInstance>> completeLog = new ConcurrentHashMap<>();
+		final Map<String, org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> startRequestLog = new ConcurrentHashMap<>();
+
+		final Map<String, CompletionContext<ResponseData, ServiceInstance, RetryableRequestContext>> completeLog = new ConcurrentHashMap<>();

 		@Override
-		public void onStart(org.springframework.cloud.client.loadbalancer.Request<Object> request) {
+		public void onStart(org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext> request) {
 			startLog.put(getName() + UUID.randomUUID(), request);
 		}

 		@Override
-		public void onComplete(CompletionContext<Object, ServiceInstance> completionContext) {
+		public void onStartRequest(
+				org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext> request,
+				org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse) {
+			startRequestLog.put(getName() + UUID.randomUUID(), request);
+		}
+
+		@Override
+		public void onComplete(
+				CompletionContext<ResponseData, ServiceInstance, RetryableRequestContext> completionContext) {
 			completeLog.put(getName() + UUID.randomUUID(), completionContext);
 		}

-		ConcurrentHashMap<String, org.springframework.cloud.client.loadbalancer.Request<Object>> getStartLog() {
+		Map<String, org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> getStartLog() {
 			return startLog;
 		}

-		ConcurrentHashMap<String, CompletionContext<Object, ServiceInstance>> getCompleteLog() {
+		Map<String, CompletionContext<ResponseData, ServiceInstance, RetryableRequestContext>> getCompleteLog() {
 			return completeLog;
 		}

+		Map<String, org.springframework.cloud.client.loadbalancer.Request<RetryableRequestContext>> getStartRequestLog() {
+			return startRequestLog;
+		}
+
 		protected String getName() {
 			return this.getClass().getSimpleName();
 		}
@@ -251,7 +273,7 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 	}

 	protected static class AnotherLoadBalancerLifecycle
-			extends FeignBlockingLoadBalancerClientTests.TestLoadBalancerLifecycle {
+			extends RetryableFeignBlockingLoadBalancerClientTests.TestLoadBalancerLifecycle {

 		@Override
 		protected String getName() {
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015-2015 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.security;
+
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserApprovalRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
+import org.springframework.security.oauth2.client.token.AccessTokenProvider;
+import org.springframework.security.oauth2.client.token.AccessTokenRequest;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2RefreshToken;
+
+/**
+ * Mocks the access token provider
+ *
+ * @author Mihhail Verhovtsov
+ */
+public class MockAccessTokenProvider implements AccessTokenProvider {
+
+	private OAuth2AccessToken token;
+
+	public MockAccessTokenProvider(OAuth2AccessToken token) {
+		this.token = token;
+	}
+
+	@Override
+	public OAuth2AccessToken obtainAccessToken(OAuth2ProtectedResourceDetails oAuth2ProtectedResourceDetails,
+			AccessTokenRequest accessTokenRequest)
+			throws UserRedirectRequiredException, UserApprovalRequiredException, AccessDeniedException {
+		return token;
+	}
+
+	@Override
+	public boolean supportsResource(OAuth2ProtectedResourceDetails oAuth2ProtectedResourceDetails) {
+		return true;
+	}
+
+	@Override
+	public OAuth2AccessToken refreshAccessToken(OAuth2ProtectedResourceDetails oAuth2ProtectedResourceDetails,
+			OAuth2RefreshToken oAuth2RefreshToken, AccessTokenRequest accessTokenRequest)
+			throws UserRedirectRequiredException {
+		return null;
+	}
+
+	@Override
+	public boolean supportsRefresh(OAuth2ProtectedResourceDetails oAuth2ProtectedResourceDetails) {
+		return false;
+	}
+
+}
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015-2015 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.security;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2RefreshToken;
+
+/**
+ * Mocks the OAuth2 access token
+ *
+ * @author Mihhail Verhovtsov
+ */
+public class MockOAuth2AccessToken implements OAuth2AccessToken {
+
+	private String value;
+
+	public MockOAuth2AccessToken(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public Map<String, Object> getAdditionalInformation() {
+		return null;
+	}
+
+	@Override
+	public Set<String> getScope() {
+		return null;
+	}
+
+	@Override
+	public OAuth2RefreshToken getRefreshToken() {
+		return null;
+	}
+
+	@Override
+	public String getTokenType() {
+		return null;
+	}
+
+	@Override
+	public boolean isExpired() {
+		return false;
+	}
+
+	@Override
+	public Date getExpiration() {
+		return null;
+	}
+
+	@Override
+	public int getExpiresIn() {
+		return 0;
+	}
+
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+}
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015-2015 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.security;
+
+import java.util.HashMap;
+
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.token.AccessTokenRequest;
+import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
+import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+
+/**
+ * Mocks the current client context
+ *
+ * @author João Pedro Evangelista
+ */
+final class MockOAuth2ClientContext implements OAuth2ClientContext {
+
+	private final String value;
+
+	MockOAuth2ClientContext(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public OAuth2AccessToken getAccessToken() {
+		return new DefaultOAuth2AccessToken(value);
+	}
+
+	@Override
+	public void setAccessToken(OAuth2AccessToken accessToken) {
+
+	}
+
+	@Override
+	public AccessTokenRequest getAccessTokenRequest() {
+		DefaultAccessTokenRequest tokenRequest = new DefaultAccessTokenRequest(new HashMap<String, String[]>());
+		tokenRequest.setExistingToken(new DefaultOAuth2AccessToken(value));
+		return tokenRequest;
+	}
+
+	@Override
+	public void setPreservedState(String stateKey, Object preservedState) {
+
+	}
+
+	@Override
+	public Object removePreservedState(String stateKey) {
+		return null;
+	}
+
+}
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015-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.security;
+
+import java.util.Collection;
+import java.util.Map;
+
+import feign.Request.HttpMethod;
+import feign.RequestTemplate;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
+import org.springframework.security.oauth2.client.token.AccessTokenRequest;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author João Pedro Evangelista
+ * @author Tim Ysewyn
+ */
+public class OAuth2FeignRequestInterceptorTests {
+
+	private OAuth2FeignRequestInterceptor oAuth2FeignRequestInterceptor;
+
+	private RequestTemplate requestTemplate;
+
+	@Before
+	public void setUp() {
+		oAuth2FeignRequestInterceptor = new OAuth2FeignRequestInterceptor(new MockOAuth2ClientContext("Fancy"),
+				new BaseOAuth2ProtectedResourceDetails());
+		requestTemplate = new RequestTemplate().method(HttpMethod.GET);
+	}
+
+	@Test
+	public void applyAuthorizationHeader() {
+		oAuth2FeignRequestInterceptor.apply(requestTemplate);
+		Map<String, Collection<String>> headers = requestTemplate.headers();
+		Assert.assertTrue("RequestTemplate must have a Authorization header", headers.containsKey("Authorization"));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"),
+				contains("Bearer Fancy"));
+	}
+
+	@Test(expected = OAuth2AccessDeniedException.class)
+	public void tryToAcquireToken() {
+		oAuth2FeignRequestInterceptor = new OAuth2FeignRequestInterceptor(new DefaultOAuth2ClientContext(),
+				new BaseOAuth2ProtectedResourceDetails());
+		OAuth2AccessToken oAuth2AccessToken = oAuth2FeignRequestInterceptor.getToken();
+		Assert.assertTrue(oAuth2AccessToken.getValue() + " Must be null", oAuth2AccessToken.getValue() == null);
+	}
+
+	@Test
+	public void configureAccessTokenProvider() {
+		OAuth2AccessToken mockedToken = new MockOAuth2AccessToken("MOCKED_TOKEN");
+		oAuth2FeignRequestInterceptor.setAccessTokenProvider(new MockAccessTokenProvider(mockedToken));
+		Assert.assertEquals("Should return same mocked token instance", mockedToken,
+				oAuth2FeignRequestInterceptor.acquireAccessToken());
+	}
+
+	@Test
+	public void applyAuthorizationHeaderOnlyOnce() {
+		OAuth2ClientContext oAuth2ClientContext = mock(OAuth2ClientContext.class);
+		when(oAuth2ClientContext.getAccessToken()).thenReturn(new MockOAuth2AccessToken("MOCKED_TOKEN"));
+
+		OAuth2FeignRequestInterceptor oAuth2FeignRequestInterceptor = new OAuth2FeignRequestInterceptor(
+				oAuth2ClientContext, new BaseOAuth2ProtectedResourceDetails());
+
+		oAuth2FeignRequestInterceptor.apply(requestTemplate);
+
+		// First idempotent call failed, retry mechanism kicks in, and token has expired
+		// in the meantime
+
+		OAuth2AccessToken expiredAccessToken = mock(OAuth2AccessToken.class);
+		when(expiredAccessToken.isExpired()).thenReturn(true);
+		when(oAuth2ClientContext.getAccessToken()).thenReturn(expiredAccessToken);
+		AccessTokenRequest accessTokenRequest = mock(AccessTokenRequest.class);
+		when(oAuth2ClientContext.getAccessTokenRequest()).thenReturn(accessTokenRequest);
+		OAuth2AccessToken newToken = new MockOAuth2AccessToken("Fancy");
+		oAuth2FeignRequestInterceptor.setAccessTokenProvider(new MockAccessTokenProvider(newToken));
+
+		oAuth2FeignRequestInterceptor.apply(requestTemplate);
+
+		Map<String, Collection<String>> headers = requestTemplate.headers();
+		Assert.assertTrue("RequestTemplate must have a Authorization header", headers.containsKey("Authorization"));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"), hasSize(1));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"),
+				contains("Bearer Fancy"));
+	}
+
+}
@@ -0,0 +1,112 @@
+/*
+ * 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.nio.charset.Charset;
+
+import feign.Response;
+import feign.codec.Decoder;
+import feign.codec.Encoder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Abstract class for the integration tests for {@link SpringMvcContract}.
+ *
+ * @author Ram Anaswara
+ */
+public class AbstractSpringMvcContractIntegrationTests {
+
+	@BeforeAll
+	public static void beforeClass() {
+		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
+	}
+
+	@AfterAll
+	public static void afterClass() {
+		System.clearProperty("server.port");
+	}
+
+	protected String getUrlQueryParam(Response response) {
+		return response.request().requestTemplate().queries().get("url").stream().findFirst()
+				.orElseThrow(IllegalStateException::new);
+	}
+
+	@FeignClient(name = "test", url = "http://localhost:${server.port}/",
+			configuration = NoCodecsFeignConfiguration.class)
+	interface TestClient {
+
+		@PostMapping("/test")
+		Object sendMessage(@RequestBody String message, @RequestHeader(HttpHeaders.CONTENT_TYPE) String acceptHeader);
+
+		@GetMapping("/get")
+		Object getMessage(@RequestParam String url);
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableFeignClients(clients = TestClient.class)
+	@EnableAutoConfiguration
+	@RestController
+	@Import(NoSecurityConfiguration.class)
+	protected static class Config {
+
+		@PostMapping("/test")
+		Object sendMessage(@RequestBody String message, @RequestHeader(HttpHeaders.CONTENT_TYPE) String acceptHeader) {
+			return message;
+		}
+
+		@GetMapping("/get")
+		Object getMessage(@RequestParam String url) {
+			return url;
+		}
+
+	}
+
+	// Avoid feign.codec.EncodeException - this feature works for users that override
+	// Encoder
+	protected static class NoCodecsFeignConfiguration {
+
+		@Bean
+		public Decoder decoder() {
+			return (response, type) -> response;
+		}
+
+		@Bean
+		public Encoder encoder() {
+			return (object, bodyType, request) -> request.body(object.toString().getBytes(), Charset.defaultCharset());
+		}
+
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 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.support;

+import java.util.concurrent.TimeUnit;
+
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,6 +25,8 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.PoolConcurrencyPolicy;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.PoolReusePolicy;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,9 +34,12 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_SOCKET_TIMEOUT;
+import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_SOCKET_TIMEOUT_UNIT;

 /**
 * @author Ryan Baxter
+ * @author Nguyen Ky Thanh
 */
@RunWith(SpringRunner.class)
@DirtiesContext
@@ -59,6 +66,10 @@ public class FeignHttpClientPropertiesTests {
 		assertThat(getProperties().isDisableSslValidation())
 				.isEqualTo(FeignHttpClientProperties.DEFAULT_DISABLE_SSL_VALIDATION);
 		assertThat(getProperties().isFollowRedirects()).isEqualTo(FeignHttpClientProperties.DEFAULT_FOLLOW_REDIRECTS);
+		assertThat(getProperties().getHc5().getPoolConcurrencyPolicy()).isEqualTo(PoolConcurrencyPolicy.STRICT);
+		assertThat(getProperties().getHc5().getPoolReusePolicy()).isEqualTo(PoolReusePolicy.FIFO);
+		assertThat(getProperties().getHc5().getSocketTimeout()).isEqualTo(DEFAULT_SOCKET_TIMEOUT);
+		assertThat(getProperties().getHc5().getSocketTimeoutUnit()).isEqualTo(DEFAULT_SOCKET_TIMEOUT_UNIT);
 	}

 	@Test
@@ -66,7 +77,10 @@ public class FeignHttpClientPropertiesTests {
 		TestPropertyValues
 				.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2",
 						"feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2",
-						"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false")
+						"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
+						"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
+						"feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo",
+						"feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds")
 				.applyTo(this.context);
 		setupContext();
 		assertThat(getProperties().getMaxConnections()).isEqualTo(2);
@@ -75,6 +89,10 @@ public class FeignHttpClientPropertiesTests {
 		assertThat(getProperties().getTimeToLive()).isEqualTo(2L);
 		assertThat(getProperties().isDisableSslValidation()).isTrue();
 		assertThat(getProperties().isFollowRedirects()).isFalse();
+		assertThat(getProperties().getHc5().getPoolConcurrencyPolicy()).isEqualTo(PoolConcurrencyPolicy.LAX);
+		assertThat(getProperties().getHc5().getPoolReusePolicy()).isEqualTo(PoolReusePolicy.LIFO);
+		assertThat(getProperties().getHc5().getSocketTimeout()).isEqualTo(200);
+		assertThat(getProperties().getHc5().getSocketTimeoutUnit()).isEqualTo(TimeUnit.MILLISECONDS);
 	}

 	private void setupContext() {
@@ -19,14 +19,18 @@ package org.springframework.cloud.openfeign.support;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;

 import org.springframework.data.domain.Page;

 import static org.assertj.core.api.Assertions.assertThat;

 /**
+ * Test for {@link PageJacksonModule}.
+ *
 * @author Ruben Vervaeke
+ * @author Olga Maciaszek-Sharma
 */
 public class PageJacksonModuleTests {

@@ -38,10 +42,11 @@ public class PageJacksonModuleTests {
 		objectMapper.registerModule(new PageJacksonModule());
 	}

-	@Test
-	public void deserializePage() throws JsonProcessingException {
+	@ParameterizedTest
+	@ValueSource(strings = { "totalElements", "total-elements", "total_elements", "totalelements", "TotalElements" })
+	public void deserializePage(String totalElements) throws JsonProcessingException {
 		// Given
-		String pageJson = "{\"content\":[\"A name\"], \"number\":1, \"size\":2, \"totalElements\": 3}";
+		String pageJson = "{\"content\":[\"A name\"], \"number\":1, \"size\":2, \"" + totalElements + "\": 3}";
 		// When
 		Page<?> result = objectMapper.readValue(pageJson, Page.class);
 		// Then
@@ -16,47 +16,41 @@

 package org.springframework.cloud.openfeign.support;

-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.CollectionFormat;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

 /**
 * @author Olga Maciaszek-Sharma
 */
-@SpringBootTest(classes = PageableSupportTest.Config.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = PageableSupportTest.Config.class, webEnvironment = RANDOM_PORT)
 public class PageableSupportTest {

 	@Autowired
 	private PageableFeignClient feignClient;

-	@BeforeAll
-	public static void beforeClass() {
-		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
-	}
-
-	@AfterAll
-	public static void afterClass() {
-		System.clearProperty("server.port");
-	}
-
 	@Test
 	void shouldProperlyFormatPageable() {
 		String direction = feignClient.performRequest(PageRequest.of(1, 10, Sort.by(Sort.Order.desc("property"))));
@@ -64,7 +58,7 @@ public class PageableSupportTest {
 		assertThat(direction).isEqualTo("DESC");
 	}

-	@FeignClient(name = "pageable", url = "http://localhost:${server.port}/")
+	@FeignClient("pageable")
 	protected interface PageableFeignClient {

 		@CollectionFormat(feign.CollectionFormat.CSV)
@@ -79,6 +73,7 @@ public class PageableSupportTest {
 	@RestController
 	@EnableFeignClients(clients = PageableFeignClient.class)
 	@Import(NoSecurityConfiguration.class)
+	@LoadBalancerClient(name = "pageable", configuration = LocalClientConfiguration.class)
 	protected static class Config {

 		@GetMapping(path = "/page")
@@ -88,4 +83,19 @@ public class PageableSupportTest {

 	}

+	// Load balancer with fixed server list for "local" pointing to localhost
+	@Configuration(proxyBeanMethods = false)
+	static class LocalClientConfiguration {
+
+		@LocalServerPort
+		private int port = 0;
+
+		@Bean
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("pageable",
+					new DefaultServiceInstance("pageable-1", "pageable", "localhost", port, false));
+		}
+
+	}
+
 }
@@ -36,9 +36,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.openfeign.FeignContext;
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.Resource;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -47,6 +49,7 @@ import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -59,6 +62,7 @@ import static org.springframework.http.HttpHeaders.CONTENT_LENGTH;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
+import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;

 /**
 * @author Spencer Gibb
@@ -78,6 +82,9 @@ public class SpringEncoderTests {
 	@Qualifier("myHttpMessageConverter")
 	private HttpMessageConverter<?> myConverter;

+	@Autowired
+	private ApplicationContext applicationContext;
+
 	@Autowired
 	@Qualifier("myGenericHttpMessageConverter")
 	private GenericHttpMessageConverter<?> myGenericConverter;
@@ -172,6 +179,32 @@ public class SpringEncoderTests {
 		assertThat(new String(request.requestBody().asBytes())).as("Body content cannot be decoded").contains("hi");
 	}

+	@Test
+	public void testNoCharsetForBinaryFiles() {
+		Encoder encoder = context.getInstance("test", Encoder.class);
+		assertThat(encoder).isNotNull();
+		RequestTemplate request = new RequestTemplate();
+		request.header(CONTENT_TYPE, APPLICATION_OCTET_STREAM_VALUE);
+		Resource resource = applicationContext.getResource("classpath:dummy.pdf");
+
+		encoder.encode(resource, Resource.class, request);
+
+		assertThat(request.requestBody().getEncoding()).isEmpty();
+	}
+
+	@Test
+	public void testUTF8CharsetForTextFiles() {
+		Encoder encoder = context.getInstance("test", Encoder.class);
+		assertThat(encoder).isNotNull();
+		RequestTemplate request = new RequestTemplate();
+		request.header(CONTENT_TYPE, TEXT_PLAIN_VALUE);
+		String test = "test";
+
+		encoder.encode(test, String.class, request);
+
+		assertThat(request.requestBody().getEncoding().get().name()).isEqualTo("UTF-8");
+	}
+
 	protected interface TestClient {

 	}
@@ -200,6 +233,11 @@ public class SpringEncoderTests {
 			return new MyHttpMessageConverter();
 		}

+		@Bean
+		ResourceHttpMessageConverter resourceHttpMessageConverter() {
+			return new ResourceHttpMessageConverter();
+		}
+
 		@Bean
 		GenericHttpMessageConverter<?> myGenericHttpMessageConverter() {
 			return new MyGenericHttpMessageConverter();
@@ -16,96 +16,39 @@

 package org.springframework.cloud.openfeign.support;

-import java.nio.charset.Charset;
-
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import feign.Response;
 import org.junit.jupiter.api.Test;

 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.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.SocketUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;

+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;

 /**
- * Integration tests for {@link SpringMvcContract}
+ * Integration tests for {@link SpringMvcContract}.
 *
 * @author Olga Maciaszek-Sharma
+ * @author Ram Anaswara
 */
-@SpringBootTest(classes = SpringMvcContractIntegrationTests.Config.class,
+@SpringBootTest(classes = AbstractSpringMvcContractIntegrationTests.Config.class,
 		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class SpringMvcContractIntegrationTests {
+public class SpringMvcContractIntegrationTests extends AbstractSpringMvcContractIntegrationTests {

 	@Autowired
 	private TestClient client;

-	@BeforeAll
-	public static void beforeClass() {
-		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
-	}
-
-	@AfterAll
-	public static void afterClass() {
-		System.clearProperty("server.port");
-	}
-
 	@Test
 	public void shouldNotThrowInvalidMediaTypeExceptionWhenContentTypeTemplateUsed() {
 		assertThatCode(() -> client.sendMessage("test", "text/markdown")).doesNotThrowAnyException();
 	}

-	@FeignClient(name = "test", url = "http://localhost:${server.port}/",
-			configuration = NoCodecsFeignConfiguration.class)
-	interface TestClient {
-
-		@PostMapping("/test")
-		Object sendMessage(@RequestBody String message, @RequestHeader(HttpHeaders.CONTENT_TYPE) String acceptHeader);
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableFeignClients(clients = TestClient.class)
-	@EnableAutoConfiguration
-	@RestController
-	@Import(NoSecurityConfiguration.class)
-	protected static class Config {
-
-		@PostMapping("/test")
-		Object sendMessage(@RequestBody String message, @RequestHeader(HttpHeaders.CONTENT_TYPE) String acceptHeader) {
-			return message;
-		}
-
-	}
-
-	// avoid feign.codec.EncodeException - this feature works for users that override
-	// Encoder
-	protected static class NoCodecsFeignConfiguration {
-
-		@Bean
-		public Decoder decoder() {
-			return (response, type) -> response;
-		}
-
-		@Bean
-		public Encoder encoder() {
-			return (object, bodyType, request) -> request.body(object.toString().getBytes(), Charset.defaultCharset());
-		}
+	@Test
+	public void feignClientShouldPreserveSlash() {
+		Response response = (Response) client.getMessage("https://www.google.com");

+		String urlQueryParam = getUrlQueryParam(response);
+		assertThat(urlQueryParam).isEqualTo("https%3A//www.google.com");
 	}

 }
@@ -0,0 +1,47 @@
+/*
+ * 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.Response;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link SpringMvcContract}.
+ *
+ * @author Ram Anaswara
+ */
+@SpringBootTest(classes = SpringMvcContractSlashEncodingIntegrationTests.Config.class,
+		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = { "feign.client.decodeSlash=false" })
+public class SpringMvcContractSlashEncodingIntegrationTests extends AbstractSpringMvcContractIntegrationTests {
+
+	@Autowired
+	private TestClient client;
+
+	@Test
+	public void feignClientShouldNotDecodeEncodedSlash() {
+		Response response = (Response) client.getMessage("https://www.google.com");
+
+		String urlQueryParam = getUrlQueryParam(response);
+		assertThat(urlQueryParam).isEqualTo("https%3A%2F%2Fwww.google.com");
+	}
+
+}
@@ -114,11 +114,7 @@ public class SpringMvcContractTests {

 	@Before
 	public void setup() {
-		FormattingConversionServiceFactoryBean conversionServiceFactoryBean = new FormattingConversionServiceFactoryBean();
-		conversionServiceFactoryBean.afterPropertiesSet();
-		ConversionService conversionService = conversionServiceFactoryBean.getObject();
-
-		contract = new SpringMvcContract(Collections.emptyList(), conversionService);
+		contract = new SpringMvcContract(Collections.emptyList(), getConversionService());
 	}

 	@Test
@@ -130,6 +126,19 @@ public class SpringMvcContractTests {
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+		assertThat(data.template().decodeSlash()).isTrue();
+	}
+
+	@Test
+	public void testProcessAnnotationOnMethod_Simple_SlashEncoded() throws Exception {
+		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false);
+
+		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest", String.class);
+		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/test/{id}");
+
+		assertThat(data.template().decodeSlash()).isFalse();
 	}

 	@Test
@@ -180,6 +189,19 @@ public class SpringMvcContractTests {
 		assertThat(data.template().method()).isEqualTo("GET");

 		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo("classId");
+		assertThat(data.template().decodeSlash()).isTrue();
+	}
+
+	@Test
+	public void testProcessAnnotations_Class_AnnotationsGetAllTests_EncodeSlash() throws Exception {
+		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false);
+
+		Method method = TestTemplate_Class_Annotations.class.getDeclaredMethod("getAllTests", String.class);
+		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/prepend/{classId}");
+
+		assertThat(data.template().decodeSlash()).isFalse();
 	}

 	@Test
@@ -193,8 +215,25 @@ public class SpringMvcContractTests {

 		assertThat(data.template().url()).isEqualTo(extendedData.template().url());
 		assertThat(data.template().method()).isEqualTo(extendedData.template().method());
-
 		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo(data.indexToName().get(0).iterator().next());
+		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo(data.indexToName().get(0).iterator().next());
+		assertThat(data.template().decodeSlash()).isTrue();
+	}
+
+	@Test
+	public void testProcessAnnotations_ExtendedInterface_EncodeSlash() throws Exception {
+		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false);
+
+		Method extendedMethod = TestTemplate_Extended.class.getMethod("getAllTests", String.class);
+		MethodMetadata extendedData = contract.parseAndValidateMetadata(extendedMethod.getDeclaringClass(),
+				extendedMethod);
+
+		Method method = TestTemplate_Class_Annotations.class.getDeclaredMethod("getAllTests", String.class);
+		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo(extendedData.template().url());
+		assertThat(data.template().method()).isEqualTo(extendedData.template().method());
+		assertThat(data.template().decodeSlash()).isFalse();
 	}

 	@Test
@@ -343,6 +382,19 @@ public class SpringMvcContractTests {
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+		assertThat(data.template().decodeSlash()).isTrue();
+	}
+
+	@Test
+	public void testProcessAnnotations_Advanced3_DecodeSlashFlagNotModified() throws Exception {
+		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false);
+
+		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest");
+		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/");
+
+		assertThat(data.template().decodeSlash()).isTrue();
 	}

 	@Test
@@ -524,6 +576,12 @@ public class SpringMvcContractTests {
 		assertThat(data.formParams()).contains("file", "id");
 	}

+	private ConversionService getConversionService() {
+		FormattingConversionServiceFactoryBean conversionServiceFactoryBean = new FormattingConversionServiceFactoryBean();
+		conversionServiceFactoryBean.afterPropertiesSet();
+		return conversionServiceFactoryBean.getObject();
+	}
+
 	public interface TestTemplate_Simple {

 		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -108,7 +108,7 @@ class ApacheHttpClientConfigurationTests {
 	@EnableFeignClients(clients = { ApacheHttpClientConfigurationTestApp.FooClient.class })
 	static class ApacheHttpClientConfigurationTestApp {

-		@FeignClient(name = "foo", serviceId = "foo")
+		@FeignClient(name = "foo")
 		interface FooClient {

 		}
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2021-2021 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.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * A few assertions to sanity-check equals and hashCode contracts:
+ * https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html See
+ * {@link Object#equals(Object)} and {@link Object#hashCode()}.
+ *
+ * @author Jonatan Ivanov
+ */
+public class EqualsAndHashCodeAssert {
+
+	/**
+	 * Checks if equals is reflexive: for any non-null reference value x, x.equals(x)
+	 * should return true.
+	 * @param object the reference object to check
+	 */
+	public static void assertEqualsReflexivity(Object object) {
+		assertThat(object.equals(object)).isTrue();
+	}
+
+	/**
+	 * Checks if equals is symmetric: for any non-null reference values x and y,
+	 * x.equals(y) should return true if and only if y.equals(x) returns true The user of
+	 * this method should call this at least twice: once with objects that are equal and
+	 * once with objects that are not.
+	 * @param objectOne a reference object to check
+	 * @param objectTwo another reference object to check
+	 */
+	public static void assertEqualsSymmetricity(Object objectOne, Object objectTwo) {
+		assertThat(objectOne.equals(objectTwo)).isEqualTo(objectTwo.equals(objectOne));
+	}
+
+	/**
+	 * Checks if equals is transitive: for any non-null reference values x, y, and z, if
+	 * x.equals(y) returns true and y.equals(z) returns true, then x.equals(z) should
+	 * return true.
+	 * @param objectOne a reference object to check
+	 * @param objectTwo another reference object to check
+	 * @param objectThree and the third reference object to check
+	 */
+	public static void assertEqualsTransitivity(Object objectOne, Object objectTwo, Object objectThree) {
+		assertThat(objectOne.equals(objectTwo)).isTrue();
+		assertThat(objectTwo.equals(objectThree)).isTrue();
+		assertThat(objectOne.equals(objectThree)).isTrue();
+	}
+
+	/**
+	 * Tries to check if equals is consistent: for any non-null reference values x and y,
+	 * multiple invocations of x.equals(y) consistently return true or consistently return
+	 * false. The user of this method should call this at least twice: once with objects
+	 * that are equal and once with objects that are not.
+	 * @param objectOne a reference object to check
+	 * @param objectTwo another reference object to check
+	 */
+	public static void assertEqualsConsistency(Object objectOne, Object objectTwo) {
+		boolean equality = objectOne.equals(objectTwo);
+		for (int i = 0; i < 100; i++) {
+			assertThat(objectOne.equals(objectTwo)).isEqualTo(equality);
+		}
+	}
+
+	/**
+	 * Tries to check if hashCode is consistent: whenever it is invoked on the same object
+	 * more than once during an execution of a Java application, the hashCode method must
+	 * consistently return the same integer.
+	 * @param object the reference object to check
+	 */
+	public static void assertHashCodeConsistency(Object object) {
+		int hashCode = object.hashCode();
+		for (int i = 0; i < 100; i++) {
+			assertThat(object.hashCode()).isEqualTo(hashCode);
+		}
+	}
+
+	/**
+	 * Checks if equals and hashCode are consistent to each other: if two objects are
+	 * equal according to the equals method, then calling the hashCode method on each of
+	 * the two objects must produce the same integer result.
+	 * @param objectOne a reference object to check
+	 * @param objectTwo another reference object to check
+	 */
+	public static void assertEqualsAndHashCodeConsistency(Object objectOne, Object objectTwo) {
+		assertThat(objectOne.equals(objectTwo)).isTrue();
+		assertThat(objectOne.hashCode()).isEqualTo(objectTwo.hashCode());
+	}
+
+}
@@ -26,14 +26,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -155,8 +156,9 @@ public class FeignClientNotPrimaryTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -26,9 +26,11 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
@@ -36,7 +38,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -54,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
+		value = { "spring.application.name=feignclienttest", "feign.circuitbreaker.enabled=false",
 				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class FeignHttpClientTests {
@@ -243,8 +244,9 @@ class FeignHttpClientTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -26,9 +26,11 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
@@ -36,7 +38,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -53,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignOkHttpTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
+		value = { "spring.application.name=feignclienttest", "feign.circuitbreaker.enabled=false",
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true",
 				"spring.cloud.httpclientfactories.ok.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
@@ -245,8 +246,9 @@ class FeignOkHttpTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -26,15 +26,16 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -50,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(classes = IterableParameterTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=iterableparametertest",
 				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
-				"feign.okhttp.enabled=false", "feign.hystrix.enabled=false" })
+				"feign.okhttp.enabled=false", "feign.circuitbreaker.enabled=false" })
@DirtiesContext
 public class IterableParameterTests {

@@ -94,8 +95,9 @@ public class IterableParameterTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -49,9 +49,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignFormatterRegistrar;
@@ -62,7 +64,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.format.Formatter;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -96,7 +97,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@SpringBootTest(classes = ValidFeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=feignclienttest",
 				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
-				"feign.okhttp.enabled=false", "feign.hystrix.enabled=true",
+				"feign.okhttp.enabled=false", "feign.circuitbreaker.enabled=true",
 				"spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class ValidFeignClientTests {
@@ -808,8 +809,9 @@ class ValidFeignClientTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -23,15 +23,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.cloud.openfeign.testclients.TestClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,8 +85,9 @@ public class FeignClientEnvVarTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("localapp",
+					new DefaultServiceInstance("localapp-1", "localapp", "localhost", port, false));
 		}

 	}
@@ -25,15 +25,16 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -118,8 +119,9 @@ public class FeignClientScanningTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier() {
+			return ServiceInstanceListSuppliers.from("local",
+					new DefaultServiceInstance("local-1", "local", "localhost", port, false));
 		}

 	}
@@ -15,7 +15,6 @@ eureka:
    fetchRegistry: false
 #error:
 #  path: /myerror
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 ribbon:
  ConnectTimeout: 3001
  ReadTimeout: 60001
@@ -30,10 +29,16 @@ badClients:
 endpoints:
  health:
    sensitive: false
-hystrix:
-  shareSecurityContext: true
 feignClient:
  localappName: localapp
  methodLevelRequestMappingPath: /hello2
  myPlaceholderHeader: myPlaceholderHeaderValue
 management.endpoints.web.expose: '*'
+
+---
+spring.config.activate.on-profile: no-metrics
+feign.metrics.enabled: false
+
+---
+spring.config.activate.on-profile: no-foo-metrics
+feign.client.config.foo.metrics.enabled: false
--- a/Show More
+++ b/Show More