Update SNAPSHOT to 3.0.0-RC1

Adjust to changes in commons.
2020-12-11 22:06:22 +00:00 · 2020-12-10 17:15:26 +01:00 · 2020-12-10 14:17:15 +01:00 · 2020-12-09 19:38:04 +01:00 · 2020-12-09 18:49:54 +01:00 · 2020-12-09 15:22:10 +01:00
185 changed files with 2164 additions and 10350 deletions
@@ -0,0 +1,38 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-openfeign-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-openfeign-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p $CIRCLE_TEST_REPORTS/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: /junit/
+          destination: artifacts
+      - store_test_results:
+          path: /junit/
+          destination: testartifacts
@@ -3,7 +3,7 @@

 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into main. If you want
+tracker for issues and merging pull requests into master. If you want
 to contribute even something trivial please do not hesitate, but
 follow the guidelines below.

@@ -17,7 +17,7 @@ given the ability to merge pull requests.

 ## Code of Conduct
 This project adheres to the Contributor Covenant [code of
-conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
 unacceptable behavior to spring-code-of-conduct@pivotal.io.

 ## Code Conventions and Housekeeping
@@ -27,7 +27,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
  you can import formatter settings using the
  `eclipse-code-formatter.xml` file from the
-  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
+  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
  [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -38,7 +38,7 @@ added after the original pull request but before a merge.
  than cosmetic changes).
 * Add some Javadocs and, if you change the namespace, some XSD doc elements.
 * A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current main (or
+* If no-one else is using your branch, please rebase it against the current master (or
  other target branch in the main project).
 * When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
@@ -1,35 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Build
-
-on:
-  push:
-    branches: [ 2.2.x ]
-  pull_request:
-    branches: [ 2.2.x ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        java: ["8", "11", "16"]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Build with Maven
-        run: ./mvnw clean install -B -U
@@ -5,9 +5,9 @@ Edit the files in the src/main/asciidoc/ directory instead.
 ////


-image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
+image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]

-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
+image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]

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

@@ -28,8 +28,6 @@ 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.

@@ -66,9 +64,23 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.

-The projects that require middleware (i.e. Redis) for testing generally
-require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they're related to setting git
+credentials and you already have those.

+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
+in Docker containers. See the README in the
+https://github.com/spring-cloud-samples/scripts[scripts demo
+repository] for specific instructions about the common cases of mongo,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).

 === Documentation

@@ -302,7 +314,3 @@ 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/main/LICENSE.txt[here].
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -6,10 +6,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.10.BUILD-SNAPSHOT</version>
+		<version>3.0.0-RC1</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
-	<packaging>pom</packaging>
+	<packaging>jar</packaging>
 	<name>Spring Cloud OpenFeign Docs</name>
 	<description>Spring Cloud Docs</description>
 	<properties>
@@ -24,6 +24,9 @@
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<sourceDirectory>src/main/asciidoc</sourceDirectory>
+	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
@@ -34,9 +37,11 @@
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
@@ -48,6 +53,7 @@
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>
@@ -1,6 +1,6 @@
-image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
+image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]

-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
+image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]

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

@@ -14,12 +14,8 @@ include::intro.adoc[]

 == Building

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[]

 == Contributing

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

-|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` | 
@@ -12,17 +10,11 @@
 |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` | 
@@ -39,7 +39,7 @@ function check_if_anything_to_sync() {
 }

 function retrieve_current_branch() {
-    # Code getting the name of the current branch. For main we want to publish as we did until now
+    # Code getting the name of the current branch. For master we want to publish as we did until now
    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
    # If there is a branch already passed will reuse it - otherwise will try to find it
    CURRENT_BRANCH=${BRANCH}
@@ -134,8 +134,8 @@ function add_docs_from_target() {

 # Copies the docs by using the retrieved properties from Maven build
 function copy_docs_for_current_version() {
-    if [[ "${CURRENT_BRANCH}" == "main" ]] ; then
-        echo -e "Current branch is main - will copy the current docs only to the root folder"
+    if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
+        echo -e "Current branch is master - will copy the current docs only to the root folder"
        for f in docs/target/generated-docs/*; do
            file=${f#docs/target/generated-docs/*}
            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
@@ -216,7 +216,7 @@ function commit_changes_if_applicable() {
        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"

        # Uncomment the following push if you want to auto push to
-        # the gh-pages branch whenever you commit to main locally.
+        # the gh-pages branch whenever you commit to master locally.
        # This is a little extreme. Use with care!
        ###################################################################
        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
@@ -249,7 +249,7 @@ The idea of this script is to update gh-pages branch with the generated docs. Wi
 the script will work in the following manner:

 - if there's no gh-pages / target for docs module then the script ends
- for main branch the generated docs are copied to the root of gh-pages branch
+- for master branch the generated docs are copied to the root of gh-pages branch
 - for any other branch (if that branch is whitelisted) a subfolder with branch name is created
    and docs are copied there
 - if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
@@ -327,4 +327,4 @@ build_docs_if_applicable
 retrieve_doc_properties
 stash_changes
 add_docs_from_target
-checkout_previous_branch
+checkout_previous_branch
@@ -24,18 +24,3 @@ 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/main/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 Ribbon and Eureka, Spring Cloud CircuitBreaker, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
+Spring Cloud integrates Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -55,11 +55,11 @@ public interface StoreClient {
 }
 ----

-In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create either a https://github.com/Netflix/ribbon[Ribbon] load-balancer (see <<spring-cloud-ribbon,below for details of Ribbon support>> and <<spring-cloud-circuitbreaker,below for details of Spring Cloud CircuitBreaker support>>) or https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java[Spring Cloud LoadBalancer].
+In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create a https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java[Spring Cloud LoadBalancer client].
 You can also specify a URL using the `url` attribute
 (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 `qualifiers` value
+To specify your own alias value you can use the `qualifier` value
 of the `@FeignClient` annotation.

 The load-balancer client above will want to discover the physical addresses
@@ -68,9 +68,7 @@ it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
 in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].

-WARNING: In order to maintain backward compatibility, is used as the default load-balancer implementation.
-However, Spring Cloud Netflix Ribbon is now in maintenance mode, so we recommend using Spring Cloud LoadBalancer instead.
-To do this, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false`.
+Spring Cloud 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].

 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
@@ -94,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.
@@ -119,14 +115,13 @@ Spring Cloud OpenFeign provides the following beans by default for feign (`BeanT
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
-* `Client` feignClient: if Ribbon is in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
+* `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.

-NOTE: `spring-cloud-starter-openfeign` supports both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`. However, as they are optional dependencies, you need to make sure the one you want to use has been added to your project.
+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 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.
+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.

 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:

@@ -277,12 +272,6 @@ 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

@@ -293,32 +282,6 @@ We can configure timeouts on both the default and the named client. OpenFeign wo

 NOTE: In case the server is not running or available a packet results in _connection refused_. The communication ends either with an error message or in a fallback. This can happen _before_ the `connectTimeout` if it is set very low. The time taken to perform a lookup and to receive such a packet causes a significant part of this delay. It is subject to change based on the remote host that involves a DNS lookup.

-When Hystrix <<spring-cloud-openfeign#spring-cloud-feign-hystrix,is enabled>>, its timeout configuration link:https://github.com/Netflix/Hystrix/wiki/Configuration#execution.isolation.thread.timeoutInMilliseconds[defaults] to 1000 milliseconds. Hence, it might occur before the client timeout that we configured earlier. Increasing this timeout prevents it from happening.
-
-[source,yaml]
----
-feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-  hystrix:
-    enabled: true
-
-hystrix:
-  command:
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          thread:
-            timeoutInMilliseconds: 60000
----
-
-NOTE: When the Hystrix timeout is enabled and its timeout is set longer than that of a feign client, `HystrixTimeoutException` wraps a feign exception. Otherwise, the only difference is the cause of the exception. The purpose of `HystrixTimeoutException` is to wrap any runtime exception that occurs first and throw an instance of itself.
-
 === Creating Feign Clients Manually

 In some cases it might be necessary to customize your Feign Clients in a way that is not
@@ -393,7 +356,7 @@ favor for an opt-in approach.
 [[spring-cloud-feign-hystrix-fallback]]
 === Feign Hystrix Fallbacks

-Hystrix supports the notion of a fallback: a default code path that is executed when the 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.
+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.

 [source,java,indent=0]
 ----
@@ -437,44 +400,6 @@ static class HystrixClientFallbackFactory implements FallbackFactory<HystrixClie

 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`.

-[[spring-cloud-feign-circuitbreaker]]
-=== Feign Spring Cloud CircuitBreaker Support
-
-If Spring Cloud CircuitBreaker is on the classpath and `feign.circuitbreaker.enabled=true`, Feign will wrap all methods with a circuit breaker.
-
-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
-	@Scope("prototype")
-	public Feign.Builder feignBuilder() {
-		return Feign.builder();
-	}
-}
----
-
-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-circuitbreaker-fallback]]
-=== Feign Spring Cloud CircuitBreaker Fallbacks
-
-Spring Cloud CircuitBreaker supports the notion of a fallback: a default code path that is executed when the 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]
----
-include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback, indent=0]
----
-
-If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.
-
-[source,java,indent=0]
----
-include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback_factory, indent=0]
----
-
 === 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.
@@ -523,7 +448,10 @@ public interface UserClient extends UserService {
 }
 ----

-WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
+NOTE: It is generally not advisable to share an interface between a
+server and a client. It introduces tight coupling, and also actually
+doesn't work with Spring MVC in its current form (method parameter
+mapping is not inherited).

 === Feign request/response compression

@@ -707,14 +635,6 @@ 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 Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].
+To see the list of all Sleuth 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>2.2.10.BUILD-SNAPSHOT</version>
+	<version>3.0.0-RC1</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.6.BUILD-SNAPSHOT</version>
+		<version>3.0.0-RC1</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.2.10.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.10.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>3.0.0-RC1</spring-cloud-commons.version>

 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -94,13 +93,6 @@

 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-dependencies</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-commons-dependencies</artifactId>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.10.BUILD-SNAPSHOT</version>
+		<version>3.0.0-RC1</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -21,10 +21,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-ribbon</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -89,11 +85,6 @@
 			<artifactId>spring-cloud-context</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-core</artifactId>
@@ -108,56 +99,16 @@
 			<artifactId>feign-slf4j</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-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-hystrix</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-serialization</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-metrics-event-stream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-javanica</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
@@ -183,6 +134,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-test-support</artifactId>
@@ -198,16 +154,6 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -43,8 +43,7 @@ public interface AnnotatedParameterProcessor {
 	 * @param method the method that contains the annotation
 	 * @return whether the parameter is http
 	 */
-	boolean processArgument(AnnotatedParameterContext context, Annotation annotation,
-			Method method);
+	boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method);

 	/**
 	 * Specifies the parameter context.
@@ -25,8 +25,8 @@ import feign.Target;
 class DefaultTargeter implements Targeter {

 	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
-			FeignContext context, Target.HardCodedTarget<T> target) {
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
+			Target.HardCodedTarget<T> target) {
 		return feign.target(target);
 	}

@@ -1,87 +0,0 @@
-/*
- * 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-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,10 +25,8 @@ import java.util.concurrent.TimeUnit;

 import javax.annotation.PreDestroy;

-import com.fasterxml.jackson.databind.Module;
 import feign.Client;
 import feign.Feign;
-import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import okhttp3.ConnectionPool;
@@ -41,45 +39,28 @@ 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.AllNestedConditions;
-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.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.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;

 /**
 * @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, FeignEncoderProperties.class })
+@EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class })
@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {

@@ -101,27 +82,6 @@ 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(DefaultFeignTargeterConditions.class)
 	protected static class DefaultFeignTargeterConfiguration {

 		@Bean
@@ -132,46 +92,14 @@ public class FeignAutoConfiguration {

 	}

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

 		private final Timer connectionManagerTimer = new Timer(
@@ -187,13 +115,10 @@ public class FeignAutoConfiguration {
 		public HttpClientConnectionManager connectionManager(
 				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 				FeignHttpClientProperties httpClientProperties) {
-			final HttpClientConnectionManager connectionManager = connectionManagerFactory
-					.newConnectionManager(httpClientProperties.isDisableSslValidation(),
-							httpClientProperties.getMaxConnections(),
-							httpClientProperties.getMaxConnectionsPerRoute(),
-							httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLiveUnit(),
-							this.registryBuilder);
+			final HttpClientConnectionManager connectionManager = connectionManagerFactory.newConnectionManager(
+					httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
+					httpClientProperties.getMaxConnectionsPerRoute(), httpClientProperties.getTimeToLive(),
+					httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
 			this.connectionManagerTimer.schedule(new TimerTask() {
 				@Override
 				public void run() {
@@ -209,10 +134,8 @@ public class FeignAutoConfiguration {
 				FeignHttpClientProperties httpClientProperties) {
 			RequestConfig defaultRequestConfig = RequestConfig.custom()
 					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
-					.build();
-			this.httpClient = httpClientFactory.createBuilder()
-					.setConnectionManager(httpClientConnectionManager)
+					.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
+			this.httpClient = httpClientFactory.createBuilder().setConnectionManager(httpClientConnectionManager)
 					.setDefaultRequestConfig(defaultRequestConfig).build();
 			return this.httpClient;
 		}
@@ -242,7 +165,6 @@ public class FeignAutoConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {
@@ -251,8 +173,7 @@ public class FeignAutoConfiguration {

 		@Bean
 		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(
-				FeignHttpClientProperties httpClientProperties,
+		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
 			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
 			Long timeToLive = httpClientProperties.getTimeToLive();
@@ -261,16 +182,14 @@ public class FeignAutoConfiguration {
 		}

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

@@ -290,39 +209,4 @@ public class FeignAutoConfiguration {

 	}

-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(ApacheHttp5Client.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
-	@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);
-		}
-
-	}
-
-	static class DefaultFeignTargeterConditions extends AllNestedConditions {
-
-		DefaultFeignTargeterConditions() {
-			super(ConfigurationPhase.PARSE_CONFIGURATION);
-		}
-
-		@Conditional(FeignCircuitBreakerDisabledConditions.class)
-		static class FeignCircuitBreakerDisabled {
-
-		}
-
-		@Conditional(HystrixDisabledConditions.class)
-		static class HystrixDisabled {
-
-		}
-
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,89 +0,0 @@
-/*
- * 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.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();
-		}
-
-	}
-
-}
@@ -1,40 +0,0 @@
-/*
- * 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 {
-
-	}
-
-}
@@ -1,149 +0,0 @@
-/*
- * 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();
-	}
-
-}
@@ -1,97 +0,0 @@
-/*
- * 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-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,13 +27,12 @@ import org.springframework.core.annotation.AliasFor;

 /**
 * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If ribbon is available it will be
- * used to load balance the backend requests, and the load balancer can be configured
- * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
+ * created (e.g. for autowiring into another component). If SC LoadBalancer is available
+ * it will be used to load balance the backend requests, and the load balancer can be
+ * configured using the same name (i.e. value) as the feign client.
 *
 * @author Spencer Gibb
 * @author Venil Noronha
- * @author Olga Maciaszek-Sharma
 */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -50,14 +49,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.
@@ -74,28 +65,9 @@ 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).
 	 */
@@ -129,14 +101,12 @@ public @interface FeignClient {
 	 * 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;

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

@@ -16,9 +16,6 @@

 package org.springframework.cloud.openfeign;

-import feign.Feign;
-import feign.hystrix.FallbackFactory;
-
 import org.springframework.context.ApplicationContext;

 /**
@@ -29,7 +26,6 @@ import org.springframework.context.ApplicationContext;
 *
 * @author Sven Döring
 * @author Matt King
- * @author Sam Kruglov
 */
 public class FeignClientBuilder {

@@ -43,6 +39,11 @@ public class FeignClientBuilder {
 		return new Builder<>(this.applicationContext, type, name);
 	}

+	public <T> Builder<T> forType(final Class<T> type, final FeignClientFactoryBean clientFactoryBean,
+			final String name) {
+		return new Builder<>(this.applicationContext, clientFactoryBean, type, name);
+	}
+
 	/**
 	 * Builder of feign targets.
 	 *
@@ -52,9 +53,13 @@ public class FeignClientBuilder {

 		private FeignClientFactoryBean feignClientFactoryBean;

-		private Builder(final ApplicationContext applicationContext, final Class<T> type,
-				final String name) {
-			this.feignClientFactoryBean = new FeignClientFactoryBean();
+		private Builder(final ApplicationContext applicationContext, final Class<T> type, final String name) {
+			this(applicationContext, new FeignClientFactoryBean(), type, name);
+		}
+
+		private Builder(final ApplicationContext applicationContext, final FeignClientFactoryBean clientFactoryBean,
+				final Class<T> type, final String name) {
+			this.feignClientFactoryBean = clientFactoryBean;

 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
@@ -71,18 +76,6 @@ public class FeignClientBuilder {
 			return this;
 		}

-		/**
-		 * Applies a {@link FeignBuilderCustomizer} to the underlying
-		 * {@link Feign.Builder}. May be called multiple times.
-		 * @param customizer applied in the same order as supplied here after applying
-		 * customizers found in the context.
-		 * @return the {@link Builder} with the customizer added
-		 */
-		public Builder<T> customize(final FeignBuilderCustomizer customizer) {
-			this.feignClientFactoryBean.addCustomizer(customizer);
-			return this;
-		}
-
 		public Builder<T> contextId(final String contextId) {
 			this.feignClientFactoryBean.setContextId(contextId);
 			return this;
@@ -109,13 +102,6 @@ public class FeignClientBuilder {
 			return this;
 		}

-		public Builder<T> fallbackFactory(
-				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
-			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
-			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
-			return this;
-		}
-
 		/**
 		 * @return the created Feign client
 		 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,20 +35,14 @@ import feign.Target.HardCodedTarget;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;

 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.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -63,19 +57,14 @@ import org.springframework.util.StringUtils;
 * @author Matt King
 * @author Olga Maciaszek-Sharma
 * @author Ilia Ilinykh
- * @author Marcin Grzejszczak
- * @author Sam Kruglov
 */
-public class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
-		ApplicationContextAware, BeanFactoryAware {
+public class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean, ApplicationContextAware {

 	/***********************************
 	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
 	 * lifecycle race condition.
 	 ***********************************/

-	private static Log LOG = LogFactory.getLog(FeignClientFactoryBean.class);
-
 	private Class<?> type;

 	private String name;
@@ -92,8 +81,6 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 	private ApplicationContext applicationContext;

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

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

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

-	private boolean followRedirects = new Request.Options().isFollowRedirects();
-
-	private List<FeignBuilderCustomizer> additionalCustomizers = new ArrayList<>();
-
 	@Override
 	public void afterPropertiesSet() {
 		Assert.hasText(contextId, "Context id must be set");
@@ -132,39 +115,29 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}

 	private void applyBuildCustomizers(FeignContext context, Feign.Builder builder) {
-		Map<String, FeignBuilderCustomizer> customizerMap = context
-				.getInstances(contextId, FeignBuilderCustomizer.class);
+		Map<String, FeignBuilderCustomizer> customizerMap = context.getInstances(contextId,
+				FeignBuilderCustomizer.class);

 		if (customizerMap != null) {
-			customizerMap.values().stream()
-					.sorted(AnnotationAwareOrderComparator.INSTANCE)
-					.forEach(feignBuilderCustomizer -> feignBuilderCustomizer
-							.customize(builder));
+			customizerMap.values().stream().sorted(AnnotationAwareOrderComparator.INSTANCE)
+					.forEach(feignBuilderCustomizer -> feignBuilderCustomizer.customize(builder));
 		}
-		additionalCustomizers.forEach(customizer -> customizer.customize(builder));
 	}

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

-		FeignClientConfigurer feignClientConfigurer = getOptional(context,
-				FeignClientConfigurer.class);
+		FeignClientConfigurer feignClientConfigurer = getOptional(context, FeignClientConfigurer.class);
 		setInheritParentContext(feignClientConfigurer.inheritParentConfiguration());

 		if (properties != null && inheritParentContext) {
 			if (properties.isDefaultToProperties()) {
 				configureUsingConfiguration(context, builder);
-				configureUsingProperties(
-						properties.getConfig().get(properties.getDefaultConfig()),
-						builder);
+				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
 				configureUsingProperties(properties.getConfig().get(contextId), builder);
 			}
 			else {
-				configureUsingProperties(
-						properties.getConfig().get(properties.getDefaultConfig()),
-						builder);
+				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
 				configureUsingProperties(properties.getConfig().get(contextId), builder);
 				configureUsingConfiguration(context, builder);
 			}
@@ -174,8 +147,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}
 	}

-	protected void configureUsingConfiguration(FeignContext context,
-			Feign.Builder builder) {
+	protected void configureUsingConfiguration(FeignContext context, Feign.Builder builder) {
 		Logger.Level level = getInheritedAwareOptional(context, Logger.Level.class);
 		if (level != null) {
 			builder.logLevel(level);
@@ -184,52 +156,45 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		if (retryer != null) {
 			builder.retryer(retryer);
 		}
-		ErrorDecoder errorDecoder = getInheritedAwareOptional(context,
-				ErrorDecoder.class);
+		ErrorDecoder errorDecoder = getInheritedAwareOptional(context, ErrorDecoder.class);
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
 		else {
-			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
-					FeignErrorDecoderFactory.class);
+			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context, FeignErrorDecoderFactory.class);
 			if (errorDecoderFactory != null) {
 				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(type);
 				builder.errorDecoder(factoryErrorDecoder);
 			}
 		}
-		Request.Options options = getInheritedAwareOptional(context,
-				Request.Options.class);
+		Request.Options options = getInheritedAwareOptional(context, Request.Options.class);
 		if (options != null) {
 			builder.options(options);
 			readTimeoutMillis = options.readTimeoutMillis();
 			connectTimeoutMillis = options.connectTimeoutMillis();
-			followRedirects = options.isFollowRedirects();
 		}
-		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(
-				context, RequestInterceptor.class);
+		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(context,
+				RequestInterceptor.class);
 		if (requestInterceptors != null) {
-			List<RequestInterceptor> interceptors = new ArrayList<>(
-					requestInterceptors.values());
+			List<RequestInterceptor> interceptors = new ArrayList<>(requestInterceptors.values());
 			AnnotationAwareOrderComparator.sort(interceptors);
 			builder.requestInterceptors(interceptors);
 		}
-		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context,
-				QueryMapEncoder.class);
+		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context, QueryMapEncoder.class);
 		if (queryMapEncoder != null) {
 			builder.queryMapEncoder(queryMapEncoder);
 		}
 		if (decode404) {
 			builder.decode404();
 		}
-		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(
-				context, ExceptionPropagationPolicy.class);
+		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(context,
+				ExceptionPropagationPolicy.class);
 		if (exceptionPropagationPolicy != null) {
 			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
 		}
 	}

-	protected void configureUsingProperties(
-			FeignClientProperties.FeignClientConfiguration config,
+	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config,
 			Feign.Builder builder) {
 		if (config == null) {
 			return;
@@ -239,15 +204,11 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			builder.logLevel(config.getLoggerLevel());
 		}

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

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

 		if (config.getRetryer() != null) {
 			Retryer retryer = getOrInstantiate(config.getRetryer());
@@ -259,8 +220,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			builder.errorDecoder(errorDecoder);
 		}

-		if (config.getRequestInterceptors() != null
-				&& !config.getRequestInterceptors().isEmpty()) {
+		if (config.getRequestInterceptors() != null && !config.getRequestInterceptors().isEmpty()) {
 			// this will add request interceptor to builder, not replace existing
 			for (Class<RequestInterceptor> bean : config.getRequestInterceptors()) {
 				RequestInterceptor interceptor = getOrInstantiate(bean);
@@ -279,13 +239,11 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}

 		if (Objects.nonNull(config.getDefaultRequestHeaders())) {
-			builder.requestInterceptor(requestTemplate -> requestTemplate
-					.headers(config.getDefaultRequestHeaders()));
+			builder.requestInterceptor(requestTemplate -> requestTemplate.headers(config.getDefaultRequestHeaders()));
 		}

 		if (Objects.nonNull(config.getDefaultQueryParameters())) {
-			builder.requestInterceptor(requestTemplate -> requestTemplate
-					.queries(config.getDefaultQueryParameters()));
+			builder.requestInterceptor(requestTemplate -> requestTemplate.queries(config.getDefaultQueryParameters()));
 		}

 		if (Objects.nonNull(config.getDecoder())) {
@@ -303,8 +261,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing

 	private <T> T getOrInstantiate(Class<T> tClass) {
 		try {
-			return beanFactory != null ? beanFactory.getBean(tClass)
-					: applicationContext.getBean(tClass);
+			return applicationContext.getBean(tClass);
 		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
@@ -314,8 +271,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	protected <T> T get(FeignContext context, Class<T> type) {
 		T instance = context.getInstance(contextId, type);
 		if (instance == null) {
-			throw new IllegalStateException(
-					"No bean found of type " + type + " for " + contextId);
+			throw new IllegalStateException("No bean found of type " + type + " for " + contextId);
 		}
 		return instance;
 	}
@@ -333,8 +289,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}
 	}

-	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context,
-			Class<T> type) {
+	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context, Class<T> type) {
 		if (inheritParentContext) {
 			return context.getInstances(contextId, type);
 		}
@@ -343,8 +298,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}
 	}

-	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
-			HardCodedTarget<T> target) {
+	protected <T> T loadBalance(Feign.Builder builder, FeignContext context, HardCodedTarget<T> target) {
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
 			builder.client(client);
@@ -353,7 +307,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}

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

 	@Override
@@ -367,17 +321,10 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = beanFactory != null
-				? beanFactory.getBean(FeignContext.class)
-				: applicationContext.getBean(FeignContext.class);
+		FeignContext context = applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);

 		if (!StringUtils.hasText(url)) {
-
-			if (LOG.isInfoEnabled()) {
-				LOG.info("For '" + name
-						+ "' URL not provided. Will try picking an instance via load-balancing.");
-			}
 			if (!name.startsWith("http")) {
 				url = "http://" + name;
 			}
@@ -385,8 +332,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 				url = name;
 			}
 			url += cleanPath();
-			return (T) loadBalance(builder, context,
-					new HardCodedTarget<>(type, name, url));
+			return (T) loadBalance(builder, context, new HardCodedTarget<>(type, name, url));
 		}
 		if (StringUtils.hasText(url) && !url.startsWith("http")) {
 			url = "http://" + url;
@@ -394,27 +340,15 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
-			if (client instanceof LoadBalancerFeignClient) {
-				// not load balancing because we have a url,
-				// but ribbon is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient) client).getDelegate();
-			}
 			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
 				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
 			}
-			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);
-		return (T) targeter.target(this, builder, context,
-				new HardCodedTarget<>(type, name, url));
+		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(type, name, url));
 	}

 	private String cleanPath() {
@@ -496,18 +430,13 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		this.inheritParentContext = inheritParentContext;
 	}

-	public void addCustomizer(FeignBuilderCustomizer customizer) {
-		additionalCustomizers.add(customizer);
-	}
-
 	public ApplicationContext getApplicationContext() {
 		return applicationContext;
 	}

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

 	public Class<?> getFallback() {
@@ -535,46 +464,26 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			return false;
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		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(connectTimeoutMillis, that.connectTimeoutMillis)
-				&& Objects.equals(readTimeoutMillis, that.readTimeoutMillis)
-				&& Objects.equals(followRedirects, that.followRedirects);
+		return Objects.equals(applicationContext, that.applicationContext) && 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);
 	}

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

 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type)
-				.append(", ").append("name='").append(name).append("', ").append("url='")
-				.append(url).append("', ").append("path='").append(path).append("', ")
-				.append("decode404=").append(decode404).append(", ")
-				.append("inheritParentContext=").append(inheritParentContext).append(", ")
-				.append("applicationContext=").append(applicationContext).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;
+		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type).append(", ").append("name='")
+				.append(name).append("', ").append("url='").append(url).append("', ").append("path='").append(path)
+				.append("', ").append("decode404=").append(decode404).append(", ").append("inheritParentContext=")
+				.append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext)
+				.append(", ").append("fallback=").append(fallback).append(", ").append("fallbackFactory=")
+				.append(fallbackFactory).append("}").toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * @author Eko Kurniawan Khannedy
 * @author Ilia Ilinykh
 * @author Ram Anaswara
- * @author Olga Maciaszek-Sharma
 */
@ConfigurationProperties("feign.client")
 public class FeignClientProperties {
@@ -95,10 +94,8 @@ public class FeignClientProperties {
 			return false;
 		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties
-				&& Objects.equals(defaultConfig, that.defaultConfig)
-				&& Objects.equals(config, that.config)
-				&& Objects.equals(decodeSlash, that.decodeSlash);
+		return defaultToProperties == that.defaultToProperties && Objects.equals(defaultConfig, that.defaultConfig)
+				&& Objects.equals(config, that.config) && Objects.equals(decodeSlash, that.decodeSlash);
 	}

 	@Override
@@ -137,8 +134,6 @@ public class FeignClientProperties {

 		private ExceptionPropagationPolicy exceptionPropagationPolicy;

-		private Boolean followRedirects;
-
 		public Logger.Level getLoggerLevel() {
 			return loggerLevel;
 		}
@@ -183,8 +178,7 @@ public class FeignClientProperties {
 			return requestInterceptors;
 		}

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

@@ -192,8 +186,7 @@ public class FeignClientProperties {
 			return defaultRequestHeaders;
 		}

-		public void setDefaultRequestHeaders(
-				Map<String, Collection<String>> defaultRequestHeaders) {
+		public void setDefaultRequestHeaders(Map<String, Collection<String>> defaultRequestHeaders) {
 			this.defaultRequestHeaders = defaultRequestHeaders;
 		}

@@ -201,8 +194,7 @@ public class FeignClientProperties {
 			return defaultQueryParameters;
 		}

-		public void setDefaultQueryParameters(
-				Map<String, Collection<String>> defaultQueryParameters) {
+		public void setDefaultQueryParameters(Map<String, Collection<String>> defaultQueryParameters) {
 			this.defaultQueryParameters = defaultQueryParameters;
 		}

@@ -242,19 +234,10 @@ public class FeignClientProperties {
 			return exceptionPropagationPolicy;
 		}

-		public void setExceptionPropagationPolicy(
-				ExceptionPropagationPolicy exceptionPropagationPolicy) {
+		public void setExceptionPropagationPolicy(ExceptionPropagationPolicy exceptionPropagationPolicy) {
 			this.exceptionPropagationPolicy = exceptionPropagationPolicy;
 		}

-		public Boolean isFollowRedirects() {
-			return followRedirects;
-		}
-
-		public void setFollowRedirects(Boolean followRedirects) {
-			this.followRedirects = followRedirects;
-		}
-
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -264,29 +247,22 @@ public class FeignClientProperties {
 				return false;
 			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel
-					&& Objects.equals(connectTimeout, that.connectTimeout)
-					&& Objects.equals(readTimeout, that.readTimeout)
-					&& Objects.equals(retryer, that.retryer)
+			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(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(followRedirects, that.followRedirects);
+					&& Objects.equals(defaultQueryParameters, that.defaultQueryParameters);
 		}

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

 	}
@@ -64,8 +64,7 @@ class FeignClientSpecification implements NamedContextFactory.Specification {
 			return false;
 		}
 		FeignClientSpecification that = (FeignClientSpecification) o;
-		return Objects.equals(this.name, that.name)
-				&& Arrays.equals(this.configuration, that.configuration);
+		return Objects.equals(this.name, that.name) && Arrays.equals(this.configuration, that.configuration);
 	}

 	@Override
@@ -75,9 +74,8 @@ class FeignClientSpecification implements NamedContextFactory.Specification {

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

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,37 +19,31 @@ package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.List;

-import com.netflix.hystrix.HystrixCommand;
+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.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;

 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.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.FeignEncoderProperties;
+import org.springframework.cloud.openfeign.support.PageJacksonModule;
 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;
@@ -66,8 +60,6 @@ import static feign.form.ContentType.MULTIPART;
 * @author Dave Syer
 * @author Venil Noronha
 * @author Darren Foong
- * @author Olga Maciaszek-Sharma
- * @author Hyeonmin Park
 */
@Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
@@ -90,56 +82,38 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private FeignClientProperties feignClientProperties;

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

 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
 	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
-		return springEncoder(formWriterProvider, encoderProperties);
+		return springEncoder(formWriterProvider);
 	}

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

 		if (springDataWebProperties != null) {
-			encoder.setPageParameter(
-					springDataWebProperties.getPageable().getPageParameter());
-			encoder.setSizeParameter(
-					springDataWebProperties.getPageable().getSizeParameter());
-			encoder.setSortParameter(
-					springDataWebProperties.getSort().getSortParameter());
+			encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
+			encoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter());
+			encoder.setSortParameter(springDataWebProperties.getSort().getSortParameter());
 		}
 		return encoder;
 	}

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

 	@Bean
@@ -170,6 +144,18 @@ public class FeignClientsConfiguration {
 		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() {
@@ -177,66 +163,26 @@ public class FeignClientsConfiguration {
 		};
 	}

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

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

-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
-	protected static class HystrixFeignConfiguration {
-
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		@ConditionalOnProperty(name = "feign.hystrix.enabled")
-		public Feign.Builder feignHystrixBuilder() {
-			return HystrixFeign.builder();
-		}
-
-	}
-
 	private class SpringPojoFormEncoder extends SpringFormEncoder {

 		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
 			super();

-			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(
-					MULTIPART);
+			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(MULTIPART);
 			processor.addFirstWriter(formWriter);
 		}

 	}

-	@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();
-		}
-
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,12 +20,8 @@ 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;

@@ -34,9 +30,6 @@ 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;
@@ -52,7 +45,6 @@ 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;

 /**
@@ -61,11 +53,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 {
+class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {

 	// patterned after Spring Integration IntegrationComponentScanRegistrar
 	// and RibbonClientsConfigurationRegistgrar
@@ -78,8 +67,7 @@ class FeignClientsRegistrar
 	}

 	static void validateFallback(final Class clazz) {
-		Assert.isTrue(!clazz.isInterface(),
-				"Fallback class must implement the interface annotated by @FeignClient");
+		Assert.isTrue(!clazz.isInterface(), "Fallback class must implement the interface annotated by @FeignClient");
 	}

 	static void validateFallbackFactory(final Class clazz) {
@@ -144,16 +132,13 @@ class FeignClientsRegistrar
 	}

 	@Override
-	public void registerBeanDefinitions(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
+	public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
 		registerDefaultConfiguration(metadata, registry);
 		registerFeignClients(metadata, registry);
 	}

-	private void registerDefaultConfiguration(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
-		Map<String, Object> defaultAttrs = metadata
-				.getAnnotationAttributes(EnableFeignClients.class.getName(), true);
+	private void registerDefaultConfiguration(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
+		Map<String, Object> defaultAttrs = metadata.getAnnotationAttributes(EnableFeignClients.class.getName(), true);

 		if (defaultAttrs != null && defaultAttrs.containsKey("defaultConfiguration")) {
 			String name;
@@ -163,19 +148,16 @@ class FeignClientsRegistrar
 			else {
 				name = "default." + metadata.getClassName();
 			}
-			registerClientConfiguration(registry, name,
-					defaultAttrs.get("defaultConfiguration"));
+			registerClientConfiguration(registry, name, defaultAttrs.get("defaultConfiguration"));
 		}
 	}

-	public void registerFeignClients(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
+	public void registerFeignClients(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {

 		LinkedHashSet<BeanDefinition> candidateComponents = new LinkedHashSet<>();
-		Map<String, Object> attrs = metadata
-				.getAnnotationAttributes(EnableFeignClients.class.getName());
-		final Class<?>[] clients = attrs == null ? null
-				: (Class<?>[]) attrs.get("clients");
+		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();
 			scanner.setResourceLoader(this.resourceLoader);
@@ -196,75 +178,51 @@ class FeignClientsRegistrar
 				// verify annotated class is an interface
 				AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
 				AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
-				Assert.isTrue(annotationMetadata.isInterface(),
-						"@FeignClient can only be specified on an interface");
+				Assert.isTrue(annotationMetadata.isInterface(), "@FeignClient can only be specified on an interface");

 				Map<String, Object> attributes = annotationMetadata
 						.getAnnotationAttributes(FeignClient.class.getCanonicalName());

 				String name = getClientName(attributes);
-				registerClientConfiguration(registry, name,
-						attributes.get("configuration"));
+				registerClientConfiguration(registry, name, attributes.get("configuration"));

 				registerFeignClient(registry, annotationMetadata, attributes);
 			}
 		}
 	}

-	private void registerFeignClient(BeanDefinitionRegistry registry,
-			AnnotationMetadata annotationMetadata, Map<String, Object> attributes) {
+	private void registerFeignClient(BeanDefinitionRegistry registry, AnnotationMetadata annotationMetadata,
+			Map<String, Object> attributes) {
 		String className = annotationMetadata.getClassName();
-		Class clazz = ClassUtils.resolveClassName(className, null);
-		ConfigurableBeanFactory beanFactory = registry instanceof ConfigurableBeanFactory
-				? (ConfigurableBeanFactory) registry : null;
-		String contextId = getContextId(beanFactory, attributes);
-		String name = getName(attributes);
-		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);
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(FeignClientFactoryBean.class);
 		validate(attributes);
+		definition.addPropertyValue("url", getUrl(attributes));
+		definition.addPropertyValue("path", getPath(attributes));
+		String name = getName(attributes);
+		definition.addPropertyValue("name", name);
+		String contextId = getContextId(attributes);
+		definition.addPropertyValue("contextId", contextId);
+		definition.addPropertyValue("type", className);
+		definition.addPropertyValue("decode404", attributes.get("decode404"));
+		definition.addPropertyValue("fallback", attributes.get("fallback"));
+		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
+		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);

+		String alias = 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[] qualifiers = getQualifiers(attributes);
-		if (ObjectUtils.isEmpty(qualifiers)) {
-			qualifiers = new String[] { contextId + "FeignClient" };
+		String qualifier = getQualifier(attributes);
+		if (StringUtils.hasText(qualifier)) {
+			alias = qualifier;
 		}

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

@@ -277,10 +235,6 @@ class FeignClientsRegistrar
 	}

 	/* 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");
@@ -288,54 +242,41 @@ class FeignClientsRegistrar
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("value");
 		}
-		name = resolve(beanFactory, name);
+		name = resolve(name);
 		return getName(name);
 	}

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

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

-	private String resolve(ConfigurableBeanFactory beanFactory, String value) {
+	private String resolve(String value) {
 		if (StringUtils.hasText(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 this.environment.resolvePlaceholders(value);
 		}
 		return value;
 	}

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

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

 	protected ClassPathScanningCandidateComponentProvider getScanner() {
 		return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
 			@Override
-			protected boolean isCandidateComponent(
-					AnnotatedBeanDefinition beanDefinition) {
+			protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
 				boolean isCandidate = false;
 				if (beanDefinition.getMetadata().isIndependent()) {
 					if (!beanDefinition.getMetadata().isAnnotation()) {
@@ -367,8 +308,7 @@ class FeignClientsRegistrar
 		}

 		if (basePackages.isEmpty()) {
-			basePackages.add(
-					ClassUtils.getPackageName(importingClassMetadata.getClassName()));
+			basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
 		}
 		return basePackages;
 	}
@@ -384,19 +324,6 @@ class FeignClientsRegistrar
 		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;
@@ -415,18 +342,15 @@ class FeignClientsRegistrar
 			return value;
 		}

-		throw new IllegalStateException("Either 'name' or 'value' must be provided in @"
-				+ FeignClient.class.getSimpleName());
+		throw new IllegalStateException(
+				"Either 'name' or 'value' must be provided in @" + FeignClient.class.getSimpleName());
 	}

-	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name,
-			Object configuration) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(FeignClientSpecification.class);
+	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, Object configuration) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FeignClientSpecification.class);
 		builder.addConstructorArgValue(name);
 		builder.addConstructorArgValue(configuration);
-		registry.registerBeanDefinition(
-				name + "." + FeignClientSpecification.class.getSimpleName(),
+		registry.registerBeanDefinition(name + "." + FeignClientSpecification.class.getSimpleName(),
 				builder.getBeanDefinition());
 	}

@@ -1,43 +0,0 @@
-/*
- * 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 {
-
-	}
-
-}
@@ -1,42 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Tim Peeters
- */
-class HystrixDisabledConditions extends AnyNestedCondition {
-
-	HystrixDisabledConditions() {
-		super(ConfigurationPhase.PARSE_CONFIGURATION);
-	}
-
-	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
-	static class HystrixFeignClassMissing {
-
-	}
-
-	@ConditionalOnProperty(value = "feign.hystrix.enabled", havingValue = "false")
-	static class HystrixFeignDisabled {
-
-	}
-
-}
@@ -1,101 +0,0 @@
-/*
- * 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 feign.hystrix.FallbackFactory;
-import feign.hystrix.HystrixFeign;
-import feign.hystrix.SetterFactory;
-
-import org.springframework.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- * @author Erik Kringen
- */
-@SuppressWarnings("unchecked")
-class HystrixTargeter implements Targeter {
-
-	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
-			FeignContext context, Target.HardCodedTarget<T> target) {
-		if (!(feign instanceof feign.hystrix.HystrixFeign.Builder)) {
-			return feign.target(target);
-		}
-		feign.hystrix.HystrixFeign.Builder builder = (feign.hystrix.HystrixFeign.Builder) feign;
-		String name = StringUtils.isEmpty(factory.getContextId()) ? factory.getName()
-				: factory.getContextId();
-		SetterFactory setterFactory = getOptional(name, context, SetterFactory.class);
-		if (setterFactory != null) {
-			builder.setterFactory(setterFactory);
-		}
-		Class<?> fallback = factory.getFallback();
-		if (fallback != void.class) {
-			return targetWithFallback(name, context, target, builder, fallback);
-		}
-		Class<?> fallbackFactory = factory.getFallbackFactory();
-		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(name, context, target, builder,
-					fallbackFactory);
-		}
-
-		return feign.target(target);
-	}
-
-	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
-			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
-			Class<?> fallbackFactoryClass) {
-		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext(
-				"fallbackFactory", feignClientName, context, fallbackFactoryClass,
-				FallbackFactory.class);
-		return builder.target(target, fallbackFactory);
-	}
-
-	private <T> T targetWithFallback(String feignClientName, FeignContext context,
-			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
-			Class<?> fallback) {
-		T fallbackInstance = getFromContext("fallback", feignClientName, context,
-				fallback, target.type());
-		return builder.target(target, fallbackInstance);
-	}
-
-	private <T> T getFromContext(String fallbackMechanism, String feignClientName,
-			FeignContext context, Class<?> beanType, Class<T> targetType) {
-		Object fallbackInstance = context.getInstance(feignClientName, beanType);
-		if (fallbackInstance == null) {
-			throw new IllegalStateException(String.format(
-					"No " + fallbackMechanism
-							+ " instance of type %s found for feign client %s",
-					beanType, feignClientName));
-		}
-
-		if (!targetType.isAssignableFrom(beanType)) {
-			throw new IllegalStateException(String.format("Incompatible "
-					+ fallbackMechanism
-					+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
-					beanType, targetType, feignClientName));
-		}
-		return (T) fallbackInstance;
-	}
-
-	private <T> T getOptional(String feignClientName, FeignContext context,
-			Class<T> beanType) {
-		return context.getInstance(feignClientName, beanType);
-	}
-
-}
@@ -22,9 +22,9 @@ import feign.Target;
 /**
 * @author Spencer Gibb
 */
-interface Targeter {
+public interface Targeter {

-	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
-			FeignContext context, Target.HardCodedTarget<T> target);
+	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
+			Target.HardCodedTarget<T> target);

 }
@@ -48,15 +48,13 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 	}

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

-		checkState(emptyToNull(name) != null,
-				"MatrixVariable annotation was empty on param %s.",
+		checkState(emptyToNull(name) != null, "MatrixVariable annotation was empty on param %s.",
 				context.getParameterIndex());

 		context.setParameterName(name);
@@ -65,8 +63,7 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 			data.indexToExpander().put(parameterIndex, this::expandMap);
 		}
 		else {
-			data.indexToExpander().put(parameterIndex,
-					object -> ";" + name + "=" + object.toString());
+			data.indexToExpander().put(parameterIndex, object -> ";" + name + "=" + object.toString());
 		}

 		return true;
@@ -75,8 +72,7 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 	private String expandMap(Object object) {
 		Map<String, Object> paramMap = (Map) object;

-		return paramMap.keySet().stream().filter(key -> paramMap.get(key) != null)
-				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
+		return paramMap.keySet().stream().map(key -> ";" + key + "=" + paramMap.get(key).toString())
 				.collect(Collectors.joining());
 	}

@@ -46,18 +46,15 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 	}

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

 		MethodMetadata data = context.getMethodMetadata();
 		String varName = '{' + name + '}';
-		if (!data.template().url().contains(varName)
-				&& !searchMapValues(data.template().queries(), varName)
+		if (!data.template().url().contains(varName) && !searchMapValues(data.template().queries(), varName)
 				&& !searchMapValues(data.template().headers(), varName)) {
 			data.formParams().add(name);
 		}
@@ -40,8 +40,7 @@ public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
 	}

 	@Override
-	public boolean processArgument(AnnotatedParameterContext context,
-			Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int paramIndex = context.getParameterIndex();
 		MethodMetadata metadata = context.getMethodMetadata();
 		if (metadata.queryMapIndex() == null) {
@@ -46,27 +46,23 @@ public class RequestHeaderParameterProcessor implements AnnotatedParameterProces
 	}

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

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

 			return true;
 		}

 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
-				"RequestHeader.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null, "RequestHeader.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);

-		Collection<String> header = context.setTemplateParameter(name,
-				data.template().headers().get(name));
+		Collection<String> header = context.setTemplateParameter(name, data.template().headers().get(name));
 		data.template().header(name, header);
 		return true;
 	}
@@ -46,15 +46,13 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 	}

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

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

 			return true;
@@ -62,12 +60,10 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess

 		RequestParam requestParam = ANNOTATION.cast(annotation);
 		String name = requestParam.value();
-		checkState(emptyToNull(name) != null,
-				"RequestParam.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null, "RequestParam.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);

-		Collection<String> query = context.setTemplateParameter(name,
-				data.template().queries().get(name));
+		Collection<String> query = context.setTemplateParameter(name, data.template().queries().get(name));
 		data.template().query(name, query);
 		return true;
 	}
@@ -44,19 +44,16 @@ public class RequestPartParameterProcessor implements AnnotatedParameterProcesso
 	}

 	@Override
-	public boolean processArgument(AnnotatedParameterContext context,
-			Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		MethodMetadata data = context.getMethodMetadata();

 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
-				"RequestPart.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null, "RequestPart.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);

 		data.formParams().add(name);
-		Collection<String> names = context.setTemplateParameter(name,
-				data.indexToName().get(parameterIndex));
+		Collection<String> names = context.setTemplateParameter(name, data.indexToName().get(parameterIndex));
 		data.indexToName().put(parameterIndex, names);
 		return true;
 	}
@@ -1,162 +0,0 @@
-/*
- * 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;
-		}
-
-	}
-
-}
@@ -53,8 +53,8 @@ public class HttpClientFeignConfiguration {

 	private static final Log LOG = LogFactory.getLog(HttpClientFeignConfiguration.class);

-	private final Timer connectionManagerTimer = new Timer(
-			"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
+	private final Timer connectionManagerTimer = new Timer("FeignApacheHttpClientConfiguration.connectionManagerTimer",
+			true);

 	private CloseableHttpClient httpClient;

@@ -66,12 +66,10 @@ public class HttpClientFeignConfiguration {
 	public HttpClientConnectionManager connectionManager(
 			ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 			FeignHttpClientProperties httpClientProperties) {
-		final HttpClientConnectionManager connectionManager = connectionManagerFactory
-				.newConnectionManager(httpClientProperties.isDisableSslValidation(),
-						httpClientProperties.getMaxConnections(),
-						httpClientProperties.getMaxConnectionsPerRoute(),
-						httpClientProperties.getTimeToLive(),
-						httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
+		final HttpClientConnectionManager connectionManager = connectionManagerFactory.newConnectionManager(
+				httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
+				httpClientProperties.getMaxConnectionsPerRoute(), httpClientProperties.getTimeToLive(),
+				httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
 		this.connectionManagerTimer.schedule(new TimerTask() {
 			@Override
 			public void run() {
@@ -82,37 +80,29 @@ public class HttpClientFeignConfiguration {
 	}

 	@Bean
-	@ConditionalOnProperty(value = "feign.compression.response.enabled",
-			havingValue = "true")
-	public CloseableHttpClient customHttpClient(
-			HttpClientConnectionManager httpClientConnectionManager,
+	@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
+	public CloseableHttpClient customHttpClient(HttpClientConnectionManager httpClientConnectionManager,
 			FeignHttpClientProperties httpClientProperties) {
-		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement()
-				.useSystemProperties();
-		this.httpClient = createClient(builder, httpClientConnectionManager,
-				httpClientProperties);
+		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement().useSystemProperties();
+		this.httpClient = createClient(builder, httpClientConnectionManager, httpClientProperties);
 		return this.httpClient;
 	}

 	@Bean
-	@ConditionalOnProperty(value = "feign.compression.response.enabled",
-			havingValue = "false", matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
 	public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
-			HttpClientConnectionManager httpClientConnectionManager,
-			FeignHttpClientProperties httpClientProperties) {
-		this.httpClient = createClient(httpClientFactory.createBuilder(),
-				httpClientConnectionManager, httpClientProperties);
+			HttpClientConnectionManager httpClientConnectionManager, FeignHttpClientProperties httpClientProperties) {
+		this.httpClient = createClient(httpClientFactory.createBuilder(), httpClientConnectionManager,
+				httpClientProperties);
 		return this.httpClient;
 	}

 	private CloseableHttpClient createClient(HttpClientBuilder builder,
-			HttpClientConnectionManager httpClientConnectionManager,
-			FeignHttpClientProperties httpClientProperties) {
+			HttpClientConnectionManager httpClientConnectionManager, FeignHttpClientProperties httpClientProperties) {
 		RequestConfig defaultRequestConfig = RequestConfig.custom()
 				.setConnectTimeout(httpClientProperties.getConnectionTimeout())
 				.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
-		CloseableHttpClient httpClient = builder
-				.setDefaultRequestConfig(defaultRequestConfig)
+		CloseableHttpClient httpClient = builder.setDefaultRequestConfig(defaultRequestConfig)
 				.setConnectionManager(httpClientConnectionManager).build();
 		return httpClient;
 	}
@@ -46,8 +46,7 @@ public class OkHttpFeignConfiguration {

 	@Bean
 	@ConditionalOnMissingBean(ConnectionPool.class)
-	public ConnectionPool httpClientConnectionPool(
-			FeignHttpClientProperties httpClientProperties,
+	public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
 		Integer maxTotalConnections = httpClientProperties.getMaxConnections();
 		Long timeToLive = httpClientProperties.getTimeToLive();
@@ -56,15 +55,13 @@ public class OkHttpFeignConfiguration {
 	}

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

@@ -48,8 +48,7 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	 * @param name the header name
 	 * @param values the header values
 	 */
-	protected void addHeader(RequestTemplate requestTemplate, String name,
-			String... values) {
+	protected void addHeader(RequestTemplate requestTemplate, String name, String... values) {

 		if (!requestTemplate.headers().containsKey(name)) {
 			requestTemplate.header(name, values);
@@ -39,8 +39,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled",
-		matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@@ -33,8 +33,7 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 	 * Creates new instance of {@link FeignAcceptGzipEncodingInterceptor}.
 	 * @param properties the encoding properties
 	 */
-	protected FeignAcceptGzipEncodingInterceptor(
-			FeignClientEncodingProperties properties) {
+	protected FeignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
 		super(properties);
 	}

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

-		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER,
-				HttpEncoding.GZIP_ENCODING, HttpEncoding.DEFLATE_ENCODING);
+		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
+				HttpEncoding.DEFLATE_ENCODING);
 	}

 }
@@ -32,8 +32,7 @@ public class FeignClientEncodingProperties {
 	/**
 	 * The list of supported mime types.
 	 */
-	private String[] mimeTypes = new String[] { "text/xml", "application/xml",
-			"application/json" };
+	private String[] mimeTypes = new String[] { "text/xml", "application/xml", "application/json" };

 	/**
 	 * The minimum threshold content size.
@@ -77,9 +76,8 @@ public class FeignClientEncodingProperties {
 	@Override
 	public String toString() {
 		return new StringBuilder("FeignClientEncodingProperties{").append("mimeTypes=")
-				.append(Arrays.toString(this.mimeTypes)).append(", ")
-				.append("minRequestSize=").append(this.minRequestSize).append("}")
-				.toString();
+				.append(Arrays.toString(this.mimeTypes)).append(", ").append("minRequestSize=")
+				.append(this.minRequestSize).append("}").toString();
 	}

 }
@@ -33,8 +33,7 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	 * Creates new instance of {@link FeignContentGzipEncodingInterceptor}.
 	 * @param properties the encoding properties
 	 */
-	protected FeignContentGzipEncodingInterceptor(
-			FeignClientEncodingProperties properties) {
+	protected FeignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
 		super(properties);
 	}

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

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

@@ -93,8 +92,7 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			return false;
 		}

-		if (getProperties().getMimeTypes() == null
-				|| getProperties().getMimeTypes().length == 0) {
+		if (getProperties().getMimeTypes() == null || getProperties().getMimeTypes().length == 0) {
 			// no specific mime types has been set - matching everything
 			return true;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,50 +16,75 @@

 package org.springframework.cloud.openfeign.hateoas;

+import java.util.Arrays;
 import java.util.Collections;

+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.hateoas.RepresentationModel;
-import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.server.LinkRelationProvider;
 import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;

 import static org.springframework.hateoas.MediaTypes.HAL_JSON;

 /**
 * @author Hector Espert
- * @author Olga Maciaszek-Sharma
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnWebApplication
@ConditionalOnClass(RepresentationModel.class)
-@AutoConfigureAfter({ JacksonAutoConfiguration.class,
-		HttpMessageConvertersAutoConfiguration.class,
+@AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
 		RepositoryRestMvcAutoConfiguration.class })
+@AutoConfigureBefore(HypermediaAutoConfiguration.class)
 public class FeignHalAutoConfiguration {

 	@Bean
-	@ConditionalOnBean(HalMediaTypeConfiguration.class)
 	@ConditionalOnMissingBean
 	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
-			ObjectProvider<ObjectMapper> objectMapper,
-			HalMediaTypeConfiguration halConfiguration) {
+			ObjectProvider<ObjectMapper> objectMapper, ObjectProvider<HalConfiguration> halConfiguration,
+			ObjectProvider<MessageResolver> messageResolver, ObjectProvider<CurieProvider> curieProvider,
+			ObjectProvider<LinkRelationProvider> linkRelationProvider) {
+
 		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
-		halConfiguration.configureObjectMapper(mapper);
+		mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+
+		HalConfiguration configuration = halConfiguration.getIfAvailable(HalConfiguration::new);
+
+		CurieProvider curieProviderInstance = curieProvider
+				.getIfAvailable(() -> new DefaultCurieProvider(Collections.emptyMap()));
+
+		Jackson2HalModule.HalHandlerInstantiator halHandlerInstantiator = new Jackson2HalModule.HalHandlerInstantiator(
+				linkRelationProvider.getIfAvailable(), curieProviderInstance, messageResolver.getIfAvailable(),
+				configuration);
+
+		mapper.setHandlerInstantiator(halHandlerInstantiator);
+
+		if (!Jackson2HalModule.isAlreadyRegisteredIn(mapper)) {
+			Jackson2HalModule halModule = new Jackson2HalModule();
+			mapper.registerModule(halModule);
+		}
+
 		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
 				RepresentationModel.class);
-		converter.setSupportedMediaTypes(Collections.singletonList(HAL_JSON));
+		converter.setSupportedMediaTypes(Arrays.asList(HAL_JSON));
 		converter.setObjectMapper(mapper);
 		return converter;
 	}
@@ -16,51 +16,52 @@

 package org.springframework.cloud.openfeign.loadbalancer;

-import java.util.List;
-
 import feign.Client;

 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+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;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;

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

 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
-		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
-				loadBalancerClient);
+	public Client feignClient(LoadBalancerClient loadBalancerClient, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
+		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), 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(BlockingLoadBalancerClient loadBalancerClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
-		return new RetryableFeignBlockingLoadBalancerClient(
-				new Client.Default(null, null), loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
+			matchIfMissing = true)
+	public Client feignRetryClient(LoadBalancerClient loadBalancerClient,
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
+		return new RetryableFeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
+				loadBalancedRetryFactory, properties, loadBalancerClientFactory);
 	}

 }
@@ -19,6 +19,7 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.Set;

 import feign.Client;
 import feign.Request;
@@ -27,58 +28,86 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.CompletionContext;
+import org.springframework.cloud.client.loadbalancer.DefaultRequest;
+import org.springframework.cloud.client.loadbalancer.DefaultResponse;
+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.RequestDataContext;
+import org.springframework.cloud.client.loadbalancer.ResponseData;
+import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;

+import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.buildRequestData;
+import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing;
+
 /**
- * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} to select
- * a {@link ServiceInstance} to use while resolving the request host.
+ * A {@link Client} implementation that uses {@link LoadBalancerClient} to select a
+ * {@link ServiceInstance} to use while resolving the request host.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
 */
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class FeignBlockingLoadBalancerClient implements Client {

-	private static final Log LOG = LogFactory
-			.getLog(FeignBlockingLoadBalancerClient.class);
+	private static final Log LOG = LogFactory.getLog(FeignBlockingLoadBalancerClient.class);

 	private final Client delegate;

-	private final BlockingLoadBalancerClient loadBalancerClient;
+	private final LoadBalancerClient loadBalancerClient;

-	public FeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient) {
+	private final LoadBalancerProperties properties;
+
+	private final LoadBalancerClientFactory loadBalancerClientFactory;
+
+	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
+		this.properties = properties;
+		this.loadBalancerClientFactory = loadBalancerClientFactory;
 	}

 	@Override
 	public Response execute(Request request, Request.Options options) throws IOException {
 		final URI originalUri = URI.create(request.url());
 		String serviceId = originalUri.getHost();
-		Assert.state(serviceId != null,
-				"Request URI does not contain a valid hostname: " + originalUri);
-		ServiceInstance instance = loadBalancerClient.choose(serviceId);
+		Assert.state(serviceId != null, "Request URI does not contain a valid hostname: " + originalUri);
+		String hint = getHint(serviceId);
+		DefaultRequest<RequestDataContext> lbRequest = new DefaultRequest<>(
+				new RequestDataContext(buildRequestData(request), hint));
+		Set<LoadBalancerLifecycle> supportedLifecycleProcessors = LoadBalancerLifecycleValidator
+				.getSupportedLifecycleProcessors(
+						loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.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(
+				instance);
 		if (instance == null) {
-			String message = "Load balancer does not contain an instance for the service "
-					+ serviceId;
+			String message = "Load balancer does not contain an instance for the service " + serviceId;
 			if (LOG.isWarnEnabled()) {
 				LOG.warn(message);
 			}
-			return Response.builder().request(request)
-					.status(HttpStatus.SERVICE_UNAVAILABLE.value())
+			supportedLifecycleProcessors
+					.forEach(lifecycle -> lifecycle.onComplete(new CompletionContext<ResponseData, ServiceInstance>(
+							CompletionContext.Status.DISCARD, lbResponse)));
+			return Response.builder().request(request).status(HttpStatus.SERVICE_UNAVAILABLE.value())
 					.body(message, StandardCharsets.UTF_8).build();
 		}
-		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
-				.toString();
+		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri).toString();
 		Request newRequest = buildRequest(request, reconstructedUrl);
-		return delegate.execute(newRequest, options);
+		return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbResponse,
+				supportedLifecycleProcessors);
 	}

 	protected Request buildRequest(Request request, String reconstructedUrl) {
-		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(),
-				request.body(), request.charset(), request.requestTemplate());
+		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
+				request.charset(), request.requestTemplate());
 	}

 	// Visible for Sleuth instrumentation
@@ -86,4 +115,10 @@ public class FeignBlockingLoadBalancerClient implements Client {
 		return delegate;
 	}

+	private String getHint(String serviceId) {
+		String defaultHint = properties.getHint().getOrDefault("default", "default");
+		String hintPropertyValue = properties.getHint().get(serviceId);
+		return hintPropertyValue != null ? hintPropertyValue : defaultHint;
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,40 +19,33 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Client;
 import feign.Feign;

-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

 /**
- * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
- * implementations of {@link Client}. In order to use this load-balancing mechanism, the
- * Ribbon-based implementation has to be disabled by setting
- * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
+ * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
+ * of {@link Client}.
 *
 * @author Olga Maciaszek-Sharma
- * @author Nguyen Ky Thanh
 * @since 2.2.0
 */
@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@AutoConfigureBefore(FeignAutoConfiguration.class)
-@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class)
@EnableConfigurationProperties(FeignHttpClientProperties.class)
@Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
 // see
 // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ HttpClientFeignLoadBalancerConfiguration.class,
-		OkHttpFeignLoadBalancerConfiguration.class,
-		HttpClient5FeignLoadBalancerConfiguration.class,
+@Import({ HttpClientFeignLoadBalancerConfiguration.class, OkHttpFeignLoadBalancerConfiguration.class,
 		DefaultFeignLoadBalancerConfiguration.class })
 public class FeignLoadBalancerAutoConfiguration {

@@ -1,75 +0,0 @@
-/*
- * 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 java.util.List;
-
-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.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-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;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-
-/**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link ApacheHttp5Client} under the hood.
- *
- * @author Nguyen Ky Thanh
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(ApacheHttp5Client.class)
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
-@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
-@Import(HttpClient5FeignConfiguration.class)
-class HttpClient5FeignLoadBalancerConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
-			HttpClient httpClient5) {
-		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
-	}
-
-	@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(BlockingLoadBalancerClient loadBalancerClient,
-			HttpClient httpClient5,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
-		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@

 package org.springframework.cloud.openfeign.loadbalancer;

-import java.util.List;
-
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import org.apache.http.client.HttpClient;
@@ -26,54 +24,53 @@ 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.cloud.openfeign.HttpClient5DisabledConditions;
+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.HttpClientFeignConfiguration;
 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.core.annotation.AnnotationAwareOrderComparator;

 /**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link ApacheHttpClient} under the hood.
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * 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(BlockingLoadBalancerClient.class)
+@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-@Conditional(HttpClient5DisabledConditions.class)
@Import(HttpClientFeignConfiguration.class)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class HttpClientFeignLoadBalancerConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
-			HttpClient httpClient) {
+	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+		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(BlockingLoadBalancerClient loadBalancerClient,
-			HttpClient httpClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
+			matchIfMissing = true)
+	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
+		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
+				properties, loadBalancerClientFactory);
 	}

 }
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.io.ByteArrayInputStream;
-import java.net.URI;
-
-import feign.Response;
-
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-
-/**
- * A {@link RetryableStatusCodeException} for {@link Response}s.
- *
- * @author Ryan Baxter
- */
-public class LoadBalancerResponseStatusCodeException
-		extends RetryableStatusCodeException {
-
-	private final Response response;
-
-	public LoadBalancerResponseStatusCodeException(String serviceId, Response response,
-			byte[] body, URI uri) {
-		super(serviceId, response.status(), response, uri);
-		this.response = Response.builder()
-				.body(new ByteArrayInputStream(body), body.length)
-				.headers(response.headers()).reason(response.reason())
-				.status(response.status()).request(response.request()).build();
-	}
-
-	@Override
-	public Response getResponse() {
-		return this.response;
-	}
-
-}
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Set;
+
+import feign.Client;
+import feign.Request;
+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
+ *
+ * A utility class for handling {@link LoadBalancerLifecycle} calls.
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+final class LoadBalancerUtils {
+
+	private LoadBalancerUtils() {
+		throw new IllegalStateException("Can't instantiate a utility class");
+	}
+
+	static Response executeWithLoadBalancerLifecycleProcessing(Client feignClient, Request.Options options,
+			Request feignRequest, org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
+			Set<LoadBalancerLifecycle> supportedLifecycleProcessors, boolean loadBalanced) throws IOException {
+		try {
+			Response response = feignClient.execute(feignRequest, options);
+			if (loadBalanced) {
+				supportedLifecycleProcessors.forEach(
+						lifecycle -> lifecycle.onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS,
+								lbResponse, buildResponseData(response))));
+			}
+			return response;
+		}
+		catch (Exception exception) {
+			if (loadBalanced) {
+				supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
+						.onComplete(new CompletionContext<>(CompletionContext.Status.FAILED, exception, 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,
+			Set<LoadBalancerLifecycle> supportedLifecycleProcessors) throws IOException {
+		return executeWithLoadBalancerLifecycleProcessing(feignClient, options, feignRequest, lbResponse,
+				supportedLifecycleProcessors, true);
+	}
+
+}
@@ -16,8 +16,6 @@

 package org.springframework.cloud.openfeign.loadbalancer;

-import java.util.List;
-
 import feign.Client;
 import feign.okhttp.OkHttpClient;

@@ -25,18 +23,20 @@ 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+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.OkHttpFeignConfiguration;
 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.core.annotation.AnnotationAwareOrderComparator;

 /**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link OkHttpClient} under the hood.
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * that uses {@link OkHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
@@ -44,32 +44,32 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty("feign.okhttp.enabled")
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@Import(OkHttpFeignConfiguration.class)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class OkHttpFeignLoadBalancerConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
-			BlockingLoadBalancerClient loadBalancerClient) {
+	public Client feignClient(okhttp3.OkHttpClient okHttpClient, LoadBalancerClient loadBalancerClient,
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+		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(BlockingLoadBalancerClient loadBalancerClient,
-			okhttp3.OkHttpClient okHttpClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
+			matchIfMissing = true)
+	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, okhttp3.OkHttpClient okHttpClient,
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
+		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
+				properties, loadBalancerClientFactory);
 	}

 }
@@ -47,8 +47,7 @@ public class OnRetryNotEnabledCondition extends AnyNestedCondition {

 	}

-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
-			havingValue = "false")
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "false")
 	static class OnLoadBalancerRetryEnabledCondition {

 	}
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;

 import feign.Client;
 import feign.Request;
@@ -31,12 +32,23 @@ import org.apache.commons.logging.Log;
 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.DefaultResponse;
 import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+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.RequestData;
+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.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
@@ -45,7 +57,9 @@ import org.springframework.retry.backoff.BackOffPolicy;
 import org.springframework.retry.backoff.NoBackOffPolicy;
 import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.StreamUtils;
+import org.springframework.util.Assert;
+
+import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing;

 /**
 * A {@link Client} implementation that provides Spring Retry support for requests
@@ -54,69 +68,100 @@ import org.springframework.util.StreamUtils;
 * @author Olga Maciaszek-Sharma
 * @since 2.2.6
 */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class RetryableFeignBlockingLoadBalancerClient implements Client {

-	private static final Log LOG = LogFactory
-			.getLog(FeignBlockingLoadBalancerClient.class);
+	private static final Log LOG = LogFactory.getLog(FeignBlockingLoadBalancerClient.class);

 	private final Client delegate;

-	private final BlockingLoadBalancerClient loadBalancerClient;
+	private final LoadBalancerClient loadBalancerClient;

 	private final LoadBalancedRetryFactory loadBalancedRetryFactory;

-	public RetryableFeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory) {
+	private final LoadBalancerProperties properties;
+
+	private final LoadBalancerClientFactory loadBalancerClientFactory;
+
+	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
+		this.properties = properties;
+		this.loadBalancerClientFactory = loadBalancerClientFactory;
 	}

 	@Override
 	public Response execute(Request request, Request.Options options) throws IOException {
 		final URI originalUri = URI.create(request.url());
 		String serviceId = originalUri.getHost();
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryFactory
-				.createRetryPolicy(serviceId, loadBalancerClient);
+		Assert.state(serviceId != null, "Request URI does not contain a valid hostname: " + originalUri);
+		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryFactory.createRetryPolicy(serviceId,
+				loadBalancerClient);
 		RetryTemplate retryTemplate = buildRetryTemplate(serviceId, request, retryPolicy);
 		return retryTemplate.execute(context -> {
 			Request feignRequest = null;
+			ServiceInstance retrievedServiceInstance = null;
+			Set<LoadBalancerLifecycle> supportedLifecycleProcessors = LoadBalancerLifecycleValidator
+					.getSupportedLifecycleProcessors(
+							loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.class),
+							RetryableRequestContext.class, RequestData.class, ServiceInstance.class);
 			// 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) {
-				ServiceInstance serviceInstance = ((LoadBalancedRetryContext) context)
-						.getServiceInstance();
-				if (serviceInstance != null) {
+				LoadBalancedRetryContext lbContext = (LoadBalancedRetryContext) context;
+				ServiceInstance serviceInstance = lbContext.getServiceInstance();
+				if (serviceInstance == null) {
 					if (LOG.isDebugEnabled()) {
-						LOG.debug(String.format(
-								"Using service instance from LoadBalancedRetryContext: %s",
-								serviceInstance));
+						LOG.debug("Service instance retrieved from LoadBalancedRetryContext: was null. "
+								+ "Reattempting service instance selection");
 					}
-					String reconstructedUrl = loadBalancerClient
-							.reconstructURI(serviceInstance, originalUri).toString();
+					ServiceInstance previousServiceInstance = lbContext.getPreviousServiceInstance();
+					String hint = getHint(serviceId);
+					DefaultRequest<RetryableRequestContext> lbRequest = new DefaultRequest<>(
+							new RetryableRequestContext(previousServiceInstance, request, hint));
+					supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStart(lbRequest));
+					retrievedServiceInstance = loadBalancerClient.choose(serviceId, lbRequest);
+					if (LOG.isDebugEnabled()) {
+						LOG.debug(String.format("Selected service instance: %s", retrievedServiceInstance));
+					}
+					lbContext.setServiceInstance(retrievedServiceInstance);
+				}
+
+				if (retrievedServiceInstance == null) {
+					if (LOG.isWarnEnabled()) {
+						LOG.warn("Service instance was not resolved, executing the original request");
+					}
+					org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
+							retrievedServiceInstance);
+					supportedLifecycleProcessors.forEach(
+							lifecycle -> lifecycle.onComplete(new CompletionContext<ResponseData, ServiceInstance>(
+									CompletionContext.Status.DISCARD, lbResponse)));
+					feignRequest = request;
+				}
+				else {
+					if (LOG.isDebugEnabled()) {
+						LOG.debug(String.format("Using service instance from LoadBalancedRetryContext: %s",
+								retrievedServiceInstance));
+					}
+					String reconstructedUrl = loadBalancerClient.reconstructURI(retrievedServiceInstance, originalUri)
+							.toString();
 					feignRequest = buildRequest(request, reconstructedUrl);
 				}
 			}
-			if (feignRequest == null) {
-				if (LOG.isWarnEnabled()) {
-					LOG.warn(
-							"Service instance was not resolved, executing the original request");
-				}
-				feignRequest = request;
-			}
-			Response response = delegate.execute(feignRequest, options);
+			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
+					retrievedServiceInstance);
+			Response response = executeWithLoadBalancerLifecycleProcessing(delegate, options, feignRequest, lbResponse,
+					supportedLifecycleProcessors, retrievedServiceInstance != null);
 			int responseStatus = response.status();
 			if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) {
 				if (LOG.isDebugEnabled()) {
-					LOG.debug(
-							String.format("Retrying on status code: %d", responseStatus));
+					LOG.debug(String.format("Retrying on status code: %d", responseStatus));
 				}
-				byte[] byteArray = response.body() == null ? new byte[] {}
-						: StreamUtils.copyToByteArray(response.body().asInputStream());
 				response.close();
-				throw new LoadBalancerResponseStatusCodeException(serviceId, response,
-						byteArray, URI.create(request.url()));
+				throw new RetryableStatusCodeException(serviceId, responseStatus, response, URI.create(request.url()));
 			}
 			return response;
 		}, new LoadBalancedRecoveryCallback<Response, Response>() {
@@ -128,26 +173,21 @@ 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());
+		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
+				request.charset(), request.requestTemplate());
 	}

-	private RetryTemplate buildRetryTemplate(String serviceId, Request request,
-			LoadBalancedRetryPolicy retryPolicy) {
+	private RetryTemplate buildRetryTemplate(String serviceId, Request request, LoadBalancedRetryPolicy retryPolicy) {
 		RetryTemplate retryTemplate = new RetryTemplate();
-		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory
-				.createBackOffPolicy(serviceId);
-		retryTemplate.setBackOffPolicy(
-				backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
-		RetryListener[] retryListeners = this.loadBalancedRetryFactory
-				.createRetryListeners(serviceId);
+		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory.createBackOffPolicy(serviceId);
+		retryTemplate.setBackOffPolicy(backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
+		RetryListener[] retryListeners = this.loadBalancedRetryFactory.createRetryListeners(serviceId);
 		if (retryListeners != null && retryListeners.length != 0) {
 			retryTemplate.setListeners(retryListeners);
 		}

 		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
-				: new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy,
-						loadBalancerClient, serviceId));
+				: new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy, loadBalancerClient, serviceId));
 		return retryTemplate;
 	}

@@ -187,4 +227,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 		};
 	}

+	private String getHint(String serviceId) {
+		String defaultHint = properties.getHint().getOrDefault("default", "default");
+		String hintPropertyValue = properties.getHint().get(serviceId);
+		return hintPropertyValue != null ? hintPropertyValue : defaultHint;
+	}
+
 }
@@ -1,72 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.util.Map;
-
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-/**
- * Factory for SpringLoadBalancer instances that caches the entries created.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @author Ryan Baxter
- * @author Gang Li
- */
-public class CachingSpringLoadBalancerFactory {
-
-	protected final SpringClientFactory factory;
-
-	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;
-
-	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory) {
-		this.factory = factory;
-	}
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
-			LoadBalancedRetryFactory loadBalancedRetryPolicyFactory) {
-		this.factory = factory;
-		this.loadBalancedRetryFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	public FeignLoadBalancer create(String clientName) {
-		FeignLoadBalancer client = this.cache.get(clientName);
-		if (client != null) {
-			return client;
-		}
-		IClientConfig config = this.factory.getClientConfig(clientName);
-		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
-		ServerIntrospector serverIntrospector = this.factory.getInstance(clientName,
-				ServerIntrospector.class);
-		client = this.loadBalancedRetryFactory != null
-				? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
-						this.loadBalancedRetryFactory)
-				: new FeignLoadBalancer(lb, config, serverIntrospector);
-		this.cache.put(clientName, client);
-		return client;
-	}
-
-}
@@ -1,40 +0,0 @@
-/*
- * 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.ribbon;
-
-import feign.Client;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-class DefaultFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory) {
-		return new LoadBalancerFeignClient(new Client.Default(null, null), cachingFactory,
-				clientFactory);
-	}
-
-}
@@ -1,251 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import com.netflix.client.AbstractLoadBalancerAwareClient;
-import com.netflix.client.ClientRequest;
-import com.netflix.client.IResponse;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-
-import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecureConnectionIfNeeded;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Ryan Baxter
- * @author Tim Ysewyn
- * @author Olga Maciaszek-Sharma
- */
-public class FeignLoadBalancer extends
-		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
-
-	private final RibbonProperties ribbon;
-
-	protected int connectTimeout;
-
-	protected int readTimeout;
-
-	protected IClientConfig clientConfig;
-
-	protected ServerIntrospector serverIntrospector;
-
-	protected boolean followRedirects;
-
-	public FeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-			ServerIntrospector serverIntrospector) {
-		super(lb, clientConfig);
-		setRetryHandler(RetryHandler.DEFAULT);
-		this.clientConfig = clientConfig;
-		this.ribbon = RibbonProperties.from(clientConfig);
-		RibbonProperties ribbon = this.ribbon;
-		connectTimeout = ribbon.getConnectTimeout();
-		readTimeout = ribbon.getReadTimeout();
-		this.serverIntrospector = serverIntrospector;
-		followRedirects = ribbon.isFollowRedirects();
-	}
-
-	@Override
-	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
-			throws IOException {
-		Request.Options options;
-		if (configOverride != null) {
-			RibbonProperties override = RibbonProperties.from(configOverride);
-			options = new Request.Options(override.connectTimeout(connectTimeout),
-					TimeUnit.MILLISECONDS, override.readTimeout(readTimeout),
-					TimeUnit.MILLISECONDS, override.isFollowRedirects(followRedirects));
-		}
-		else {
-			options = new Request.Options(connectTimeout, TimeUnit.MILLISECONDS,
-					readTimeout, TimeUnit.MILLISECONDS, followRedirects);
-		}
-		Response response = request.client().execute(request.toRequest(), options);
-		return new RibbonResponse(request.getUri(), response);
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			RibbonRequest request, IClientConfig requestConfig) {
-		if (ribbon.isOkToRetryOnAllOperations()) {
-			return new RequestSpecificRetryHandler(true, true, getRetryHandler(),
-					requestConfig);
-		}
-		if (!request.toRequest().httpMethod().name().equals("GET")) {
-			return new RequestSpecificRetryHandler(true, false, getRetryHandler(),
-					requestConfig);
-		}
-		else {
-			return new RequestSpecificRetryHandler(true, true, getRetryHandler(),
-					requestConfig);
-		}
-	}
-
-	@Override
-	public URI reconstructURIWithServer(Server server, URI original) {
-		URI uri = updateToSecureConnectionIfNeeded(original, clientConfig,
-				serverIntrospector, server);
-		return super.reconstructURIWithServer(server, uri);
-	}
-
-	protected static class RibbonRequest extends ClientRequest implements Cloneable {
-
-		private final Request request;
-
-		private final Client client;
-
-		protected RibbonRequest(Client client, Request request, URI uri) {
-			this.client = client;
-			setUri(uri);
-			this.request = toRequest(request);
-		}
-
-		private Request toRequest(Request request) {
-			Map<String, Collection<String>> headers = new LinkedHashMap<>(
-					request.headers());
-			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
-					request.body(), request.charset(), request.requestTemplate());
-		}
-
-		Request toRequest() {
-			return toRequest(request);
-		}
-
-		Client client() {
-			return client;
-		}
-
-		HttpRequest toHttpRequest() {
-			return new HttpRequest() {
-				@Override
-				public HttpMethod getMethod() {
-					return HttpMethod
-							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
-				}
-
-				@Override
-				public String getMethodValue() {
-					return getMethod().name();
-				}
-
-				@Override
-				public URI getURI() {
-					return RibbonRequest.this.getUri();
-				}
-
-				@Override
-				public HttpHeaders getHeaders() {
-					Map<String, List<String>> headers = new HashMap<>();
-					Map<String, Collection<String>> feignHeaders = RibbonRequest.this
-							.toRequest().headers();
-					for (String key : feignHeaders.keySet()) {
-						headers.put(key, new ArrayList<>(feignHeaders.get(key)));
-					}
-					HttpHeaders httpHeaders = new HttpHeaders();
-					httpHeaders.putAll(headers);
-					return httpHeaders;
-
-				}
-			};
-		}
-
-		public Request getRequest() {
-			return request;
-		}
-
-		public Client getClient() {
-			return client;
-		}
-
-		@Override
-		public Object clone() {
-			return new RibbonRequest(client, request, getUri());
-		}
-
-	}
-
-	protected static class RibbonResponse implements IResponse {
-
-		private final URI uri;
-
-		private final Response response;
-
-		protected RibbonResponse(URI uri, Response response) {
-			this.uri = uri;
-			this.response = response;
-		}
-
-		@Override
-		public Object getPayload() {
-			return response.body();
-		}
-
-		@Override
-		public boolean hasPayload() {
-			return response.body() != null;
-		}
-
-		@Override
-		public boolean isSuccess() {
-			return response.status() == 200;
-		}
-
-		@Override
-		public URI getRequestedURI() {
-			return uri;
-		}
-
-		@Override
-		public Map<String, Collection<String>> getHeaders() {
-			return response.headers();
-		}
-
-		Response toResponse() {
-			return response;
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (response != null && response.body() != null) {
-				response.body().close();
-			}
-		}
-
-	}
-
-}
@@ -1,129 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryContext;
-
-/**
- * @author Ryan Baxter
- */
-public class FeignRetryPolicy extends InterceptorRetryPolicy {
-
-	private HttpRequest request;
-
-	private String serviceId;
-
-	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
-			ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
-		super(request, policy, serviceInstanceChooser, serviceName);
-		this.request = request;
-		this.serviceId = serviceName;
-	}
-
-	@Override
-	public boolean canRetry(RetryContext context) {
-		/*
-		 * In InterceptorRetryPolicy.canRetry we ask the LoadBalancer to choose a server
-		 * if one is not set in the retry context and then return true. RetryTemplat calls
-		 * the canRetry method of the policy even on its first execution. So the fact that
-		 * we didnt have a service instance set in the RetryContext signaled that it was
-		 * the first execution and we should return true.
-		 *
-		 * In the Feign scenario, Feign as actually already queried the load balancer for
-		 * a service instance and we set that service instance in the context when we call
-		 * the open method of the policy. So in the Feign case we just return true if the
-		 * retry count is 0 indicating we haven't yet made a failed request.
-		 */
-		if (context.getRetryCount() == 0) {
-			return true;
-		}
-		return super.canRetry(context);
-	}
-
-	@Override
-	public RetryContext open(RetryContext parent) {
-		/*
-		 * With Feign (unlike Ribbon) the request already has the URI for the service
-		 * instance we are going to make the request to, so extract that information and
-		 * set the service instance in the context. In the Ribbon scenario the URI in the
-		 * request object still has the service id so we choose and set the service
-		 * instance later on.
-		 */
-		LoadBalancedRetryContext context = new LoadBalancedRetryContext(parent,
-				this.request);
-		context.setServiceInstance(
-				new FeignRetryPolicyServiceInstance(this.serviceId, this.request));
-		return context;
-	}
-
-	class FeignRetryPolicyServiceInstance implements ServiceInstance {
-
-		private String serviceId;
-
-		private HttpRequest request;
-
-		private Map<String, String> metadata;
-
-		FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) {
-			this.serviceId = serviceId;
-			this.request = request;
-			this.metadata = new HashMap<>();
-		}
-
-		@Override
-		public String getServiceId() {
-			return this.serviceId;
-		}
-
-		@Override
-		public String getHost() {
-			return this.request.getURI().getHost();
-		}
-
-		@Override
-		public int getPort() {
-			return this.request.getURI().getPort();
-		}
-
-		@Override
-		public boolean isSecure() {
-			return "https".equals(this.request.getURI().getScheme());
-		}
-
-		@Override
-		public URI getUri() {
-			return this.request.getURI();
-		}
-
-		@Override
-		public Map<String, String> getMetadata() {
-			return this.metadata;
-		}
-
-	}
-
-}
@@ -1,85 +0,0 @@
-/*
- * 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.ribbon;
-
-import com.netflix.loadbalancer.ILoadBalancer;
-import feign.Feign;
-import feign.Request;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-
-/**
- * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
- * load balancer.
- *
- * @author Dave Syer
- * @author Olga Maciaszek-Sharma
- * @author Nguyen Ky Thanh
- */
-@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
-@ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled",
-		matchIfMissing = true)
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-@EnableConfigurationProperties({ FeignHttpClientProperties.class })
-// Order is important here, last should be the default, first should be optional
-// see
-// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ HttpClientFeignLoadBalancedConfiguration.class,
-		OkHttpFeignLoadBalancedConfiguration.class,
-		HttpClient5FeignLoadBalancedConfiguration.class,
-		DefaultFeignLoadBalancedConfiguration.class })
-public class FeignRibbonClientAutoConfiguration {
-
-	@Bean
-	@Primary
-	@ConditionalOnMissingBean
-	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
-			SpringClientFactory factory) {
-		return new CachingSpringLoadBalancerFactory(factory);
-	}
-
-	@Bean
-	@Primary
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
-			SpringClientFactory factory, LoadBalancedRetryFactory retryFactory) {
-		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Request.Options feignRequestOptions() {
-		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
-	}
-
-}
@@ -1,52 +0,0 @@
-/*
- * 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.ribbon;
-
-import feign.Client;
-import feign.hc5.ApacheHttp5Client;
-import org.apache.hc.client5.http.classic.HttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Configuration instantiating a {@link LoadBalancerFeignClient}-based {@link Client}
- * object that uses {@link ApacheHttp5Client} under the hood.
- *
- * @author Nguyen Ky Thanh
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(ApacheHttp5Client.class)
-@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
-@Import(HttpClient5FeignConfiguration.class)
-class HttpClient5FeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory, HttpClient httpClient5) {
-		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-
-}
@@ -1,54 +0,0 @@
-/*
- * 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.ribbon;
-
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-import org.apache.http.client.HttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-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;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- * @author Nguyen Ky Thanh
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-@Conditional(HttpClient5DisabledConditions.class)
-@Import(HttpClientFeignConfiguration.class)
-class HttpClientFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory, HttpClient httpClient) {
-		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-
-}
@@ -1,146 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-
-import com.netflix.client.ClientException;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
-/**
- * @author Dave Syer
- * @author Olga Maciaszek-Sharma
- *
- */
-public class LoadBalancerFeignClient implements Client {
-
-	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
-
-	private final Client delegate;
-
-	private CachingSpringLoadBalancerFactory lbClientFactory;
-
-	private SpringClientFactory clientFactory;
-
-	public LoadBalancerFeignClient(Client delegate,
-			CachingSpringLoadBalancerFactory lbClientFactory,
-			SpringClientFactory clientFactory) {
-		this.delegate = delegate;
-		this.lbClientFactory = lbClientFactory;
-		this.clientFactory = clientFactory;
-	}
-
-	static URI cleanUrl(String originalUrl, String host) {
-		String newUrl = originalUrl;
-		if (originalUrl.startsWith("https://")) {
-			newUrl = originalUrl.substring(0, 8)
-					+ originalUrl.substring(8 + host.length());
-		}
-		else if (originalUrl.startsWith("http")) {
-			newUrl = originalUrl.substring(0, 7)
-					+ originalUrl.substring(7 + host.length());
-		}
-		StringBuffer buffer = new StringBuffer(newUrl);
-		if ((newUrl.startsWith("https://") && newUrl.length() == 8)
-				|| (newUrl.startsWith("http://") && newUrl.length() == 7)) {
-			buffer.append("/");
-		}
-		return URI.create(buffer.toString());
-	}
-
-	@Override
-	public Response execute(Request request, Request.Options options) throws IOException {
-		try {
-			URI asUri = URI.create(request.url());
-			String clientName = asUri.getHost();
-			URI uriWithoutHost = cleanUrl(request.url(), clientName);
-			FeignLoadBalancer.RibbonRequest ribbonRequest = new FeignLoadBalancer.RibbonRequest(
-					this.delegate, request, uriWithoutHost);
-
-			IClientConfig requestConfig = getClientConfig(options, clientName);
-			return lbClient(clientName)
-					.executeWithLoadBalancer(ribbonRequest, requestConfig).toResponse();
-		}
-		catch (ClientException e) {
-			IOException io = findIOException(e);
-			if (io != null) {
-				throw io;
-			}
-			throw new RuntimeException(e);
-		}
-	}
-
-	IClientConfig getClientConfig(Request.Options options, String clientName) {
-		IClientConfig requestConfig;
-		if (options == DEFAULT_OPTIONS) {
-			requestConfig = this.clientFactory.getClientConfig(clientName);
-		}
-		else {
-			requestConfig = new FeignOptionsClientConfig(options);
-		}
-		return requestConfig;
-	}
-
-	protected IOException findIOException(Throwable t) {
-		if (t == null) {
-			return null;
-		}
-		if (t instanceof IOException) {
-			return (IOException) t;
-		}
-		return findIOException(t.getCause());
-	}
-
-	public Client getDelegate() {
-		return this.delegate;
-	}
-
-	private FeignLoadBalancer lbClient(String clientName) {
-		return this.lbClientFactory.create(clientName);
-	}
-
-	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
-
-		FeignOptionsClientConfig(Request.Options options) {
-			setProperty(CommonClientConfigKey.ConnectTimeout,
-					options.connectTimeoutMillis());
-			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
-			setProperty(CommonClientConfigKey.FollowRedirects,
-					options.isFollowRedirects());
-		}
-
-		@Override
-		public void loadProperties(String clientName) {
-
-		}
-
-		@Override
-		public void loadDefaultValues() {
-
-		}
-
-	}
-
-}
@@ -1,49 +0,0 @@
-/*
- * 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.ribbon;
-
-import feign.Client;
-import feign.okhttp.OkHttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty("feign.okhttp.enabled")
-@Import(OkHttpFeignConfiguration.class)
-class OkHttpFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
-		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-
-}
@@ -1,141 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-
-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.backoff.BackOffPolicy;
-import org.springframework.retry.backoff.NoBackOffPolicy;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.StreamUtils;
-
-/**
- * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
- *
- * @author Ryan Baxter
- * @author Gang Li
- */
-public class RetryableFeignLoadBalancer extends FeignLoadBalancer
-		implements ServiceInstanceChooser {
-
-	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
-
-	public RetryableFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-			ServerIntrospector serverIntrospector,
-			LoadBalancedRetryFactory loadBalancedRetryFactory) {
-		super(lb, clientConfig, serverIntrospector);
-		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
-		this.setRetryHandler(new DefaultLoadBalancerRetryHandler(clientConfig));
-	}
-
-	@Override
-	public RibbonResponse execute(final RibbonRequest request,
-			IClientConfig configOverride) throws IOException {
-		final Request.Options options;
-		if (configOverride != null) {
-			RibbonProperties ribbon = RibbonProperties.from(configOverride);
-			options = new Request.Options(ribbon.connectTimeout(this.connectTimeout),
-					ribbon.readTimeout(this.readTimeout));
-		}
-		else {
-			options = new Request.Options(this.connectTimeout, this.readTimeout);
-		}
-		final LoadBalancedRetryPolicy retryPolicy = this.loadBalancedRetryFactory
-				.createRetryPolicy(this.getClientName(), this);
-		RetryTemplate retryTemplate = new RetryTemplate();
-		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory
-				.createBackOffPolicy(this.getClientName());
-		retryTemplate.setBackOffPolicy(
-				backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
-		RetryListener[] retryListeners = this.loadBalancedRetryFactory
-				.createRetryListeners(this.getClientName());
-		if (retryListeners != null && retryListeners.length != 0) {
-			retryTemplate.setListeners(retryListeners);
-		}
-		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
-				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this,
-						this.getClientName()));
-		return retryTemplate.execute(retryContext -> {
-			Request feignRequest = null;
-			// on retries the policy will choose the server and set it in the context
-			// extract the server and update the request being made
-			if (retryContext instanceof LoadBalancedRetryContext) {
-				ServiceInstance service = ((LoadBalancedRetryContext) retryContext)
-						.getServiceInstance();
-				if (service != null) {
-					feignRequest = ((RibbonRequest) request
-							.replaceUri(reconstructURIWithServer(
-									new Server(service.getHost(), service.getPort()),
-									request.getUri()))).toRequest();
-				}
-			}
-			if (feignRequest == null) {
-				feignRequest = request.toRequest();
-			}
-			Response response = request.client().execute(feignRequest, options);
-			if (retryPolicy != null
-					&& retryPolicy.retryableStatusCode(response.status())) {
-				byte[] byteArray = response.body() == null ? new byte[] {}
-						: StreamUtils.copyToByteArray(response.body().asInputStream());
-				response.close();
-				throw new RibbonResponseStatusCodeException(
-						RetryableFeignLoadBalancer.this.clientName, response, byteArray,
-						request.getUri());
-			}
-			return new RibbonResponse(request.getUri(), response);
-		}, new LoadBalancedRecoveryCallback<RibbonResponse, Response>() {
-			@Override
-			protected RibbonResponse createResponse(Response response, URI uri) {
-				return new RibbonResponse(uri, response);
-			}
-		});
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(),
-				requestConfig);
-	}
-
-	@Override
-	public ServiceInstance choose(String serviceId) {
-		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
-				this.getLoadBalancer().chooseServer(serviceId));
-	}
-
-}
@@ -1,49 +0,0 @@
-/*
- * 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.ribbon;
-
-import java.io.ByteArrayInputStream;
-import java.net.URI;
-
-import feign.Response;
-
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-
-/**
- * A {@link RetryableStatusCodeException} for {@link Response}s.
- *
- * @author Ryan Baxter
- */
-public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
-
-	private final Response response;
-
-	public RibbonResponseStatusCodeException(String serviceId, Response response,
-			byte[] body, URI uri) {
-		super(serviceId, response.status(), response, uri);
-		this.response = Response.builder()
-				.body(new ByteArrayInputStream(body), body.length)
-				.headers(response.headers()).reason(response.reason())
-				.status(response.status()).request(response.request()).build();
-	}
-
-	@Override
-	public Response getResponse() {
-		return this.response;
-	}
-
-}
@@ -29,7 +29,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;

 import static feign.form.ContentProcessor.CRLF;
-import static feign.form.util.PojoUtil.isUserPojo;

 /**
 * @author Darren Foong
@@ -45,12 +44,10 @@ public abstract class AbstractFormWriter extends AbstractWriter {
 	@Override
 	public void write(Output output, String key, Object object) throws EncodeException {
 		try {
-			String string = new StringBuilder()
-					.append("Content-Disposition: form-data; name=\"").append(key)
-					.append('"').append(CRLF).append("Content-Type: ")
-					.append(getContentType()).append("; charset=")
-					.append(output.getCharset().name()).append(CRLF).append(CRLF)
-					.append(writeAsString(object)).toString();
+			String string = new StringBuilder().append("Content-Disposition: form-data; name=\"").append(key)
+					.append('"').append(CRLF).append("Content-Type: ").append(getContentType()).append("; charset=")
+					.append(output.getCharset().name()).append(CRLF).append(CRLF).append(writeAsString(object))
+					.toString();

 			output.write(string);
 		}
@@ -45,19 +45,15 @@ public class DefaultGzipDecoder implements Decoder {
 	}

 	@Override
-	public Object decode(final Response response, Type type)
-			throws IOException, FeignException {
-		Collection<String> encoding = response.headers()
-				.containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
-						? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER)
-						: null;
+	public Object decode(final Response response, Type type) throws IOException, FeignException {
+		Collection<String> encoding = response.headers().containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
+				? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER) : null;

 		if (encoding != null) {
 			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
 				String decompressedBody = decompress(response);
 				if (decompressedBody != null) {
-					Response decompressedResponse = response.toBuilder()
-							.body(decompressedBody.getBytes()).build();
+					Response decompressedResponse = response.toBuilder().body(decompressedBody.getBytes()).build();
 					return decoder.decode(decompressedResponse, type);
 				}
 			}
@@ -69,8 +65,7 @@ public class DefaultGzipDecoder implements Decoder {
 		if (response.body() == null) {
 			return null;
 		}
-		try (GZIPInputStream gzipInputStream = new GZIPInputStream(
-				response.body().asInputStream());
+		try (GZIPInputStream gzipInputStream = new GZIPInputStream(response.body().asInputStream());
 				BufferedReader reader = new BufferedReader(
 						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
 			String outputString = "";
@@ -43,8 +43,7 @@ public class DefaultGzipDecoderConfiguration {

 	private ObjectFactory<HttpMessageConverters> messageConverters;

-	public DefaultGzipDecoderConfiguration(
-			ObjectFactory<HttpMessageConverters> messageConverters) {
+	public DefaultGzipDecoderConfiguration(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.messageConverters = messageConverters;
 	}

@@ -52,8 +51,8 @@ public class DefaultGzipDecoderConfiguration {
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
 	public Decoder defaultGzipDecoder() {
-		return new OptionalDecoder(new ResponseEntityDecoder(
-				new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
+		return new OptionalDecoder(
+				new ResponseEntityDecoder(new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
 	}

 }
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.support;
-
-import com.netflix.hystrix.HystrixCommand;
-import com.netflix.hystrix.HystrixCommandGroupKey;
-import com.netflix.hystrix.HystrixThreadPoolKey;
-
-/**
- * Convenience class for implementing feign fallbacks that return {@link HystrixCommand}.
- * Also useful for return types of {@link rx.Observable} and
- * {@link java.util.concurrent.Future}. For those return types, just call
- * {@link FallbackCommand#observe()} or {@link FallbackCommand#queue()} respectively.
- *
- * @param <T> result type
- * @author Spencer Gibb
- */
-public class FallbackCommand<T> extends HystrixCommand<T> {
-
-	private T result;
-
-	public FallbackCommand(T result) {
-		this(result, "fallback");
-	}
-
-	protected FallbackCommand(T result, String groupname) {
-		super(HystrixCommandGroupKey.Factory.asKey(groupname));
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group) {
-		super(group);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group,
-			int executionIsolationThreadTimeoutInMilliseconds) {
-		super(group, executionIsolationThreadTimeoutInMilliseconds);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group,
-			HystrixThreadPoolKey threadPool) {
-		super(group, threadPool);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group,
-			HystrixThreadPoolKey threadPool,
-			int executionIsolationThreadTimeoutInMilliseconds) {
-		super(group, threadPool, executionIsolationThreadTimeoutInMilliseconds);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, Setter setter) {
-		super(setter);
-		this.result = result;
-	}
-
-	@Override
-	protected T run() throws Exception {
-		return this.result;
-	}
-
-}
@@ -1,44 +0,0 @@
-/*
- * 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-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;

 /**
 * @author Ryan Baxter
- * @author Nguyen Ky Thanh
 */
@ConfigurationProperties(prefix = "feign.httpclient")
 public class FeignHttpClientProperties {
@@ -83,11 +82,6 @@ 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;
 	}
@@ -152,125 +146,4 @@ 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
-
-		}
-
-	}
-
 }
@@ -54,10 +54,8 @@ public final class FeignUtils {
 		return headers;
 	}

-	static Collection<String> addTemplateParameter(Collection<String> possiblyNull,
-			String paramName) {
-		Collection<String> params = ofNullable(possiblyNull).map(ArrayList::new)
-				.orElse(new ArrayList<>());
+	static Collection<String> addTemplateParameter(Collection<String> possiblyNull, String paramName) {
+		Collection<String> params = ofNullable(possiblyNull).map(ArrayList::new).orElse(new ArrayList<>());
 		params.add(String.format("{%s}", paramName));
 		return params;
 	}
@@ -20,7 +20,6 @@ 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;
@@ -37,7 +36,6 @@ 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 {

@@ -65,11 +63,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") @JsonAlias({ "total-elements",
-						"total_elements", "totalelements",
-						"TotalElements" }) long totalElements,
+		SimplePageImpl(@JsonProperty("content") List<T> content, @JsonProperty("number") int number,
+				@JsonProperty("size") int size, @JsonProperty("totalElements") long totalElements,
 				@JsonProperty("sort") Sort sort) {
 			PageRequest pageRequest;
 			if (sort != null) {
@@ -75,8 +75,7 @@ public class PageableSpringEncoder implements Encoder {
 	}

 	@Override
-	public void encode(Object object, Type bodyType, RequestTemplate template)
-			throws EncodeException {
+	public void encode(Object object, Type bodyType, RequestTemplate template) throws EncodeException {

 		if (supports(object)) {
 			if (object instanceof Pageable) {
@@ -101,18 +100,15 @@ public class PageableSpringEncoder implements Encoder {
 				delegate.encode(object, bodyType, template);
 			}
 			else {
-				throw new EncodeException(
-						"PageableSpringEncoder does not support the given object "
-								+ object.getClass()
-								+ " and no delegate was provided for fallback!");
+				throw new EncodeException("PageableSpringEncoder does not support the given object " + object.getClass()
+						+ " and no delegate was provided for fallback!");
 			}
 		}
 	}

 	private void applySort(RequestTemplate template, Sort sort) {
 		Collection<String> existingSorts = template.queries().get("sort");
-		List<String> sortQueries = existingSorts != null ? new ArrayList<>(existingSorts)
-				: new ArrayList<>();
+		List<String> sortQueries = existingSorts != null ? new ArrayList<>(existingSorts) : new ArrayList<>();
 		if (!sortParameter.equals("sort")) {
 			existingSorts = template.queries().get(sortParameter);
 			if (existingSorts != null) {
@@ -120,7 +116,7 @@ public class PageableSpringEncoder implements Encoder {
 			}
 		}
 		for (Sort.Order order : sort) {
-			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
+			sortQueries.add(order.getProperty() + "," + order.getDirection());
 		}
 		if (!sortQueries.isEmpty()) {
 			template.query(sortParameter, sortQueries);
@@ -1,80 +0,0 @@
-/*
- * 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-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -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 {

@@ -46,8 +46,7 @@ public class ResponseEntityDecoder implements Decoder {
 	}

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

 		if (isParameterizeHttpEntity(type)) {
 			type = ((ParameterizedType) type).getActualTypeArguments()[0];
@@ -81,13 +80,12 @@ public class ResponseEntityDecoder implements Decoder {
 	@SuppressWarnings("unchecked")
 	private <T> ResponseEntity<T> createResponse(Object instance, Response response) {

-		HttpHeaders headers = new HttpHeaders();
+		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
 		for (String key : response.headers().keySet()) {
 			headers.put(key, new LinkedList<>(response.headers().get(key)));
 		}

-		return new ResponseEntity<>((T) instance, headers,
-				HttpStatus.valueOf(response.status()));
+		return new ResponseEntity<>((T) instance, headers, HttpStatus.valueOf(response.status()));
 	}

 }
@@ -48,8 +48,7 @@ public class SortJacksonModule extends Module {
 		context.addSerializers(serializers);

 		SimpleDeserializers deserializers = new SimpleDeserializers();
-		deserializers.addDeserializer(Sort.class,
-				new SortJsonComponent.SortDeserializer());
+		deserializers.addDeserializer(Sort.class, new SortJsonComponent.SortDeserializer());
 		context.addDeserializers(deserializers);
 	}

@@ -44,8 +44,7 @@ public class SortJsonComponent {
 	public static class SortSerializer extends JsonSerializer<Sort> {

 		@Override
-		public void serialize(Sort value, JsonGenerator gen,
-				SerializerProvider serializers) throws IOException {
+		public void serialize(Sort value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
 			gen.writeStartArray();
 			value.iterator().forEachRemaining(v -> {
 				try {
@@ -68,15 +67,14 @@ public class SortJsonComponent {
 	public static class SortDeserializer extends JsonDeserializer<Sort> {

 		@Override
-		public Sort deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext) throws IOException {
+		public Sort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+				throws IOException {
 			TreeNode treeNode = jsonParser.getCodec().readTree(jsonParser);
 			if (treeNode.isArray()) {
 				ArrayNode arrayNode = (ArrayNode) treeNode;
 				List<Sort.Order> orders = new ArrayList<>();
 				for (JsonNode jsonNode : arrayNode) {
-					Sort.Order order = new Sort.Order(
-							Sort.Direction.valueOf(jsonNode.get("direction").textValue()),
+					Sort.Order order = new Sort.Order(Sort.Direction.valueOf(jsonNode.get("direction").textValue()),
 							jsonNode.get("property").textValue());
 					orders.add(order);
 				}
@@ -48,18 +48,15 @@ public class SpringDecoder implements Decoder {
 	}

 	@Override
-	public Object decode(final Response response, Type type)
-			throws IOException, FeignException {
-		if (type instanceof Class || type instanceof ParameterizedType
-				|| type instanceof WildcardType) {
+	public Object decode(final Response response, Type type) throws IOException, FeignException {
+		if (type instanceof Class || type instanceof ParameterizedType || type instanceof WildcardType) {
 			@SuppressWarnings({ "unchecked", "rawtypes" })
-			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(
-					type, this.messageConverters.getObject().getConverters());
+			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(type,
+					this.messageConverters.getObject().getConverters());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,11 +22,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;
@@ -49,10 +48,6 @@ import org.springframework.web.multipart.MultipartFile;

 import static org.springframework.cloud.openfeign.support.FeignUtils.getHeaders;
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;
-import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
-import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
-import static org.springframework.http.MediaType.MULTIPART_MIXED;
-import static org.springframework.http.MediaType.MULTIPART_RELATED;

 /**
 * @author Spencer Gibb
@@ -60,10 +55,7 @@ import static org.springframework.http.MediaType.MULTIPART_RELATED;
 * @author Ahmad Mozafarnia
 * @author Aaron Whiteside
 * @author Darren Foong
- * @author Olga Maciaszek-Sharma
- * @author Can Bezmen
 */
-@SuppressWarnings("rawtypes")
 public class SpringEncoder implements Encoder {

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

 	private final ObjectFactory<HttpMessageConverters> messageConverters;

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

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

 	@Override
-	public void encode(Object requestBody, Type bodyType, RequestTemplate request)
-			throws EncodeException {
+	public void encode(Object requestBody, Type bodyType, RequestTemplate request) throws EncodeException {
 		// template.body(conversionService.convert(object, String.class));
 		if (requestBody != null) {
-			Collection<String> contentTypes = request.headers()
-					.get(HttpEncoding.CONTENT_TYPE);
+			Collection<String> contentTypes = request.headers().get(HttpEncoding.CONTENT_TYPE);

 			MediaType requestContentType = null;
 			if (contentTypes != null && !contentTypes.isEmpty()) {
@@ -105,90 +86,67 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}

-			if (isFormRelatedContentType(requestContentType)) {
-				springFormEncoder.encode(requestBody, bodyType, request);
+			if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
+				this.springFormEncoder.encode(requestBody, bodyType, request);
 				return;
 			}
 			else {
 				if (bodyType == MultipartFile.class) {
-					log.warn(
-							"For MultipartFile to be handled correctly, the 'consumes' parameter of @RequestMapping "
-									+ "should be specified as MediaType.MULTIPART_FORM_DATA_VALUE");
+					log.warn("For MultipartFile to be handled correctly, the 'consumes' parameter of @RequestMapping "
+							+ "should be specified as MediaType.MULTIPART_FORM_DATA_VALUE");
 				}
 			}
-			encodeWithMessageConverter(requestBody, bodyType, request,
-					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;
+					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);
 		}
 	}

-	private void encodeWithMessageConverter(Object requestBody, Type bodyType,
-			RequestTemplate request, MediaType requestContentType) {
-		for (HttpMessageConverter messageConverter : 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 {
+	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType, HttpMessageConverter converter,
+			RequestTemplate request) throws IOException {
 		if (converter.canWrite(body.getClass(), contentType)) {
 			logBeforeWrite(body, contentType, converter);
 			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
@@ -201,9 +159,8 @@ public class SpringEncoder implements Encoder {
 	}

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

-	private boolean isFormRelatedContentType(MediaType requestContentType) {
-		return isMultipartType(requestContentType)
-				|| isFormUrlEncoded(requestContentType);
-	}
-
-	private boolean isMultipartType(MediaType requestContentType) {
-		return Arrays.asList(MULTIPART_FORM_DATA, MULTIPART_MIXED, MULTIPART_RELATED)
-				.contains(requestContentType);
-	}
-
-	private boolean isFormUrlEncoded(MediaType requestContentType) {
-		return Objects.equals(APPLICATION_FORM_URLENCODED, 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();
@@ -259,21 +192,21 @@ public class SpringEncoder implements Encoder {
 		private final HttpHeaders httpHeaders;

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

 		@Override
 		public OutputStream getBody() throws IOException {
-			return outputStream;
+			return this.outputStream;
 		}

 		@Override
 		public HttpHeaders getHeaders() {
-			return httpHeaders;
+			return this.httpHeaders;
 		}

 		public ByteArrayOutputStream getOutputStream() {
-			return outputStream;
+			return this.outputStream;
 		}

 	}
@@ -35,8 +35,6 @@ import feign.Feign;
 import feign.MethodMetadata;
 import feign.Param;
 import feign.Request;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;

 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.CollectionFormat;
@@ -82,20 +80,15 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
 * @author Darren Foong
 * @author Ram Anaswara
 */
-public class SpringMvcContract extends Contract.BaseContract
-		implements ResourceLoaderAware {
-
-	private static final Log LOG = LogFactory.getLog(SpringMvcContract.class);
+public class SpringMvcContract extends Contract.BaseContract implements ResourceLoaderAware {

 	private static final String ACCEPT = "Accept";

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

-	private static final TypeDescriptor STRING_TYPE_DESCRIPTOR = TypeDescriptor
-			.valueOf(String.class);
+	private static final TypeDescriptor STRING_TYPE_DESCRIPTOR = TypeDescriptor.valueOf(String.class);

-	private static final TypeDescriptor ITERABLE_TYPE_DESCRIPTOR = TypeDescriptor
-			.valueOf(Iterable.class);
+	private static final TypeDescriptor ITERABLE_TYPE_DESCRIPTOR = TypeDescriptor.valueOf(Iterable.class);

 	private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();

@@ -115,22 +108,18 @@ public class SpringMvcContract extends Contract.BaseContract
 		this(Collections.emptyList());
 	}

-	public SpringMvcContract(
-			List<AnnotatedParameterProcessor> annotatedParameterProcessors) {
+	public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors) {
 		this(annotatedParameterProcessors, new DefaultConversionService());
 	}

-	public SpringMvcContract(
-			List<AnnotatedParameterProcessor> annotatedParameterProcessors,
+	public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors,
 			ConversionService conversionService) {
 		this(annotatedParameterProcessors, conversionService, true);
 	}

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

 		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
@@ -150,26 +139,21 @@ public class SpringMvcContract extends Contract.BaseContract
 		// Feign applies the Param.Expander to each element of an Iterable, so in those
 		// cases we need to provide a TypeDescriptor of the element.
 		if (typeDescriptor.isAssignableTo(ITERABLE_TYPE_DESCRIPTOR)) {
-			TypeDescriptor elementTypeDescriptor = getElementTypeDescriptor(
-					typeDescriptor);
+			TypeDescriptor elementTypeDescriptor = getElementTypeDescriptor(typeDescriptor);

 			checkState(elementTypeDescriptor != null,
-					"Could not resolve element type of Iterable type %s. Not declared?",
-					typeDescriptor);
+					"Could not resolve element type of Iterable type %s. Not declared?", typeDescriptor);

 			typeDescriptor = elementTypeDescriptor;
 		}
 		return typeDescriptor;
 	}

-	private static TypeDescriptor getElementTypeDescriptor(
-			TypeDescriptor typeDescriptor) {
+	private static TypeDescriptor getElementTypeDescriptor(TypeDescriptor typeDescriptor) {
 		TypeDescriptor elementTypeDescriptor = typeDescriptor.getElementTypeDescriptor();
 		// that means it's not a collection but it is iterable, gh-135
-		if (elementTypeDescriptor == null
-				&& Iterable.class.isAssignableFrom(typeDescriptor.getType())) {
-			ResolvableType type = typeDescriptor.getResolvableType().as(Iterable.class)
-					.getGeneric(0);
+		if (elementTypeDescriptor == null && Iterable.class.isAssignableFrom(typeDescriptor.getType())) {
+			ResolvableType type = typeDescriptor.getResolvableType().as(Iterable.class).getGeneric(0);
 			if (type.resolve() == null) {
 				return null;
 			}
@@ -185,32 +169,58 @@ public class SpringMvcContract extends Contract.BaseContract

 	@Override
 	protected void processAnnotationOnClass(MethodMetadata data, Class<?> clz) {
-		RequestMapping classAnnotation = findMergedAnnotation(clz, RequestMapping.class);
-		if (classAnnotation != null) {
-			LOG.error("Cannot process class: " + clz.getName()
-					+ ". @RequestMapping annotation is not allowed on @FeignClient interfaces.");
-			throw new IllegalArgumentException(
-					"@RequestMapping annotation not allowed on @FeignClient interfaces");
+		if (clz.getInterfaces().length == 0) {
+			RequestMapping classAnnotation = findMergedAnnotation(clz, RequestMapping.class);
+			if (classAnnotation != null) {
+				// Prepend path from class annotation if specified
+				if (classAnnotation.value().length > 0) {
+					String pathValue = emptyToNull(classAnnotation.value()[0]);
+					pathValue = resolve(pathValue);
+					if (!pathValue.startsWith("/")) {
+						pathValue = "/" + pathValue;
+					}
+					data.template().uri(pathValue);
+					if (data.template().decodeSlash() != decodeSlash) {
+						data.template().decodeSlash(decodeSlash);
+					}
+				}
+			}
 		}
 	}

 	@Override
 	public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
 		processedMethods.put(Feign.configKey(targetType, method), method);
-		return super.parseAndValidateMetadata(targetType, method);
+		MethodMetadata md = super.parseAndValidateMetadata(targetType, method);
+
+		RequestMapping classAnnotation = findMergedAnnotation(targetType, RequestMapping.class);
+		if (classAnnotation != null) {
+			// produces - use from class annotation only if method has not specified this
+			if (!md.template().headers().containsKey(ACCEPT)) {
+				parseProduces(md, method, classAnnotation);
+			}
+
+			// consumes -- use from class annotation only if method has not specified this
+			if (!md.template().headers().containsKey(CONTENT_TYPE)) {
+				parseConsumes(md, method, classAnnotation);
+			}
+
+			// headers -- class annotation is inherited to methods, always write these if
+			// present
+			parseHeaders(md, method, classAnnotation);
+		}
+		return md;
 	}

 	@Override
-	protected void processAnnotationOnMethod(MethodMetadata data,
-			Annotation methodAnnotation, Method method) {
+	protected void processAnnotationOnMethod(MethodMetadata data, Annotation methodAnnotation, Method method) {
 		if (CollectionFormat.class.isInstance(methodAnnotation)) {
-			CollectionFormat collectionFormat = findMergedAnnotation(method,
-					CollectionFormat.class);
+			CollectionFormat collectionFormat = findMergedAnnotation(method, CollectionFormat.class);
 			data.template().collectionFormat(collectionFormat.value());
 		}

-		if (!RequestMapping.class.isInstance(methodAnnotation) && !methodAnnotation
-				.annotationType().isAnnotationPresent(RequestMapping.class)) {
+		if (!RequestMapping.class.isInstance(methodAnnotation)
+				&& !methodAnnotation.annotationType().isAnnotationPresent(RequestMapping.class)) {
 			return;
 		}

@@ -253,34 +263,29 @@ public class SpringMvcContract extends Contract.BaseContract
 	}

 	private String resolve(String value) {
-		if (StringUtils.hasText(value)
-				&& resourceLoader instanceof ConfigurableApplicationContext) {
-			return ((ConfigurableApplicationContext) resourceLoader).getEnvironment()
-					.resolvePlaceholders(value);
+		if (StringUtils.hasText(value) && resourceLoader instanceof ConfigurableApplicationContext) {
+			return ((ConfigurableApplicationContext) resourceLoader).getEnvironment().resolvePlaceholders(value);
 		}
 		return value;
 	}

 	private void checkAtMostOne(Method method, Object[] values, String fieldName) {
 		checkState(values != null && (values.length == 0 || values.length == 1),
-				"Method %s can only contain at most 1 %s field. Found: %s",
-				method.getName(), fieldName,
+				"Method %s can only contain at most 1 %s field. Found: %s", method.getName(), fieldName,
 				values == null ? null : Arrays.asList(values));
 	}

 	private void checkOne(Method method, Object[] values, String fieldName) {
-		checkState(values != null && values.length == 1,
-				"Method %s can only contain 1 %s field. Found: %s", method.getName(),
-				fieldName, values == null ? null : Arrays.asList(values));
+		checkState(values != null && values.length == 1, "Method %s can only contain 1 %s field. Found: %s",
+				method.getName(), fieldName, values == null ? null : Arrays.asList(values));
 	}

 	@Override
-	protected boolean processAnnotationsOnParameter(MethodMetadata data,
-			Annotation[] annotations, int paramIndex) {
+	protected boolean processAnnotationsOnParameter(MethodMetadata data, Annotation[] annotations, int paramIndex) {
 		boolean isHttpAnnotation = false;

-		AnnotatedParameterProcessor.AnnotatedParameterContext context = new SimpleAnnotatedParameterContext(
-				data, paramIndex);
+		AnnotatedParameterProcessor.AnnotatedParameterContext context = new SimpleAnnotatedParameterContext(data,
+				paramIndex);
 		Method method = processedMethods.get(data.configKey());
 		for (Annotation parameterAnnotation : annotations) {
 			AnnotatedParameterProcessor processor = annotatedArgumentProcessors
@@ -289,19 +294,16 @@ public class SpringMvcContract extends Contract.BaseContract
 				Annotation processParameterAnnotation;
 				// synthesize, handling @AliasFor, while falling back to parameter name on
 				// missing String #value():
-				processParameterAnnotation = synthesizeWithMethodParameterNameAsFallbackValue(
-						parameterAnnotation, method, paramIndex);
-				isHttpAnnotation |= processor.processArgument(context,
-						processParameterAnnotation, method);
+				processParameterAnnotation = synthesizeWithMethodParameterNameAsFallbackValue(parameterAnnotation,
+						method, paramIndex);
+				isHttpAnnotation |= processor.processArgument(context, processParameterAnnotation, method);
 			}
 		}

-		if (!isMultipartFormData(data) && isHttpAnnotation
-				&& data.indexToExpander().get(paramIndex) == null) {
+		if (!isMultipartFormData(data) && isHttpAnnotation && data.indexToExpander().get(paramIndex) == null) {
 			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
 			if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) {
-				Param.Expander expander = convertingExpanderFactory
-						.getExpander(typeDescriptor);
+				Param.Expander expander = convertingExpanderFactory.getExpander(typeDescriptor);
 				if (expander != null) {
 					data.indexToExpander().put(paramIndex, expander);
 				}
@@ -310,28 +312,23 @@ public class SpringMvcContract extends Contract.BaseContract
 		return isHttpAnnotation;
 	}

-	private void parseProduces(MethodMetadata md, Method method,
-			RequestMapping annotation) {
+	private void parseProduces(MethodMetadata md, Method method, RequestMapping annotation) {
 		String[] serverProduces = annotation.produces();
-		String clientAccepts = serverProduces.length == 0 ? null
-				: emptyToNull(serverProduces[0]);
+		String clientAccepts = serverProduces.length == 0 ? null : emptyToNull(serverProduces[0]);
 		if (clientAccepts != null) {
 			md.template().header(ACCEPT, clientAccepts);
 		}
 	}

-	private void parseConsumes(MethodMetadata md, Method method,
-			RequestMapping annotation) {
+	private void parseConsumes(MethodMetadata md, Method method, RequestMapping annotation) {
 		String[] serverConsumes = annotation.consumes();
-		String clientProduces = serverConsumes.length == 0 ? null
-				: emptyToNull(serverConsumes[0]);
+		String clientProduces = serverConsumes.length == 0 ? null : emptyToNull(serverConsumes[0]);
 		if (clientProduces != null) {
 			md.template().header(CONTENT_TYPE, clientProduces);
 		}
 	}

-	private void parseHeaders(MethodMetadata md, Method method,
-			RequestMapping annotation) {
+	private void parseHeaders(MethodMetadata md, Method method, RequestMapping annotation) {
 		// TODO: only supports one header value per key
 		if (annotation.headers() != null && annotation.headers().length > 0) {
 			for (String header : annotation.headers()) {
@@ -367,26 +364,21 @@ public class SpringMvcContract extends Contract.BaseContract
 		return annotatedArgumentResolvers;
 	}

-	private Annotation synthesizeWithMethodParameterNameAsFallbackValue(
-			Annotation parameterAnnotation, Method method, int parameterIndex) {
-		Map<String, Object> annotationAttributes = AnnotationUtils
-				.getAnnotationAttributes(parameterAnnotation);
+	private Annotation synthesizeWithMethodParameterNameAsFallbackValue(Annotation parameterAnnotation, Method method,
+			int parameterIndex) {
+		Map<String, Object> annotationAttributes = AnnotationUtils.getAnnotationAttributes(parameterAnnotation);
 		Object defaultValue = AnnotationUtils.getDefaultValue(parameterAnnotation);
-		if (defaultValue instanceof String
-				&& defaultValue.equals(annotationAttributes.get(AnnotationUtils.VALUE))) {
+		if (defaultValue instanceof String && defaultValue.equals(annotationAttributes.get(AnnotationUtils.VALUE))) {
 			Type[] parameterTypes = method.getGenericParameterTypes();
 			String[] parameterNames = PARAMETER_NAME_DISCOVERER.getParameterNames(method);
 			if (shouldAddParameterName(parameterIndex, parameterTypes, parameterNames)) {
-				annotationAttributes.put(AnnotationUtils.VALUE,
-						parameterNames[parameterIndex]);
+				annotationAttributes.put(AnnotationUtils.VALUE, parameterNames[parameterIndex]);
 			}
 		}
-		return AnnotationUtils.synthesizeAnnotation(annotationAttributes,
-				parameterAnnotation.annotationType(), null);
+		return AnnotationUtils.synthesizeAnnotation(annotationAttributes, parameterAnnotation.annotationType(), null);
 	}

-	private boolean shouldAddParameterName(int parameterIndex, Type[] parameterTypes,
-			String[] parameterNames) {
+	private boolean shouldAddParameterName(int parameterIndex, Type[] parameterTypes, String[] parameterNames) {
 		// has a parameter name
 		return parameterNames != null && parameterNames.length > parameterIndex
 		// has a type
@@ -394,14 +386,12 @@ public class SpringMvcContract extends Contract.BaseContract
 	}

 	private boolean isMultipartFormData(MethodMetadata data) {
-		Collection<String> contentTypes = data.template().headers()
-				.get(HttpEncoding.CONTENT_TYPE);
+		Collection<String> contentTypes = data.template().headers().get(HttpEncoding.CONTENT_TYPE);

 		if (contentTypes != null && !contentTypes.isEmpty()) {
 			String type = contentTypes.iterator().next();
 			try {
-				return Objects.equals(MediaType.valueOf(type),
-						MediaType.MULTIPART_FORM_DATA);
+				return Objects.equals(MediaType.valueOf(type), MediaType.MULTIPART_FORM_DATA);
 			}
 			catch (InvalidMediaTypeException ignored) {
 				return false;
@@ -411,25 +401,6 @@ public class SpringMvcContract extends Contract.BaseContract
 		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;
@@ -440,23 +411,20 @@ public class SpringMvcContract extends Contract.BaseContract

 		Param.Expander getExpander(TypeDescriptor typeDescriptor) {
 			return value -> {
-				Object converted = conversionService.convert(value, typeDescriptor,
-						STRING_TYPE_DESCRIPTOR);
+				Object converted = conversionService.convert(value, typeDescriptor, STRING_TYPE_DESCRIPTOR);
 				return (String) converted;
 			};
 		}

 	}

-	private class SimpleAnnotatedParameterContext
-			implements AnnotatedParameterProcessor.AnnotatedParameterContext {
+	private class SimpleAnnotatedParameterContext implements AnnotatedParameterProcessor.AnnotatedParameterContext {

 		private final MethodMetadata methodMetadata;

 		private final int parameterIndex;

-		SimpleAnnotatedParameterContext(MethodMetadata methodMetadata,
-				int parameterIndex) {
+		SimpleAnnotatedParameterContext(MethodMetadata methodMetadata, int parameterIndex) {
 			this.methodMetadata = methodMetadata;
 			this.parameterIndex = parameterIndex;
 		}
@@ -477,8 +445,7 @@ public class SpringMvcContract extends Contract.BaseContract
 		}

 		@Override
-		public Collection<String> setTemplateParameter(String name,
-				Collection<String> rest) {
+		public Collection<String> setTemplateParameter(String name, Collection<String> rest) {
 			return addTemplateParameter(rest, name);
 		}

@@ -8,30 +8,12 @@
 			"description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
 			"defaultValue": "false"
 		},
-		{
-			"name": "feign.autoconfiguration.jackson.enabled",
-			"type": "java.lang.Boolean",
-			"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"
-		},
 		{
 			"name": "feign.httpclient.enabled",
 			"type": "java.lang.Boolean",
 			"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",
@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration,\
 org.springframework.cloud.openfeign.hateoas.FeignHalAutoConfiguration,\
 org.springframework.cloud.openfeign.FeignAutoConfiguration,\
 org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\
@@ -43,10 +43,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = DefaultGzipDecoderTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=defaultGzipDecoderTests",
-				"feign.compression.response.enabled=true",
-				"feign.compression.response.useGzipDecoder=true",
-				"feign.client.config.default.loggerLevel=full",
+		value = { "spring.application.name=defaultGzipDecoderTests", "feign.compression.response.enabled=true",
+				"feign.compression.response.useGzipDecoder=true", "feign.client.config.default.loggerLevel=full",
 				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
@DirtiesContext
 public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
@@ -71,20 +69,17 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 	public void testBodyDecompress() {
 		ResponseEntity<Hello> response = testClient().getGzipResponse();
 		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
+		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
 		Hello hello = response.getBody();
 		assertThat(hello).as("hello was null").isNotNull();
-		assertThat(hello).as("first hello didn't match")
-				.isEqualTo(new Hello("hello world via response"));
+		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world via response"));
 	}

 	@Test
 	public void testNullBodyDecompress() {
 		ResponseEntity<Hello> response = testClient().getNullResponse();
 		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
+		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
 		Hello hello = response.getBody();
 		assertThat(hello).as("hello was not null").isNull();
 		assertThat(hello).as("null hello didn't match").isEqualTo(null);
@@ -94,12 +89,10 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 	public void testCharsetDecompress() {
 		ResponseEntity<Hello> response = testClient().getUtf8Response();
 		assertThat(response).as("response was null").isNotNull();
-		assertThat(response.getStatusCode()).as("wrong status code")
-				.isEqualTo(HttpStatus.OK);
+		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
 		Hello hello = response.getBody();
 		assertThat(hello).as("hello was null").isNotNull();
-		assertThat(hello).as("utf8 hello didn't match")
-				.isEqualTo(new Hello("안녕하세요 means Hello in Korean"));
+		assertThat(hello).as("utf8 hello didn't match").isEqualTo(new Hello("안녕하세요 means Hello in Korean"));
 	}

 	private static class Hello {
@@ -21,12 +21,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -44,13 +42,11 @@ public class EnableFeignClientsSpringDataTests {
 	@Test
 	public void encoderDefaultCorrect() {

-		PageableSpringEncoder.class
-				.cast(this.feignContext.getInstance("foo", Encoder.class));
+		PageableSpringEncoder.class.cast(this.feignContext.getInstance("foo", Encoder.class));
 	}

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

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

 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.cloud.test.ClassPathExclusions;
@@ -88,7 +87,7 @@ public class EnableFeignClientsTests {
 	}

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

 	}
@@ -1,107 +0,0 @@
-/*
- * 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.hystrix.HystrixFeign;
-import org.assertj.core.api.Condition;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.FilteredClassLoader;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-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
- */
-class FeignAutoConfigurationTests {
-
-	private final ApplicationContextRunner runner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class));
-
-	@Test
-	void shouldInstantiateHystrixTargeterToMaintainBackwardsCompatibility() {
-		runner.run(ctx -> assertOnlyOneTargeterPresent(ctx, HystrixTargeter.class));
-	}
-
-	@Test
-	void shouldInstantiateHystrixTargeterWhenExplicitlyEnabled() {
-		runner.withPropertyValues("feign.hystrix.enabled=true")
-				.run(ctx -> assertOnlyOneTargeterPresent(ctx, HystrixTargeter.class));
-	}
-
-	@Test
-	void shouldInstantiateDefaultTargeterWhenHystrixIsDisabled() {
-		runner.withPropertyValues("feign.hystrix.enabled=false")
-				.run(ctx -> assertOnlyOneTargeterPresent(ctx, DefaultTargeter.class));
-	}
-
-	@Test
-	void shouldInstantiateDefaultTargeterWhenHystrixFeignClassIsMissing() {
-		runner.withPropertyValues("feign.hystrix.enabled=true")
-				.withClassLoader(new FilteredClassLoader(HystrixFeign.class))
-				.run(ctx -> assertOnlyOneTargeterPresent(ctx, DefaultTargeter.class));
-	}
-
-	@Test
-	void shouldInstantiateDefaultTargeterWhenHystrixFeignAndCircuitBreakerClassesAreMissing() {
-		runner.withPropertyValues("feign.hystrix.enabled=true",
-				"feign.circuitbreaker.enabled=true")
-				.withClassLoader(
-						new FilteredClassLoader(HystrixFeign.class, CircuitBreaker.class))
-				.run(ctx -> assertOnlyOneTargeterPresent(ctx, DefaultTargeter.class));
-	}
-
-	@Test
-	void shouldInstantiateDefaultTargeterWhenHystrixFeignClassIsMissingAndFeignCircuitBreakerIsDisabled() {
-		runner.withClassLoader(new FilteredClassLoader(HystrixFeign.class))
-				.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));
-	}
-
-	@Test
-	void shouldInstantiateFeignCircuitBreakerTargeterWhenBothHystrixAndCircuitBreakerAreEnabled() {
-		runner.withBean(CircuitBreakerFactory.class,
-				() -> mock(CircuitBreakerFactory.class))
-				.withPropertyValues("feign.hystrix.enabled=true",
-						"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-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Matt King
- * @author Sam Kruglov
 */
 public class FeignBuilderCustomizerTests {

@@ -42,8 +41,7 @@ public class FeignBuilderCustomizerTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration2.class);

-		FeignClientFactoryBean clientFactoryBean = context
-				.getBean(FeignClientFactoryBean.class);
+		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		FeignContext feignContext = context.getBean(FeignContext.class);

 		Feign.Builder builder = clientFactoryBean.feign(feignContext);
@@ -53,14 +51,12 @@ public class FeignBuilderCustomizerTests {
 		context.close();
 	}

-	private void assertFeignBuilderField(Feign.Builder builder, String fieldName,
-			Object expectedValue) {
+	private void assertFeignBuilderField(Feign.Builder builder, String fieldName, Object expectedValue) {
 		Field builderField = ReflectionUtils.findField(Feign.Builder.class, fieldName);
 		ReflectionUtils.makeAccessible(builderField);

 		Object value = ReflectionUtils.getField(builderField, builder);
-		assertThat(value).as("Expected value for the field '" + fieldName + "':")
-				.isEqualTo(expectedValue);
+		assertThat(value).as("Expected value for the field '" + fieldName + "':").isEqualTo(expectedValue);
 	}

 	@Test
@@ -68,8 +64,7 @@ public class FeignBuilderCustomizerTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);

-		FeignClientFactoryBean clientFactoryBean = context
-				.getBean(FeignClientFactoryBean.class);
+		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		FeignContext feignContext = context.getBean(FeignContext.class);

 		Feign.Builder builder = clientFactoryBean.feign(feignContext);
@@ -79,25 +74,6 @@ public class FeignBuilderCustomizerTests {
 		context.close();
 	}

-	@Test
-	public void testBuildCustomizerOrderedWithAdditional() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				FeignBuilderCustomizerTests.SampleConfiguration3.class);
-
-		FeignClientFactoryBean clientFactoryBean = context
-				.getBean(FeignClientFactoryBean.class);
-		clientFactoryBean.addCustomizer(builder -> builder.logLevel(Logger.Level.BASIC));
-		clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
-		FeignContext feignContext = context.getBean(FeignContext.class);
-
-		Feign.Builder builder = clientFactoryBean.feign(feignContext);
-		assertFeignBuilderField(builder, "logLevel", Logger.Level.BASIC);
-		assertFeignBuilderField(builder, "decode404", true);
-		assertFeignBuilderField(builder, "closeAfterDecode", false);
-
-		context.close();
-	}
-
 	private static FeignClientFactoryBean defaultFeignClientFactoryBean() {
 		FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
 		feignClientFactoryBean.setContextId("test");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-import feign.Feign;
-import feign.hystrix.FallbackFactory;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
@@ -41,7 +39,6 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Sven Döring
- * @author Sam Kruglov
 */
 public class FeignClientBuilderTests {

@@ -52,32 +49,23 @@ public class FeignClientBuilderTests {

 	private ApplicationContext applicationContext;

-	private static Object getDefaultValueFromFeignClientAnnotation(
-			final String methodName) {
+	private static Object getDefaultValueFromFeignClientAnnotation(final String methodName) {
 		final Method method = ReflectionUtils.findMethod(FeignClient.class, methodName);
 		return method.getDefaultValue();
 	}

-	private static void assertFactoryBeanField(final FeignClientBuilder.Builder builder,
-			final String fieldName, final Object expectedValue) {
-		final Object value = getFactoryBeanField(builder, fieldName);
-		assertThat(value).as("Expected value for the field '" + fieldName + "':")
-				.isEqualTo(expectedValue);
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> T getFactoryBeanField(final FeignClientBuilder.Builder builder,
-			final String fieldName) {
-		final Field factoryBeanField = ReflectionUtils
-				.findField(FeignClientBuilder.Builder.class, "feignClientFactoryBean");
+	private static void assertFactoryBeanField(final FeignClientBuilder.Builder builder, final String fieldName,
+			final Object expectedValue) {
+		final Field factoryBeanField = ReflectionUtils.findField(FeignClientBuilder.Builder.class,
+				"feignClientFactoryBean");
 		ReflectionUtils.makeAccessible(factoryBeanField);
-		final FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) ReflectionUtils
-				.getField(factoryBeanField, builder);
+		final FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) ReflectionUtils.getField(factoryBeanField,
+				builder);

-		final Field field = ReflectionUtils.findField(FeignClientFactoryBean.class,
-				fieldName);
+		final Field field = ReflectionUtils.findField(FeignClientFactoryBean.class, fieldName);
 		ReflectionUtils.makeAccessible(field);
-		return (T) ReflectionUtils.getField(field, factoryBean);
+		final Object value = ReflectionUtils.getField(field, factoryBean);
+		assertThat(value).as("Expected value for the field '" + fieldName + "':").isEqualTo(expectedValue);
 	}

 	@Before
@@ -92,9 +80,8 @@ public class FeignClientBuilderTests {
 		for (final Method method : FeignClient.class.getMethods()) {
 			methodNames.add(method.getName());
 		}
-		methodNames.removeAll(Arrays.asList("annotationType", "value", "serviceId",
-				"qualifier", "qualifiers", "configuration", "primary", "equals",
-				"hashCode", "toString"));
+		methodNames.removeAll(Arrays.asList("annotationType", "value", "serviceId", "qualifier", "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
@@ -102,45 +89,54 @@ public class FeignClientBuilderTests {
 		// on this builder class.
 		// (2) Or a new field was added and the builder class has to be extended with this
 		// new field.
-		assertThat(methodNames).containsExactly("contextId", "decode404", "fallback",
-				"fallbackFactory", "name", "path", "url");
+		assertThat(methodNames).containsExactly("contextId", "decode404", "fallback", "fallbackFactory", "name", "path",
+				"url");
 	}

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

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

 		// and:
-		assertFactoryBeanField(builder, "url",
-				getDefaultValueFromFeignClientAnnotation("url"));
-		assertFactoryBeanField(builder, "path",
-				getDefaultValueFromFeignClientAnnotation("path"));
-		assertFactoryBeanField(builder, "decode404",
-				getDefaultValueFromFeignClientAnnotation("decode404"));
-		assertFactoryBeanField(builder, "fallback",
-				getDefaultValueFromFeignClientAnnotation("fallback"));
-		assertFactoryBeanField(builder, "fallbackFactory",
-				getDefaultValueFromFeignClientAnnotation("fallbackFactory"));
+		assertFactoryBeanField(builder, "url", getDefaultValueFromFeignClientAnnotation("url"));
+		assertFactoryBeanField(builder, "path", getDefaultValueFromFeignClientAnnotation("path"));
+		assertFactoryBeanField(builder, "decode404", getDefaultValueFromFeignClientAnnotation("decode404"));
+		assertFactoryBeanField(builder, "fallback", getDefaultValueFromFeignClientAnnotation("fallback"));
+		assertFactoryBeanField(builder, "fallbackFactory", getDefaultValueFromFeignClientAnnotation("fallbackFactory"));
 	}

 	@Test
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
+		final FeignClientBuilder.Builder builder = this.feignClientBuilder.forType(TestFeignClient.class, "TestClient")
+				.decode404(true).url("Url/").path("/Path").contextId("TestContext");
+
+		// then:
+		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
+		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "name", "TestClient");
+		assertFactoryBeanField(builder, "contextId", "TestContext");
+
+		// and:
+		assertFactoryBeanField(builder, "url", "http://Url/");
+		assertFactoryBeanField(builder, "path", "/Path");
+		assertFactoryBeanField(builder, "decode404", true);
+
+	}
+
+	@Test
+	public void forType_clientFactoryBeanProvided() {
+		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").inheritParentContext(false)
-				.fallback(TestFeignClientFallback.class)
-				.fallbackFactory(TestFeignClientFallbackFactory.class).decode404(true)
-				.url("Url/").path("/Path").contextId("TestContext")
-				.customize(Feign.Builder::doNotCloseAfterDecode);
+				.forType(TestFeignClient.class, new FeignClientFactoryBean(), "TestClient").decode404(true)
+				.path("Path/").url("Url/").contextId("TestContext");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
@@ -152,28 +148,19 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "url", "http://Url/");
 		assertFactoryBeanField(builder, "path", "/Path");
 		assertFactoryBeanField(builder, "decode404", true);
-		assertFactoryBeanField(builder, "inheritParentContext", false);
-		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
-		assertFactoryBeanField(builder, "fallbackFactory",
-				TestFeignClientFallbackFactory.class);
-		List<FeignBuilderCustomizer> additionalCustomizers = getFactoryBeanField(builder,
-				"additionalCustomizers");
-		assertThat(additionalCustomizers).hasSize(1);
 	}

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

 		// expect: 'the build will fail right after calling build() with the mocked
 		// unusual exception'
@@ -185,18 +172,4 @@ public class FeignClientBuilderTests {

 	}

-	private class TestFeignClientFallback implements TestFeignClient {
-
-	}
-
-	private class TestFeignClientFallbackFactory
-			implements FallbackFactory<TestFeignClient> {
-
-		@Override
-		public TestFeignClientFallback create(Throwable throwable) {
-			return new TestFeignClientFallback();
-		}
-
-	}
-
 }
@@ -67,8 +67,7 @@ public class FeignClientErrorDecoderTests {

 	@Test
 	public void errorDecoderInConfiguration() {
-		assertThat(this.context.getInstance("foo", ErrorDecoder.class))
-				.isInstanceOf(ErrorDecoder.Default.class);
+		assertThat(this.context.getInstance("foo", ErrorDecoder.class)).isInstanceOf(ErrorDecoder.Default.class);
 		assertThat(this.context.getInstance("bar", ErrorDecoder.class)).isNull();
 	}

@@ -90,8 +89,7 @@ public class FeignClientErrorDecoderTests {
 		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
 				.getField(invocationHandler, "dispatch");
 		Method key = new ArrayList<>(dispatch.keySet()).get(0);
-		return ReflectionTestUtils.getField(
-				ReflectionTestUtils.getField(dispatch.get(key), "asyncResponseHandler"),
+		return ReflectionTestUtils.getField(ReflectionTestUtils.getField(dispatch.get(key), "asyncResponseHandler"),
 				"errorDecoder");
 	}

@@ -29,6 +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.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
@@ -52,8 +53,7 @@ public class FeignClientFactoryTests {
 		parent.refresh();
 		FeignContext context = new FeignContext();
 		context.setApplicationContext(parent);
-		context.setConfigurations(Arrays.asList(getSpec("foo", FooConfig.class),
-				getSpec("bar", BarConfig.class)));
+		context.setConfigurations(Arrays.asList(getSpec("foo", FooConfig.class), getSpec("bar", BarConfig.class)));

 		Foo foo = context.getInstance("foo", Foo.class);
 		assertThat(foo).as("foo was null").isNotNull();
@@ -67,8 +67,7 @@ public class FeignClientFactoryTests {

 	@Test
 	public void shouldRedirectToDelegateWhenUrlSet() {
-		new ApplicationContextRunner().withUserConfiguration(TestConfig.class)
-				.run(this::defaultClientUsed);
+		new ApplicationContextRunner().withUserConfiguration(TestConfig.class).run(this::defaultClientUsed);
 	}

 	@SuppressWarnings({ "unchecked", "ConstantConditions" })
@@ -98,15 +97,14 @@ public class FeignClientFactoryTests {

 		@Bean
 		BlockingLoadBalancerClient loadBalancerClient() {
-			return new BlockingLoadBalancerClient(new LoadBalancerClientFactory());
+			return new BlockingLoadBalancerClient(new LoadBalancerClientFactory(), new LoadBalancerProperties());
 		}

 		@Bean
 		FeignContext feignContext() {
 			FeignContext feignContext = new FeignContext();
-			feignContext.setConfigurations(
-					Collections.singletonList(new FeignClientSpecification("test",
-							new Class[] { LoadBalancerAutoConfiguration.class })));
+			feignContext.setConfigurations(Collections.singletonList(
+					new FeignClientSpecification("test", new Class[] { LoadBalancerAutoConfiguration.class })));
 			return feignContext;
 		}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,11 +16,8 @@

 package org.springframework.cloud.openfeign;

-import java.util.concurrent.TimeUnit;
-
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
-import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
@@ -31,29 +28,26 @@ import feign.auth.BasicAuthRequestInterceptor;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
 import feign.querymap.BeanQueryMapEncoder;
 import feign.slf4j.Slf4jLogger;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;

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

 /**
 * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignClientOverrideDefaultsTests.TestConfiguration.class)
@DirtiesContext
@@ -101,14 +95,12 @@ class FeignClientOverrideDefaultsTests {
 	@Test
 	void overrideLoggerLevel() {
 		assertThat(context.getInstance("foo", Logger.Level.class)).isNull();
-		assertThat(context.getInstance("bar", Logger.Level.class))
-				.isEqualTo(Logger.Level.HEADERS);
+		assertThat(context.getInstance("bar", Logger.Level.class)).isEqualTo(Logger.Level.HEADERS);
 	}

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

@@ -118,46 +110,34 @@ class FeignClientOverrideDefaultsTests {
 		ErrorDecoder.Default.class.cast(context.getInstance("bar", ErrorDecoder.class));
 	}

-	@Test
-	void overrideBuilder() {
-		HystrixFeign.Builder.class.cast(context.getInstance("foo", Feign.Builder.class));
-		Feign.Builder.class.cast(context.getInstance("bar", Feign.Builder.class));
-	}
-
 	@Test
 	void overrideRequestOptions() {
 		assertThat(context.getInstance("foo", Request.Options.class)).isNull();
 		Request.Options options = context.getInstance("bar", Request.Options.class);
 		assertThat(options.connectTimeoutMillis()).isEqualTo(1);
 		assertThat(options.readTimeoutMillis()).isEqualTo(1);
-		assertThat(options.isFollowRedirects()).isFalse();
 	}

 	@Test
 	void overrideQueryMapEncoder() {
-		QueryMapEncoder.Default.class
-				.cast(context.getInstance("foo", QueryMapEncoder.class));
+		QueryMapEncoder.Default.class.cast(context.getInstance("foo", QueryMapEncoder.class));
 		BeanQueryMapEncoder.class.cast(context.getInstance("bar", QueryMapEncoder.class));
 	}

 	@Test
 	void addRequestInterceptor() {
-		assertThat(context.getInstances("foo", RequestInterceptor.class).size())
-				.isEqualTo(1);
-		assertThat(context.getInstances("bar", RequestInterceptor.class).size())
-				.isEqualTo(2);
+		assertThat(context.getInstances("foo", RequestInterceptor.class).size()).isEqualTo(1);
+		assertThat(context.getInstances("bar", RequestInterceptor.class).size()).isEqualTo(2);
 	}

 	@Test
 	void exceptionPropagationPolicy() {
-		assertThat(context.getInstances("foo", ExceptionPropagationPolicy.class))
-				.isEmpty();
+		assertThat(context.getInstances("foo", ExceptionPropagationPolicy.class)).isEmpty();
 		assertThat(context.getInstances("bar", ExceptionPropagationPolicy.class))
 				.containsValues(ExceptionPropagationPolicy.UNWRAP);
 	}

-	@FeignClient(name = "foo", url = "https://foo",
-			configuration = FooConfiguration.class)
+	@FeignClient(name = "foo", url = "https://foo", configuration = FooConfiguration.class)
 	interface FooClient {

 		@RequestLine("GET /")
@@ -165,19 +145,17 @@ class FeignClientOverrideDefaultsTests {

 	}

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

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

 	}

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

 		@Bean
@@ -210,11 +188,6 @@ class FeignClientOverrideDefaultsTests {
 			return new Contract.Default();
 		}

-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new feign.QueryMapEncoder.Default();
@@ -241,8 +214,7 @@ class FeignClientOverrideDefaultsTests {

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

 		@Bean
@@ -26,10 +26,10 @@ 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;
@@ -49,26 +49,23 @@ 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 ConfigurableListableBeanFactory beanFactory;
+	private ApplicationContext applicationContext;

 	@Autowired
 	private FeignContext context;

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

-		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
-				"requestInterceptors");
+		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);
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set").isEqualTo(Logger.Level.FULL);
 	}

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

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

-		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
-				"requestInterceptors");
+		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder, "requestInterceptors");

 		assertThat(interceptors).as("interceptors not set").isEmpty();
-		assertThat(factoryBean.isInheritParentContext())
-				.as("is inheriting from parent configuration").isFalse();
+		assertThat(factoryBean.isInheritParentContext()).as("is inheriting from parent configuration").isFalse();
 	}

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

-		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set")
-				.isEqualTo(Logger.Level.HEADERS);
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set").isEqualTo(Logger.Level.HEADERS);
 	}

 	@EnableAutoConfiguration
@@ -143,8 +135,7 @@ public class FeignClientUsingConfigurerTest {

 	}

-	@FeignClient(name = "noInheritFeignClient",
-			configuration = NoInheritConfiguration.class)
+	@FeignClient(name = "noInheritFeignClient", configuration = NoInheritConfiguration.class)
 	interface NoInheritFeignClient {

 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -79,8 +79,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 */
@SuppressWarnings("FieldMayBeFinal")
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
-		webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -124,40 +123,32 @@ public class FeignClientUsingPropertiesTests {
 		formFactoryBean.setType(FeignClientFactoryBean.class);

 		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean = new FeignClientFactoryBean();
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.setContextId("singleValue");
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.setType(FeignClientFactoryBean.class);
+		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean.setContextId("singleValue");
+		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean.setType(FeignClientFactoryBean.class);

 		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean = new FeignClientFactoryBean();
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.setContextId("multipleValue");
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.setType(FeignClientFactoryBean.class);
+		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean.setContextId("multipleValue");
+		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean.setType(FeignClientFactoryBean.class);
 	}

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

 	public BarClient barClient() {
 		barFactoryBean.setApplicationContext(applicationContext);
-		return barFactoryBean.feign(context).target(BarClient.class,
-				"http://localhost:" + port);
+		return barFactoryBean.feign(context).target(BarClient.class, "http://localhost:" + port);
 	}

 	public UnwrapClient unwrapClient() {
 		unwrapFactoryBean.setApplicationContext(applicationContext);
-		return unwrapFactoryBean.feign(context).target(UnwrapClient.class,
-				"http://localhost:" + port);
+		return unwrapFactoryBean.feign(context).target(UnwrapClient.class, "http://localhost:" + port);
 	}

 	public FormClient formClient() {
 		formFactoryBean.setApplicationContext(applicationContext);
-		return formFactoryBean.feign(context).target(FormClient.class,
-				"http://localhost:" + port);
+		return formFactoryBean.feign(context).target(FormClient.class, "http://localhost:" + port);
 	}

 	@Test
@@ -194,23 +185,18 @@ public class FeignClientUsingPropertiesTests {
 	@Test
 	public void testMultipleValue() {
 		List<String> response = multipleValueClient().multipleValue();
-		assertThat(response).isEqualTo(
-				Arrays.asList("header1", "header2", "parameter1", "parameter2"));
+		assertThat(response).isEqualTo(Arrays.asList("header1", "header2", "parameter1", "parameter2"));
 	}

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

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

@@ -221,8 +207,8 @@ public class FeignClientUsingPropertiesTests {
 		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
 		readTimeoutFactoryBean.setApplicationContext(applicationContext);

-		TimeoutClient client = readTimeoutFactoryBean.feign(context)
-				.target(TimeoutClient.class, "http://localhost:" + port);
+		TimeoutClient client = readTimeoutFactoryBean.feign(context).target(TimeoutClient.class,
+				"http://localhost:" + port);

 		Request.Options options = getRequestOptions((Proxy) client);

@@ -237,8 +223,8 @@ public class FeignClientUsingPropertiesTests {
 		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
 		readTimeoutFactoryBean.setApplicationContext(applicationContext);

-		TimeoutClient client = readTimeoutFactoryBean.feign(context)
-				.target(TimeoutClient.class, "http://localhost:" + port);
+		TimeoutClient client = readTimeoutFactoryBean.feign(context).target(TimeoutClient.class,
+				"http://localhost:" + port);

 		Request.Options options = getRequestOptions((Proxy) client);

@@ -246,28 +232,12 @@ public class FeignClientUsingPropertiesTests {
 		assertThat(options.readTimeoutMillis()).isEqualTo(5000);
 	}

-	@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");
 		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
 				.getField(Objects.requireNonNull(invocationHandler), "dispatch");
 		Method key = new ArrayList<>(dispatch.keySet()).get(0);
-		return (Request.Options) ReflectionTestUtils.getField(dispatch.get(key),
-				"options");
+		return (Request.Options) ReflectionTestUtils.getField(dispatch.get(key), "options");
 	}

 	protected interface FooClient {
@@ -328,8 +298,7 @@ public class FeignClientUsingPropertiesTests {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
 		public String foo(HttpServletRequest request) throws IllegalAccessException {
-			if ("Foo".equals(request.getHeader("Foo"))
-					&& "Bar".equals(request.getHeader("Bar"))) {
+			if ("Foo".equals(request.getHeader("Foo")) && "Bar".equals(request.getHeader("Bar"))) {
 				return "OK";
 			}
 			else {
@@ -343,8 +312,7 @@ public class FeignClientUsingPropertiesTests {
 			return "OK";
 		}

-		@PostMapping(path = "/form",
-				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		@PostMapping(path = "/form", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		public String form(HttpServletRequest request) {
 			return request.getParameter("form");
 		}
@@ -352,16 +320,15 @@ public class FeignClientUsingPropertiesTests {
 		@GetMapping(path = "/singleValue")
 		public List<String> singleValue(@RequestHeader List<String> singleValueHeaders,
 				@RequestParam List<String> singleValueParameters) {
-			return Stream.of(singleValueHeaders, singleValueParameters)
-					.flatMap(Collection::stream).collect(Collectors.toList());
+			return Stream.of(singleValueHeaders, singleValueParameters).flatMap(Collection::stream)
+					.collect(Collectors.toList());
 		}

 		@GetMapping(path = "/multipleValue")
-		public List<String> multipleValue(
-				@RequestHeader List<String> multipleValueHeaders,
+		public List<String> multipleValue(@RequestHeader List<String> multipleValueHeaders,
 				@RequestParam List<String> multipleValueParameters) {
-			return Stream.of(multipleValueHeaders, multipleValueParameters)
-					.flatMap(Collection::stream).collect(Collectors.toList());
+			return Stream.of(multipleValueHeaders, multipleValueParameters).flatMap(Collection::stream)
+					.collect(Collectors.toList());
 		}

 	}
@@ -405,16 +372,14 @@ public class FeignClientUsingPropertiesTests {
 	public static class FormEncoder implements Encoder {

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

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

@@ -1,135 +0,0 @@
-/*
- * 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 {
-
-	}
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
buildmaster	3e7e74c5bf	Update SNAPSHOT to 3.0.0-RC1	2020-12-11 22:06:22 +00:00
Olga Maciaszek-Sharma	86551041d9	Adjust to changes in commons.	2020-12-10 17:15:26 +01:00
Olga Maciaszek-Sharma	35a5b8d614	Adjust to changes in commons.	2020-12-10 14:17:15 +01:00
Olga Maciaszek-Sharma	7047439624	Remove deprecations.	2020-12-09 19:38:04 +01:00
Olga Maciaszek-Sharma	5e61666f7c	Remove deprecations.	2020-12-09 18:49:54 +01:00
Olga Maciaszek-Sharma	e3810f1586	Adjust to changes in commons.	2020-12-09 15:22:10 +01:00
buildmaster	9bdda59fbb	Going back to snapshots	2020-12-01 22:47:14 +00:00
buildmaster	e257ec31ff	Update SNAPSHOT to 3.0.0-M6	2020-12-01 22:46:17 +00:00
Olga Maciaszek-Sharma	246805815f	Merge remote-tracking branch 'origin/2.2.x'	2020-12-01 17:30:47 +01:00
Olga Maciaszek-Sharma	15054fa37e	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/src/main/asciidoc/_configprops.adoc # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractIntegrationTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java	2020-12-01 17:22:59 +01:00
Olga Maciaszek-Sharma	b231783e84	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java	2020-11-30 19:17:55 +01:00
Olga Maciaszek-Sharma	a7c804db63	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignBuilderCustomizer.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2020-11-30 18:58:29 +01:00
buildmaster	4120ca2bc6	Bumping versions	2020-11-19 11:37:07 +00:00
buildmaster	29295425f3	Going back to snapshots	2020-11-17 20:42:04 +00:00
buildmaster	ef9ded650f	Update SNAPSHOT to 3.0.0-M5	2020-11-17 20:41:05 +00:00
buildmaster	3c25b010c3	Bumping versions	2020-11-17 11:37:02 +00:00
Olga Maciaszek-Sharma	f9a8dd13f2	Adjust to changes in security config.	2020-11-03 11:49:21 +01:00
Olga Maciaszek-Sharma	f6fdd63cef	Merge remote-tracking branch 'origin/master'	2020-11-03 11:47:36 +01:00
Olga Maciaszek-Sharma	410d0f29a3	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java	2020-11-03 11:47:30 +01:00
Olga Maciaszek-Sharma	82de713d06	Remove unnecessary test configuration.	2020-11-03 11:46:15 +01:00
Olga Maciaszek-Sharma	5e455ed14b	Adjust to changes in master.	2020-11-02 14:33:58 +01:00
Olga Maciaszek-Sharma	a3584a9cc8	Merge remote-tracking branch 'origin/2.2.x'	2020-11-02 14:30:54 +01:00
Olga Maciaszek-Sharma	ffb17a4552	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java	2020-10-29 16:54:47 +01:00
Olga Maciaszek-Sharma	20e2548a5d	Automatic reformat.	2020-10-28 18:39:20 +01:00
Olga Maciaszek-Sharma	d93defe1c1	Merge remote-tracking branch 'origin/2.2.x'	2020-10-28 18:37:15 +01:00
Olga Maciaszek-Sharma	db8d10a511	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # pom.xml	2020-10-28 17:53:01 +01:00
Olga Maciaszek-Sharma	6649c86be1	Support loadbalancer lifecycle (#418 ) * Add LoadBalancerLifecycle support. * Add info on SC LoadBalancer documentation.	2020-10-27 11:12:34 -05:00
Olga Maciaszek-Sharma	3f0c2850ee	Extract duplicate method to utility class.	2020-10-27 17:02:04 +01:00
Olga Maciaszek-Sharma	479e1ab743	Add info on SC LoadBalancer documentation.	2020-10-23 16:12:39 +02:00
Olga Maciaszek-Sharma	77a1367796	Add LoadBalancerLifecycle support.	2020-10-23 16:04:03 +02:00
buildmaster	89f8942dff	Going back to snapshots	2020-10-03 13:57:43 +00:00
buildmaster	d31ce6d428	Update SNAPSHOT to 3.0.0-M4	2020-10-03 13:56:37 +00:00
Olga Maciaszek-Sharma	3c3b9a5a14	Add support for passing hints to LoadBalancer. (#412 )	2020-10-02 17:15:20 +02:00
Olga Maciaszek-Sharma	582e4c0175	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java	2020-10-02 15:32:53 +02:00
Olga Maciaszek-Sharma	db3513b97b	Merge remote-tracking branch 'origin/2.2.x' Fixes gh-286. # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignLoadBalancer.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancer.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java	2020-10-02 15:15:43 +02:00
Olga Maciaszek-Sharma	1178739437	Merge remote-tracking branch 'origin/2.2.x'	2020-09-17 14:51:13 +02:00
Olga Maciaszek-Sharma	2d9f51a17f	Merge 2.2.x.	2020-09-17 14:09:15 +02:00
Olga Maciaszek-Sharma	faff6aef8a	Reformat with updated JavaFormat plugin version.	2020-09-17 13:54:45 +02:00
Olga Maciaszek-Sharma	80710a9f20	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2020-09-16 13:01:34 +02:00
Olga Maciaszek-Sharma	d41f041efc	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # pom.xml	2020-08-13 14:41:12 +02:00
Olga Maciaszek-Sharma	2f13eb4816	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2020-08-03 10:05:52 +02:00
Olga Maciaszek-Sharma	62aa76fb97	Merge remote-tracking branch 'origin/2.2.x'	2020-07-30 16:24:25 +02:00
buildmaster	5ce900828f	Going back to snapshots	2020-07-23 18:26:47 +00:00
buildmaster	48bb0cdba5	Update SNAPSHOT to 3.0.0-M3	2020-07-23 18:25:41 +00:00
spencergibb	dc5eef0125	Updates to new BlockingLoadBalancerClient constructor	2020-07-23 13:36:14 -04:00
Olga Maciaszek-Sharma	343f436b71	Merge remote-tracking branch 'origin/2.2.x'	2020-07-17 15:07:20 +02:00
Olga Maciaszek-Sharma	f184c3f293	Merge remote-tracking branch 'origin/2.2.x'	2020-07-14 17:38:50 +02:00
Olga Maciaszek-Sharma	f600140004	Merge remote-tracking branch 'origin/2.2.x'	2020-07-14 16:03:00 +02:00
Olga Maciaszek-Sharma	d07c229b0e	Merge remote-tracking branch 'origin/2.2.x'	2020-07-14 15:20:23 +02:00
Olga Maciaszek-Sharma	84cb74a898	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java	2020-07-13 17:23:49 +02:00
Ryan Baxter	9677353c27	Fixing broken tests	2020-07-09 11:13:05 -04:00
spencergibb	4766d95def	Adds junit-vintage-engine	2020-06-15 16:40:29 -04:00
Marcin Grzejszczak	bba3f2e92c	Updated props	2020-06-08 17:54:58 +02:00
Marcin Grzejszczak	c4fd4eb42e	Changed packaging to jar	2020-06-08 17:12:15 +02:00
Marcin Grzejszczak	b56a4a1259	Uploading sources for docs	2020-06-08 16:48:07 +02:00
Olga Maciaszek-Sharma	4a4da0e2d1	Merge remote-tracking branch 'origin/2.2.x'	2020-06-05 18:27:15 +02:00
Olga Maciaszek-Sharma	efca091fda	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # pom.xml	2020-06-05 16:30:27 +02:00
Olga Maciaszek-Sharma	2e2987e787	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/src/main/asciidoc/spring-cloud-openfeign.adoc	2020-06-04 14:59:17 +02:00
Olga Maciaszek-Sharma	7cd7ed5c70	Merge remote-tracking branch 'origin/master'	2020-06-04 13:40:57 +02:00
Olga Maciaszek-Sharma	5a6a75d22b	Merge 2.2.x.	2020-06-04 13:40:24 +02:00
buildmaster	a790386732	Bumping versions	2020-06-04 11:37:17 +00:00
buildmaster	fa5162c2fc	Going back to snapshots	2020-05-29 18:40:30 +00:00
buildmaster	6d3181e718	Update SNAPSHOT to 3.0.0-M2	2020-05-29 18:39:55 +00:00
buildmaster	d0278f63b1	Bumping versions	2020-05-28 11:37:14 +00:00
Olga Maciaszek-Sharma	39e915e568	Merge remote-tracking branch 'origin/2.2.x'	2020-05-27 20:14:30 +02:00
buildmaster	e03d7da36d	Bumping versions	2020-05-27 11:37:14 +00:00
Marcin Grzejszczak	dcd5a56c86	Setting up repository for docs.spring.io migration	2020-05-25 14:39:49 +02:00
Marcin Grzejszczak	d492fe0742	Setting up repository for docs.spring.io migration	2020-05-25 13:42:33 +02:00
buildmaster	c9fe3af3ef	Bumping versions	2020-05-22 11:37:15 +00:00
Olga Maciaszek-Sharma	afb0b436c0	Merge remote-tracking branch 'origin/2.2.x'	2020-05-14 12:16:01 +02:00
spencergibb	f857cca5b3	Merge branch '2.2.x'	2020-05-13 15:29:43 -04:00
Olga Maciaszek-Sharma	94ad7066a6	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java	2020-05-11 13:39:15 +02:00
Olga Maciaszek-Sharma	1b66594ed4	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/HystrixTargeter.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/CachingSpringLoadBalancerFactory.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignLoadBalancer.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRetryPolicy.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancer.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/RibbonResponseStatusCodeException.java # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FallbackCommand.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryDisabledTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryEnabledTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/ProxyUsernameController.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameController.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/CachingSpringLoadBalancerFactoryTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignLoadBalancerTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancerTests.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/RibbonResponseStatusCodeExceptionTest.java	2020-05-11 13:27:20 +02:00
Olga Maciaszek-Sharma	9a335536bc	Update copyright comments dates.	2020-04-21 16:59:54 +02:00
buildmaster	6ac428b21c	Bumping versions	2020-04-17 02:55:34 +00:00
Spencer Gibb	30eafcd02d	Removes dep mgmt for netflix	2020-04-16 22:51:51 -04:00
Olga Maciaszek-Sharma	147136b85b	Remove elements that are no longer valid from tests.	2020-04-16 14:10:09 +02:00
matt62king	45589b7977	exposed client factory bean and targeter (#282 )	2020-04-16 13:50:36 +02:00
matt62king	f4b49d5542	add customizer for feign builder (#289 ) * add customizer for feign builder * support @Order for customizers * switch to annotation aware comparator for @Order support * remove intermediate instances * removed default feign builder customizer	2020-04-15 13:55:27 +02:00
Olga Maciaszek-Sharma	a6b5663c69	Merge branch '2.2.x' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/ValidFeignClientTests.java	2020-04-14 16:47:36 +02:00
Ryan Baxter	8f421ced21	Merge remote-tracking branch 'origin/2.2.x'	2020-04-13 16:59:00 -04:00
buildmaster	78653c3e8e	Going back to snapshots	2020-04-09 22:28:42 +00:00
buildmaster	1f3ee5cfec	Update SNAPSHOT to 3.0.0.M1	2020-04-09 22:28:08 +00:00
Marcin Grzejszczak	e4a8b0a6a6	Updated docs	2020-04-01 13:43:38 +02:00
Olga Maciaszek-Sharma	c87e5f2dbf	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/src/main/asciidoc/spring-cloud-openfeign.adoc	2020-03-27 13:04:51 +01:00
nekkiy	0afb60a72a	Fix double @RequestMapping with empty value (#245 ) * Fix double @RequestMapping with empty value * Fix code style * Fix for review * add author to SpringMvcContract * split SpringMvcContractTests#testDoubleRequestMapping() test	2020-03-27 11:58:26 +01:00
Olga Maciaszek-Sharma	a77bd2bdf1	Remove unnecessary exception clause.	2020-03-24 17:17:25 +01:00
Olga Maciaszek-Sharma	56bee946d8	Merge remote-tracking branch 'origin/2.2.x'	2020-03-24 17:13:36 +01:00
Olga Maciaszek-Sharma	90181f34c0	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2020-03-20 20:05:09 +01:00
Olga Maciaszek-Sharma	6b9be3f513	Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2020-03-20 20:02:12 +01:00
Olga Maciaszek-Sharma	efe264d2bb	Adjust to ribbon changes in commons (#300 ) * Adjust to Ribbon changes in commons. * Switch to using LoadBalancerClient bean instead of BlockingLoadBalancerClient bean following changes in commons. Remove references of Ribbon from docs and javadocs.	2020-02-22 14:11:30 +01:00
Olga Maciaszek-Sharma	ffa18c4346	Fix after merge.	2020-02-05 14:59:35 +01:00
Olga Maciaszek-Sharma	d6e1a9f6a1	Merge branch '2.2.x' # Conflicts: # spring-cloud-openfeign-core/.flattened-pom.xml # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/.flattened-pom.xml	2020-02-05 14:41:11 +01:00
Ryan Baxter	a2e968465a	Merge remote-tracking branch 'origin/2.2.x'	2020-01-29 11:00:53 -05:00
Ryan Baxter	6b656195ce	Merge remote-tracking branch 'origin/2.2.x'	2020-01-29 10:39:48 -05:00
buildmaster	186711914a	Bumping versions	2020-01-24 11:37:05 +00:00
Spencer Gibb	569dd54ccc	Moves multipart tests and un-ignores them. fixes gh-287	2020-01-23 16:12:06 -05:00
Spencer Gibb	91895278bf	Renames test classes to be unique	2020-01-23 16:08:58 -05:00
Spencer Gibb	8683a04048	Moves multipart tests and un-ignores them. fixes gh-287	2020-01-23 16:07:30 -05:00
Spencer Gibb	7c531d9dae	Restores ignored tests. fixes gh-280	2020-01-23 15:46:12 -05:00
Olga Maciaszek-Sharma	487390fc20	Merge branch '2.2.x' # Conflicts: # spring-cloud-openfeign-core/.flattened-pom.xml # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/.flattened-pom.xml	2020-01-23 15:33:04 +01:00
Olga Maciaszek-Sharma	c187ff8792	Merge remote-tracking branch 'origin/master' # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java	2020-01-23 15:09:14 +01:00
Spencer Gibb	826c9e9699	Makes constuctor public	2020-01-22 16:55:35 -05:00
Spencer Gibb	87ebb3cbdf	Removes ribbon from auto config	2020-01-22 12:51:07 -05:00
Spencer Gibb	14a43f976d	Merge branch 'master' of github.com:spring-cloud/spring-cloud-openfeign	2020-01-21 12:41:37 -05:00
Spencer Gibb	08f0fe4ae1	Ignores broken tests. See gh-280	2020-01-21 12:40:22 -05:00
Spencer Gibb	8a08e1ec4b	Removes ribbon and hystrix support	2020-01-17 19:28:33 -05:00
Spencer Gibb	bf1a5e6d33	Merge branch '2.2.x'	2020-01-17 18:59:33 -05:00
Spencer Gibb	5560bc19be	ignores .flattened-pom.xml	2020-01-17 18:59:24 -05:00
Spencer Gibb	36fd5d7755	removes .flattened-pom.xml	2020-01-17 18:58:51 -05:00
Spencer Gibb	3b191bcb9e	Updates version to 3.0.0.BUILD-SNAPSHOT	2020-01-17 18:58:05 -05:00