Bumping versions

Adjust to changes in commons.
Merge remote-tracking branch 'origin/3.1.x'
2022-09-11 23:33:49 +00:00 · 2022-09-05 16:50:00 +02:00 · 2022-09-05 16:43:41 +02:00 · 2022-09-05 16:37:12 +02:00 · 2022-09-02 23:46:06 +00:00 · 2022-09-02 23:46:05 +00:00
250 changed files with 20789 additions and 8929 deletions
@@ -1,39 +0,0 @@
 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
    resource_class: large
    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
@@ -0,0 +1,14 @@
 # EditorConfig is awesome: https://EditorConfig.org
 # top-most EditorConfig file
 root = true
 [*]
 indent_style = tab
 indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 [*.yml]
 indent_style = space
 indent_size = 2
@@ -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 master. If you want
+tracker for issues and merging pull requests into main. 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/master/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/main/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,8 +27,8 @@ 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/master/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/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
-  [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
+  [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
  for.
@@ -38,8 +38,8 @@ 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 master (or
+* If no-one else is using your branch, please rebase it against the current main (or
  other target branch in the main project).
-* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+* 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
  message (where XXXX is the issue number).
@@ -0,0 +1,17 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
 ---
 **Describe the bug**
 Please provide details of the problem, including the version of Spring Cloud that you
 are using. 
 **Sample**
 If possible, please provide a test case or sample application that reproduces
 the problem. This makes it much easier for us to diagnose the problem and to verify that
 we have fixed it.
@@ -0,0 +1,20 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
 ---
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 **Additional context**
 Add any other context or screenshots about the feature request here.
@@ -0,0 +1,33 @@
 # 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: [ main ]
  pull_request:
    branches: [ main ]
 jobs:
  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
        java: ["17"]
    steps:
      - uses: actions/checkout@v2
      - name: Set up JDK ${{ matrix.java }}
        uses: actions/setup-java@v2
        with:
          distribution: 'zulu'
          java-version: ${{ matrix.java }}
          cache: 'maven'
      - name: Build with Maven
        run: ./mvnw clean install -B -U -P sonar
      - uses: codecov/codecov-action@v1
        with:
          fail_ci_if_error: true
@@ -18,3 +18,6 @@ _site/
 .shelf
 *.swp
 *.swo
 .vscode/
 .flattened-pom.xml
@@ -0,0 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
 java=17.0.1-tem
@@ -1,66 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <servers>
+	<servers>
-	<server>
+		<server>
-	  <id>repo.spring.io</id>
+			<id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
+			<username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
+			<password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
+		</server>
-  </servers>
+	</servers>
-  <profiles>
+	<profiles>
-	<profile>
+		<profile>
-      <!--
+			<!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
+				N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
+				It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
+				a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
+				this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
+			-->
-	  <id>spring</id>
+			<id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
+			<activation>
-	  <repositories>
+				<activeByDefault>true</activeByDefault>
-		<repository>
+			</activation>
-			<id>spring-snapshots</id>
+			<repositories>
-			<name>Spring Snapshots</name>
+				<repository>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
+					<id>spring-snapshots</id>
-			<snapshots>
+					<name>Spring Snapshots</name>
-				<enabled>true</enabled>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
-			</snapshots>
+					<snapshots>
-		</repository>
+						<enabled>true</enabled>
-		<repository>
+					</snapshots>
-			<id>spring-milestones</id>
+				</repository>
-			<name>Spring Milestones</name>
+				<repository>
-			<url>http://repo.spring.io/libs-milestone-local</url>
+					<id>spring-milestones</id>
-			<snapshots>
+					<name>Spring Milestones</name>
-				<enabled>false</enabled>
+					<url>https://repo.spring.io/libs-milestone-local</url>
-			</snapshots>
+					<snapshots>
-		</repository>
+						<enabled>false</enabled>
-		<repository>
+					</snapshots>
-			<id>spring-releases</id>
+				</repository>
-			<name>Spring Releases</name>
+				<repository>
-			<url>http://repo.spring.io/release</url>
+					<id>spring-releases</id>
-			<snapshots>
+					<name>Spring Releases</name>
-				<enabled>false</enabled>
+					<url>https://repo.spring.io/release</url>
-			</snapshots>
+					<snapshots>
-		</repository>
+						<enabled>false</enabled>
-	  </repositories>
+					</snapshots>
-	  <pluginRepositories>
+				</repository>
-		<pluginRepository>
+			</repositories>
-			<id>spring-snapshots</id>
+			<pluginRepositories>
-			<name>Spring Snapshots</name>
+				<pluginRepository>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
+					<id>spring-snapshots</id>
-			<snapshots>
+					<name>Spring Snapshots</name>
-				<enabled>true</enabled>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
-			</snapshots>
+					<snapshots>
-		</pluginRepository>
+						<enabled>true</enabled>
-		<pluginRepository>
+					</snapshots>
-			<id>spring-milestones</id>
+				</pluginRepository>
-			<name>Spring Milestones</name>
+				<pluginRepository>
-			<url>http://repo.spring.io/libs-milestone-local</url>
+					<id>spring-milestones</id>
-			<snapshots>
+					<name>Spring Milestones</name>
-				<enabled>false</enabled>
+					<url>https://repo.spring.io/libs-milestone-local</url>
-			</snapshots>
+					<snapshots>
-		</pluginRepository>
+						<enabled>false</enabled>
-	  </pluginRepositories>
+					</snapshots>
-    </profile>
+				</pluginRepository>
-  </profiles>
+			</pluginRepositories>
 		</profile>
 	</profiles>
 </settings>
@@ -1,7 +1,7 @@
                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
+       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,
@@ -1,11 +1,35 @@
-// Do not edit this file (e.g. go instead to src/main/asciidoc)
+////
 DO NOT EDIT THIS FILE. IT WAS GENERATED.
 Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////
 image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]
-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://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
 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://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
 :doctype: book
 :idprefix:
 :idseparator: -
 :toc: left
 :toclevels: 4
 :tabsize: 4
 :numbered:
 :sectanchors:
 :sectnums:
 :icons: font
 :hide-uri-scheme:
 :docinfo: shared,private
 :sc-ext: java
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}
 :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.
@@ -16,7 +40,8 @@ and binding to the Spring Environment and other Spring programming model idioms.
 == Building
-:jdkversion: 1.8
+
 :jdkversion: 17
 === Basic Compile and Test
@@ -42,23 +67,9 @@ 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.
-For hints on how to build the project look in `.travis.yml` if there
+The projects that require middleware (i.e. Redis) for testing generally
-is one. There should be a "script" and maybe "install" command. Also
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
 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
 http://compose.docker.io/[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
@@ -73,13 +84,18 @@ a modified file in the correct place. Just commit it and push the change.
 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.
 ==== Activate the Spring Maven profile
 Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
 the spring milestone and snapshot repositories. Use your preferred IDE to set this
 profile to be active, or you may experience build errors.
 ==== Importing into eclipse with m2eclipse
-We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".
@@ -108,6 +124,8 @@ from the `file` menu.
 == Contributing
 :spring-cloud-build-branch: master
 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 master. If you want
@@ -136,7 +154,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] 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
@@ -149,6 +167,194 @@ added after the original pull request but before a merge.
 * 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 master (or
  other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
+  message (where XXXX is the issue number).
 === Checkstyle
 Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
 .spring-cloud-build-tools/
 ----
 └── src
    ├── checkstyle
    │   └── checkstyle-suppressions.xml <3>
    └── main
        └── resources
            ├── checkstyle-header.txt <2>
            └── checkstyle.xml <1>
 ----
 <1> Default Checkstyle rules
 <2> File header setup
 <3> Default suppression rules
 ==== Checkstyle configuration
 Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
 .pom.xml
 ----
 <properties>
 <maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
        <maven-checkstyle-plugin.failsOnViolation>true
        </maven-checkstyle-plugin.failsOnViolation> <2>
        <maven-checkstyle-plugin.includeTestSourceDirectory>true
        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
 </properties>
 <build>
        <plugins>
            <plugin> <4>
                <groupId>io.spring.javaformat</groupId>
                <artifactId>spring-javaformat-maven-plugin</artifactId>
            </plugin>
            <plugin> <5>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
            </plugin>
        </plugins>
    <reporting>
        <plugins>
            <plugin> <5>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
            </plugin>
        </plugins>
    </reporting>
 </build>
 ----
 <1> Fails the build upon Checkstyle errors
 <2> Fails the build upon Checkstyle violations
 <3> Checkstyle analyzes also the test sources
 <4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
 <5> Add checkstyle plugin to your build and reporting phases
 If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
 .projectRoot/src/checkstyle/checkstyle-suppresions.xml
 ----
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
 		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
 </suppressions>
 ----
 It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
 ```bash
 $ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
 $ touch .springformat
 ```
 === IDE setup
 ==== Intellij IDEA
 In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
 The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
 .spring-cloud-build-tools/
 ----
 └── src
    ├── checkstyle
    │   └── checkstyle-suppressions.xml <3>
    └── main
        └── resources
            ├── checkstyle-header.txt <2>
            ├── checkstyle.xml <1>
            └── intellij
                ├── Intellij_Project_Defaults.xml <4>
                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
 ----
 <1> Default Checkstyle rules
 <2> File header setup
 <3> Default suppression rules
 <4> Project defaults for Intellij that apply most of Checkstyle rules
 <5> Project style conventions for Intellij that apply most of Checkstyle rules
 .Code style
 image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
 Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
 .Inspection profiles
 image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
 Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
 .Checkstyle
 To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
 image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
 Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
 - `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
 IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
 === Duplicate Finder
 Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
 ==== Duplicate Finder configuration
 Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
 .pom.xml
 [source,xml]
 ----
 <build>
    <plugins>
        <plugin>
            <groupId>org.basepom.maven</groupId>
            <artifactId>duplicate-finder-maven-plugin</artifactId>
        </plugin>
    </plugins>
 </build>
 ----
 For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
 You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
 If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
 [source,xml]
 ----
 <build>
    <plugins>
        <plugin>
            <groupId>org.basepom.maven</groupId>
            <artifactId>duplicate-finder-maven-plugin</artifactId>
            <configuration>
                <ignoredClassPatterns>
                    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
                    <ignoredClassPattern>.*module-info</ignoredClassPattern>
                </ignoredClassPatterns>
                <ignoredResourcePatterns>
                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
                </ignoredResourcePatterns>
            </configuration>
        </plugin>
    </plugins>
 </build>
 ----
 == License
 The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/main/LICENSE.txt[here].
@@ -1,58 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.M2</version>
+		<version>4.0.0-SNAPSHOT</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>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.0.x</docs.whitelisted.branches>
+		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
 	<build>
-		<plugins>
+		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>pl.project13.maven</groupId>
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.asciidoctor</groupId>
+						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<artifactId>maven-resources-plugin</artifactId>
 						<inherited>false</inherited>
 					</plugin>
 					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
+						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId>
+						<artifactId>exec-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 						<inherited>false</inherited>
 					</plugin>
 					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
 						<artifactId>build-helper-maven-plugin</artifactId>
 						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>
@@ -1,9 +1,11 @@
-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://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
-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://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://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
 include::_attributes.adoc[]
 include::intro.adoc[]
 == Features
@@ -12,8 +14,12 @@ include::intro.adoc[]
 == Building
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[]
 == Contributing
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+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].
@@ -0,0 +1,18 @@
 :doctype: book
 :idprefix:
 :idseparator: -
 :toc: left
 :toclevels: 4
 :tabsize: 4
 :numbered:
 :sectanchors:
 :sectnums:
 :icons: font
 :hide-uri-scheme:
 :docinfo: shared,private
 :sc-ext: java
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}
 :core_path: {project-root}/spring-cloud-openfeign-core
@@ -0,0 +1,37 @@
 |===
 |Name | Default | Description
 |spring.cloud.openfeign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
 |spring.cloud.openfeign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
 |spring.cloud.openfeign.circuitbreaker.group.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.
 |spring.cloud.openfeign.client.config |  | 
 |spring.cloud.openfeign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
 |spring.cloud.openfeign.client.default-config | `default` | 
 |spring.cloud.openfeign.client.default-to-properties | `true` | 
 |spring.cloud.openfeign.client.refresh-enabled | `false` | Enables options value refresh capability for Feign.
 |spring.cloud.openfeign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed.
 |spring.cloud.openfeign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
 |spring.cloud.openfeign.compression.request.min-request-size | `2048` | The minimum threshold content size.
 |spring.cloud.openfeign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
 |spring.cloud.openfeign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
 |spring.cloud.openfeign.httpclient.connection-timeout | `2000` | 
 |spring.cloud.openfeign.httpclient.connection-timer-repeat | `3000` | 
 |spring.cloud.openfeign.httpclient.disable-ssl-validation | `false` | 
 |spring.cloud.openfeign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign.
 |spring.cloud.openfeign.httpclient.follow-redirects | `true` | 
 |spring.cloud.openfeign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
 |spring.cloud.openfeign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
 |spring.cloud.openfeign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
 |spring.cloud.openfeign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
 |spring.cloud.openfeign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
 |spring.cloud.openfeign.httpclient.max-connections | `200` | 
 |spring.cloud.openfeign.httpclient.max-connections-per-route | `50` | 
 |spring.cloud.openfeign.httpclient.ok-http.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
 |spring.cloud.openfeign.httpclient.time-to-live | `900` | 
 |spring.cloud.openfeign.httpclient.time-to-live-unit |  | 
 |spring.cloud.openfeign.metrics.enabled | `true` | Enables metrics capability for Feign.
 |spring.cloud.openfeign.oauth2.enabled | `false` | Enables feign interceptor for managing oauth2 access token.
 |spring.cloud.openfeign.oauth2.load-balanced | `false` | Enables load balancing for oauth2 access token provider.
 |spring.cloud.openfeign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
 |===
@@ -0,0 +1,14 @@
 :numbered!:
 [appendix]
 [[common-application-properties]]
 == Common application properties
 include::_attributes.adoc[]
 Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
 This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
 NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
 Also, you can define your own properties.
 include::_configprops.adoc[]
@@ -39,8 +39,8 @@ function check_if_anything_to_sync() {
 }
 function retrieve_current_branch() {
-    # Code getting the name of the current branch. For master we want to publish as we did until now
+    # Code getting the name of the current branch. For main we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # 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}
    if [[ -z "${CURRENT_BRANCH}" ]] ; then
@@ -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}" == "master" ]] ; then
+    if [[ "${CURRENT_BRANCH}" == "main" ]] ; then
-        echo -e "Current branch is master - will copy the current docs only to the root folder"
+        echo -e "Current branch is main - 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
@@ -147,7 +147,7 @@ function copy_docs_for_current_version() {
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
@@ -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 master locally.
+        # the gh-pages branch whenever you commit to main 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 master branch the generated docs are copied to the root of gh-pages branch
+- for main 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
@@ -0,0 +1 @@
 include::spring-cloud-openfeign.adoc[]
@@ -0,0 +1,41 @@
 This project provides https://github.com/OpenFeign/feign[OpenFeign] integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms.
 ## Features
 * Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 ## Getting Started
 ```java
@SpringBootApplication
@EnableFeignClients
 public class WebApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(WebApplication.class, args);
 	}
 	@FeignClient("name")
 	static interface NameService {
 		@RequestMapping("/")
 		public String getName();
 	}
 }
 ```
 ## 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.
@@ -1,11 +1,5 @@
 :github-tag: master
 :github-repo: spring-cloud/spring-cloud-openfeign
 :github-raw: http://raw.github.com/{github-repo}/{github-tag}
 :github-code: http://github.com/{github-repo}/tree/{github-tag}
 :all: {asterisk}{asterisk}
 :nofooter:
 :branch: master
 = Spring Cloud OpenFeign
 include::_attributes.adoc[]
 *{spring-cloud-version}*
@@ -15,13 +9,19 @@ include::intro.adoc[]
 [[spring-cloud-feign]]
 == Declarative REST Client: Feign
-https://github.com/Netflix/feign[Feign] is a declarative web service client.  It makes writing web service clients easier.  To use Feign create an interface and annotate it.  It has pluggable annotation support including Feign annotations and JAX-RS annotations. Feign also supports pluggable encoders and decoders.  Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.  Spring Cloud integrates Ribbon and Eureka to provide a load balanced http client when using Feign.
+https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
 It makes writing web service clients easier.
 To use Feign create an interface and annotate it.
 It has pluggable annotation support including Feign annotations and JAX-RS annotations.
 Feign also supports pluggable encoders and decoders.
 Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
 Spring Cloud integrates Eureka, Spring Cloud CircuitBreaker, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
 [[netflix-feign-starter]]
 === How to Include Feign
 To include Feign in your project use the starter with group `org.springframework.cloud`
-and artifact id `spring-cloud-starter-openfeign`. See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page]
+and artifact id `spring-cloud-starter-openfeign`. See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page]
 for details on setting up your build system with the current Spring Cloud Release Train.
 Example spring boot app
@@ -32,9 +32,9 @@ Example spring boot app
@EnableFeignClients
 public class Application {
-    public static void main(String[] args) {
+	public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+		SpringApplication.run(Application.class, args);
-    }
+	}
 }
 ----
@@ -44,35 +44,47 @@ public class Application {
 ----
@FeignClient("stores")
 public interface StoreClient {
-    @RequestMapping(method = RequestMethod.GET, value = "/stores")
+	@RequestMapping(method = RequestMethod.GET, value = "/stores")
-    List<Store> getStores();
+	List<Store> getStores();
-    @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
+	@RequestMapping(method = RequestMethod.GET, value = "/stores")
-    Store update(@PathVariable("storeId") Long storeId, Store store);
+	Page<Store> getStores(Pageable pageable);
 	@RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
 	Store update(@PathVariable("storeId") Long storeId, Store store);
 	@RequestMapping(method = RequestMethod.DELETE, value = "/stores/{storeId:\\d+}")
 	void delete(@PathVariable Long storeId);
 }
 ----
-In the `@FeignClient` annotation the String value ("stores" above) is
+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/main/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java[Spring Cloud LoadBalancer client].
-an arbitrary client name, which is used to create a Ribbon load
+You can also specify a URL using the `url` attribute
 balancer (see <<spring-cloud-ribbon,below for details of Ribbon
 support>>). You can also specify a URL using the `url` attribute
 (absolute value or just a hostname). The name of the bean in the
 application context is the fully qualified name of the interface.
-To specify your own alias value you can use the `qualifier` value
+To specify your own alias value you can use the `qualifiers` value
 of the `@FeignClient` annotation.
-The Ribbon client above will want to discover the physical addresses
+The load-balancer client above will want to discover the physical addresses
 for the "stores" service. If your application is a Eureka client then
 it will resolve the service in the Eureka service registry. If you
-don't want to use Eureka, you can simply configure a list of servers
+don't want to use Eureka, you can configure a list of servers
-in your external configuration (see
+in your external configuration using https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
-<<spring-cloud-ribbon-without-eureka,above for example>>).
+
 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].
 TIP: To use `@EnableFeignClients` annotation on `@Configuration`-annotated-classes, make sure to specify where the clients are located, for example:
 `@EnableFeignClients(basePackages = "com.example.clients")`
 or list them explicitly:
 `@EnableFeignClients(clients = InventoryServiceFeignClient.class)`
 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
 A central concept in Spring Cloud's Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
 `ApplicationContext` on demand for each named client using `FeignClientsConfiguration`. This contains (amongst other things) an `feign.Decoder`, a `feign.Encoder`, and a `feign.Contract`.
 It is possible to override the name of that ensemble by using the `contextId`
 attribute of the `@FeignClient` annotation.
 Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:
@@ -80,7 +92,7 @@ Spring Cloud lets you take full control of the feign client by declaring additio
 ----
@FeignClient(name = "stores", configuration = FooConfiguration.class)
 public interface StoreClient {
-    //..
+	//..
 }
 ----
@@ -88,7 +100,9 @@ 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.
 WARNING: Previously, using the `url` attribute, did not require the `name` attribute. Using `name` is now required.
@@ -98,23 +112,28 @@ Placeholders are supported in the `name` and `url` attributes.
 ----
@FeignClient(name = "${feign.name}", url = "${feign.url}")
 public interface StoreClient {
-    //..
+	//..
 }
 ----
-Spring Cloud Netflix provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
+Spring Cloud OpenFeign provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
 * `Decoder` feignDecoder: `ResponseEntityDecoder` (which wraps a `SpringDecoder`)
 * `Encoder` feignEncoder: `SpringEncoder`
 * `Logger` feignLogger: `Slf4jLogger`
 * `MicrometerCapability` micrometerCapability: If `feign-micrometer` is on the classpath and `MeterRegistry` is available
 * `CachingCapability` cachingCapability: If `@EnableCaching` annotation is used. Can be disabled via `spring.cloud.openfeign.cache.enabled`.
 * `Contract` feignContract: `SpringMvcContract`
-* `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
+* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
-* `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used.
+* `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
 If none of them is on the classpath, the default feign client is used.
-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.
+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.
 You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `OkHttpClient` when using OK HTTP.
-Spring Cloud Netflix _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:
+The OkHttpClient and ApacheHttpClient and ApacheHC5 feign clients can be used by setting `spring.cloud.openfeign.okhttp.enabled` or `spring.cloud.openfeign.httpclient.enabled` or `spring.cloud.openfeign.httpclient.hc5.enabled` to `true`, respectively, and having them on the classpath.
 You can customize the HTTP client used by providing a bean of either `org.apache.http.impl.client.CloseableHttpClient` when using Apache or `okhttp3.OkHttpClient` when using OK HTTP or `org.apache.hc.client5.http.impl.classic.CloseableHttpClient` when using Apache HC5.
 Spring Cloud OpenFeign _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:
 * `Logger.Level`
 * `Retryer`
@@ -122,6 +141,12 @@ Spring Cloud Netflix _does not_ provide the following beans by default for feign
 * `Request.Options`
 * `Collection<RequestInterceptor>`
 * `SetterFactory`
 * `QueryMapEncoder`
 * `Capability` (`MicrometerCapability` and `CachingCapability` are provided by default)
 A bean of `Retryer.NEVER_RETRY` with the type `Retryer` is created by default, which will disable retrying.
 Notice this retrying behavior is different from the Feign default one, where it will automatically retry IOExceptions,
 treating them as transient network related exceptions, and any RetryableException thrown from an ErrorDecoder.
 Creating a bean of one of those type and placing it in a `@FeignClient` configuration (such as `FooConfiguration` above) allows you to override each one of the beans described.  Example:
@@ -129,15 +154,15 @@ Creating a bean of one of those type and placing it in a `@FeignClient` configur
 ----
@Configuration
 public class FooConfiguration {
-    @Bean
+	@Bean
-    public Contract feignContract() {
+	public Contract feignContract() {
-        return new feign.Contract.Default();
+		return new feign.Contract.Default();
-    }
+	}
-    @Bean
+	@Bean
-    public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+	public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-        return new BasicAuthRequestInterceptor("user", "password");
+		return new BasicAuthRequestInterceptor("user", "password");
-    }
+	}
 }
 ----
@@ -148,64 +173,121 @@ This replaces the `SpringMvcContract` with `feign.Contract.Default` and adds a `
 application.yml
 [source,yaml]
 ----
-feign:
+spring:
-  client:
+	cloud:
-    config:
+		openfeign:
-      feignName:
+			client:
-        connectTimeout: 5000
+				config:
-        readTimeout: 5000
+					feignName:
-        loggerLevel: full
+						connectTimeout: 5000
-        errorDecoder: com.example.SimpleErrorDecoder
+						readTimeout: 5000
-        retryer: com.example.SimpleRetryer
+						loggerLevel: full
-        requestInterceptors:
+						errorDecoder: com.example.SimpleErrorDecoder
-          - com.example.FooRequestInterceptor
+						retryer: com.example.SimpleRetryer
-          - com.example.BarRequestInterceptor
+						defaultQueryParameters:
-        decode404: false
+							query: queryValue
-        encoder: com.example.SimpleEncoder
+						defaultRequestHeaders:
-        decoder: com.example.SimpleDecoder
+							header: headerValue
-        contract: com.example.SimpleContract
+						requestInterceptors:
 							- com.example.FooRequestInterceptor
 							- com.example.BarRequestInterceptor
 						decode404: false
 						encoder: com.example.SimpleEncoder
 						decoder: com.example.SimpleDecoder
 						contract: com.example.SimpleContract
 						capabilities:
 							- com.example.FooCapability
 							- com.example.BarCapability
 						queryMapEncoder: com.example.SimpleQueryMapEncoder
 						metrics.enabled: false
 ----
 Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.
-If you prefer using configuration properties to configured all `@FeignClient`, you can create configuration properties with `default` feign name.
+If you prefer using configuration properties to configure all `@FeignClient`, you can create configuration properties with `default` feign name.
 You can use `spring.cloud.openfeign.client.config.feignName.defaultQueryParameters` and `spring.cloud.openfeign.client.config.feignName.defaultRequestHeaders` to specify query parameters and headers that will be sent with every request of the client named `feignName`.
 application.yml
 [source,yaml]
 ----
-feign:
+spring:
-  client:
+	cloud:
-    config:
+		openfeign:
-      default:
+			client:
-        connectTimeout: 5000
+				config:
-        readTimeout: 5000
+					default:
-        loggerLevel: basic
+						connectTimeout: 5000
 						readTimeout: 5000
 						loggerLevel: basic
 ----
 If we create both `@Configuration` bean and configuration properties, configuration properties will win.
 It will override `@Configuration` values. But if you want to change the priority to `@Configuration`,
-you can change `feign.client.default-to-properties` to `false`.
+you can change `spring.cloud.openfeign.client.default-to-properties` to `false`.
-NOTE: If you need to use `ThreadLocal` bound variables in your `RequestInterceptor`s you will need to either set the
+If we want to create multiple feign clients with the same name or url
-thread isolation strategy for Hystrix to `SEMAPHORE` or disable Hystrix in Feign.
+so that they would point to the same server but each with a different custom configuration then
 we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
 collision of these configuration beans.
-application.yml
+[source,java,indent=0]
 [source,yaml]
 ----
-# To disable Hystrix in Feign
+@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
-feign:
+public interface FooClient {
-  hystrix:
+	//..
-    enabled: false
+}
 # To set thread isolation to SEMAPHORE
 hystrix:
  command:
    default:
      execution:
        isolation:
          strategy: SEMAPHORE
 ----
 [source,java,indent=0]
 ----
@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
 public interface BarClient {
 	//..
 }
 ----
 It is also possible to configure FeignClient not to inherit beans from the parent context.
 You can do this by overriding the `inheritParentConfiguration()` in a  `FeignClientConfigurer`
 bean to return `false`:
 [source,java,indent=0]
 ----
@Configuration
 public class CustomConfiguration{
@Bean
 public FeignClientConfigurer feignClientConfigurer() {
 			return new FeignClientConfigurer() {
 				@Override
 				public boolean inheritParentConfiguration() {
 					return false;
 				}
 			};
 		}
 }
 ----
 TIP: By default, Feign clients do not encode slash `/` characters. You can change this behaviour, by setting the value of `spring.cloud.openfeign.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 `spring.cloud.openfeign.encoder.charset-from-content-type` to `true`.
 [[timeout-handling]]
 === Timeout Handling
 We can configure timeouts on both the default and the named client. OpenFeign works with two timeout parameters:
 - `connectTimeout` prevents blocking the caller due to the long server processing time.
 - `readTimeout` is applied from the time of connection establishment and is triggered when returning the response takes too long.
 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.
 === Creating Feign Clients Manually
 In some cases it might be necessary to customize your Feign Clients in a way that is not
@@ -223,27 +305,29 @@ class FooController {
 	private FooClient adminClient;
-    	@Autowired
+	@Autowired
-	public FooController(Decoder decoder, Encoder encoder, Client client, Contract contract) {
+	public FooController(Client client, Encoder encoder, Decoder decoder, Contract contract, MicrometerCapability micrometerCapability) {
 		this.fooClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.addCapability(micrometerCapability)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");
 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.addCapability(micrometerCapability)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");
-    }
+	}
 }
 ----
 NOTE: In the above example `FeignClientsConfiguration.class` is the default configuration
-provided by Spring Cloud Netflix.
+provided by Spring Cloud OpenFeign.
 NOTE: `PROD-SVC` is the name of the service the Clients will be making requests to.
@@ -251,18 +335,21 @@ NOTE: The Feign `Contract` object defines what annotations and values are valid
 autowired `Contract` bean provides supports for SpringMVC annotations, instead of
 the default Feign native annotations.
-[[spring-cloud-feign-hystrix]]
+You can also use the `Builder`to configure FeignClient not to inherit beans from the parent context.
-=== Feign Hystrix Support
+You can do this by overriding calling `inheritParentContext(false)` on the `Builder`.
-If Hystrix is on the classpath and `feign.hystrix.enabled=true`, Feign will wrap all methods with a circuit breaker. Returning a `com.netflix.hystrix.HystrixCommand` is also available. This lets you use reactive patterns (with a call to `.toObservable()` or `.observe()` or asynchronous use (with a call to `.queue()`).
+[[spring-cloud-feign-circuitbreaker]]
 === Feign Spring Cloud CircuitBreaker Support
-To disable Hystrix support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:
+If Spring Cloud CircuitBreaker is on the classpath and `spring.cloud.openfeign.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
+	@Bean
 	@Scope("prototype")
 	public Feign.Builder feignBuilder() {
 		return Feign.builder();
@@ -270,60 +357,143 @@ public class FooConfiguration {
 }
 ----
-WARNING:  Prior to the Spring Cloud Dalston release, if Hystrix was on the classpath Feign would have wrapped
+The circuit breaker name follows this pattern `<feignClientClassName>#<calledMethod>(<parameterTypes>)`. When calling a `@FeignClient` with `FooClient` interface and the called interface method that has no parameters is `bar` then the circuit breaker name will be `FooClient#bar()`.
 all methods in a circuit breaker by default.  This default behavior was changed in Spring Cloud Dalston in
 favor for an opt-in approach.
-[[spring-cloud-feign-hystrix-fallback]]
+NOTE: As of 2020.0.2, the circuit breaker name pattern has changed from `<feignClientName>_<calledMethod>`.
-=== Feign Hystrix Fallbacks
+Using `CircuitBreakerNameResolver` introduced in 2020.0.4, circuit breaker names can retain the old pattern.
-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.
+Providing a bean of `CircuitBreakerNameResolver`, you can change the circuit breaker name pattern.
 [source,java,indent=0]
 ----
@Configuration
 public class FooConfiguration {
 	@Bean
 	public CircuitBreakerNameResolver circuitBreakerNameResolver() {
 		return (String feignClientName, Target<?> target, Method method) -> feignClientName + "_" + method.getName();
 	}
 }
 ----
 To enable Spring Cloud CircuitBreaker group set the `spring.cloud.openfeign.circuitbreaker.group.enabled` property to `true` (by default `false`).
 [[spring-clou-feign-circuitbreaker-configurationproperties]]
 === Configuring CircuitBreakers With Configuration Properties
 You can configure CircuitBreakers via configuration properties.
 For example, if you had this Feign client
 [source,java,indent=0]
 ----
-@FeignClient(name = "hello", fallback = HystrixClientFallback.class)
+@FeignClient(url = "http://localhost:8080")
-protected interface HystrixClient {
+public interface DemoClient {
    @RequestMapping(method = RequestMethod.GET, value = "/hello")
    Hello iFailSometimes();
 }
-static class HystrixClientFallback implements HystrixClient {
+    @GetMapping("demo")
-    @Override
+    String getDemo();
    public Hello iFailSometimes() {
        return new Hello("fallback");
    }
 }
 ----
 You could configure it using configuration properties by doing the following
 [source,yaml,indent=0]
 ----
 feign:
  circuitbreaker:
    enabled: true
    alphanumeric-ids:
      enabled: true
 resilience4j:
  circuitbreaker:
    instances:
      DemoClientgetDemo:
        minimumNumberOfCalls: 69
  timelimiter:
    instances:
      DemoClientgetDemo:
        timeoutDuration: 10s
 ----
 NOTE: If you want to switch back to the circuit breaker names used prior to Spring Cloud
 2022.0.0 you can set `spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled` to `false`.
 [[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]
 ----
@FeignClient(name = "test", url = "http://localhost:${server.port}/", fallback = Fallback.class)
 	protected interface TestClient {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		Hello getHello();
 		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
 		String getException();
 	}
 	@Component
 	static class Fallback implements TestClient {
 		@Override
 		public Hello getHello() {
 			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
 		}
 		@Override
 		public String getException() {
 			return "Fixed response";
 		}
 	}
 ----
 If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.
 [source,java,indent=0]
 ----
-@FeignClient(name = "hello", fallbackFactory = HystrixClientFallbackFactory.class)
+@FeignClient(name = "testClientWithFactory", url = "http://localhost:${server.port}/",
-protected interface HystrixClient {
+			fallbackFactory = TestFallbackFactory.class)
-	@RequestMapping(method = RequestMethod.GET, value = "/hello")
+	protected interface TestClientWithFactory {
-	Hello iFailSometimes();
+
-}
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		Hello getHello();
 		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
 		String getException();
@Component
 static class HystrixClientFallbackFactory implements FallbackFactory<HystrixClient> {
 	@Override
 	public HystrixClient create(Throwable cause) {
 		return new HystrixClient() {
 			@Override
 			public Hello iFailSometimes() {
 				return new Hello("fallback; reason was: " + cause.getMessage());
 			}
 		};
 	}
 }
 ----
-WARNING: There is a limitation with the implementation of fallbacks in Feign and how Hystrix fallbacks work. Fallbacks are currently not supported for methods that return `com.netflix.hystrix.HystrixCommand` and `rx.Observable`.
+	@Component
 	static class TestFallbackFactory implements FallbackFactory<FallbackWithFactory> {
 		@Override
 		public FallbackWithFactory create(Throwable cause) {
 			return new FallbackWithFactory();
 		}
 	}
 	static class FallbackWithFactory implements TestClientWithFactory {
 		@Override
 		public Hello getHello() {
 			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
 		}
 		@Override
 		public String getException() {
 			return "Fixed response";
 		}
 	}
 ----
 === Feign and `@Primary`
-When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud Netflix marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
+When using Feign with Spring Cloud CircuitBreaker fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
 [source,java,indent=0]
 ----
@@ -344,8 +514,8 @@ This allows grouping common operations into convenient base interfaces.
 ----
 public interface UserService {
-    @RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
+	@RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
-    User getUser(@PathVariable("id") long id);
+	User getUser(@PathVariable("id") long id);
 }
 ----
@@ -369,10 +539,7 @@ public interface UserClient extends UserService {
 }
 ----
-NOTE: It is generally not advisable to share an interface between a
+WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
 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
@@ -381,17 +548,17 @@ Feign requests. You can do this by enabling one of the properties:
 [source,java]
 ----
-feign.compression.request.enabled=true
+spring.cloud.openfeign.compression.request.enabled=true
-feign.compression.response.enabled=true
+spring.cloud.openfeign.compression.response.enabled=true
 ----
 Feign request compression gives you settings similar to what you may set for your web server:
 [source,java]
 ----
-feign.compression.request.enabled=true
+spring.cloud.openfeign.compression.request.enabled=true
-feign.compression.request.mime-types=text/xml,application/xml,application/json
+spring.cloud.openfeign.compression.request.mime-types=text/xml,application/xml,application/json
-feign.compression.request.min-request-size=2048
+spring.cloud.openfeign.compression.request.min-request-size=2048
 ----
 These properties allow you to be selective about the compressed media types and minimum request threshold length.
@@ -420,17 +587,261 @@ For example, the following would set the `Logger.Level` to `FULL`:
 ----
@Configuration
 public class FooConfiguration {
-    @Bean
+	@Bean
-    Logger.Level feignLoggerLevel() {
+	Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
+		return Logger.Level.FULL;
-    }
+	}
 }
 ----
-        OtherClass.someMethod(myprop.get());
+
-    }
+=== Feign Capability support
 The Feign capabilities expose core Feign components so that these components can be modified. For example, the capabilities can take the `Client`, _decorate_ it, and give the decorated instance back to Feign.
 The support for metrics libraries is a good real-life example for this. See <<feign-metrics>>.
 Creating one or more `Capability` beans and placing them in a `@FeignClient` configuration lets you register them and modify the behavior of the involved client.
 [source,java,indent=0]
 ----
@Configuration
 public class FooConfiguration {
 	@Bean
 	Capability customCapability() {
 		return new CustomCapability();
 	}
 }
-stripped). The proxy uses Ribbon to locate an instance to forward to
+----
-via discovery, and all requests are executed in a
+
-<<hystrix-fallbacks-for-routes, hystrix command>>, so
+=== Feign metrics
-failures will show up in Hystrix metrics, and once the circuit is open
+
-the proxy will not try to contact the service.
+If all of the following conditions are true, a `MicrometerCapability` bean is created and registered so that your Feign client publishes metrics to Micrometer:
 * `feign-micrometer` is on the classpath
 * A `MeterRegistry` bean is available
 * feign metrics properties are set to `true` (by default)
 	- `spring.cloud.openfeign.metrics.enabled=true` (for all clients)
 	- `spring.cloud.openfeign.client.config.feignName.metrics.enabled=true` (for a single client)
 NOTE: If your application already uses Micrometer, enabling metrics is as simple as putting `feign-micrometer` onto your classpath.
 You can also disable the feature by either:
 * excluding `feign-micrometer` from your classpath
 * setting one of the feign metrics properties to `false`
 	- `spring.cloud.openfeign.metrics.enabled=false`
 	- `spring.cloud.openfeign.client.config.feignName.metrics.enabled=false`
 NOTE: `spring.cloud.openfeign.metrics.enabled=false` disables metrics support for *all* Feign clients regardless of the value of the client-level flags: `spring.cloud.openfeign.client.config.feignName.metrics.enabled`.
 If you want to enable or disable merics per client, don't set `spring.cloud.openfeign.metrics.enabled` and use `spring.cloud.openfeign.client.config.feignName.metrics.enabled`.
 You can also customize the `MicrometerCapability` by registering your own bean:
 [source,java,indent=0]
 ----
@Configuration
 public class FooConfiguration {
 	@Bean
 	public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
 		return new MicrometerCapability(meterRegistry);
 	}
 }
 ----
 === Feign Caching
 If `@EnableCaching` annotation is used, a `CachingCapability` bean is created and registered so that your Feign client recognizes `@Cache*` annotations on its interface:
 [source,java,indent=0]
 ----
 public interface DemoClient {
 	@GetMapping("/demo/{filterParam}")
    @Cacheable(cacheNames = "demo-cache", key = "#keyParam")
 	String demoEndpoint(String keyParam, @PathVariable String filterParam);
 }
 ----
 You can also disable the feature via property `spring.cloud.openfeign.cache.enabled=false`.
 === Feign @QueryMap support
 The OpenFeign `@QueryMap` annotation provides support for POJOs to be used as
 GET parameter maps. Unfortunately, the default OpenFeign QueryMap annotation is
 incompatible with Spring because it lacks a `value` property.
 Spring Cloud OpenFeign provides an equivalent `@SpringQueryMap` annotation, which
 is used to annotate a POJO or Map parameter as a query parameter map.
 For example, the `Params` class defines parameters `param1` and `param2`:
 [source,java,indent=0]
 ----
 // Params.java
 public class Params {
 	private String param1;
 	private String param2;
 	// [Getters and setters omitted for brevity]
 }
 ----
 The following feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
 [source,java,indent=0]
 ----
@FeignClient("demo")
 public interface DemoTemplate {
 	@GetMapping(path = "/demo")
 	String demoEndpoint(@SpringQueryMap Params params);
 }
 ----
 If you need more control over the generated query parameter map, you can implement a custom `QueryMapEncoder` bean.
 === HATEOAS support
 Spring provides some APIs to create REST representations that follow the https://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle, https://spring.io/projects/spring-hateoas[Spring Hateoas] and https://spring.io/projects/spring-data-rest[Spring Data REST].
 If your project use the `org.springframework.boot:spring-boot-starter-hateoas` starter
 or the `org.springframework.boot:spring-boot-starter-data-rest` starter, Feign HATEOAS support is enabled by default.
 When HATEOAS support is enabled, Feign clients are allowed to serialize
 and deserialize HATEOAS representation models: https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/EntityModel.html[EntityModel], https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/CollectionModel.html[CollectionModel] and https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/PagedModel.html[PagedModel].
 [source,java,indent=0]
 ----
@FeignClient("demo")
 public interface DemoTemplate {
 	@GetMapping(path = "/stores")
 	CollectionModel<Store> getStores();
 }
 ----
 === Spring @MatrixVariable Support
 Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.
 If a map is passed as the method argument, the `@MatrixVariable` path segment is created by joining key-value pairs from the map with a `=`.
 If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is
 joined with the provided method argument using `=`.
 IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Spring Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name.
 For example:
 [source,java,indent=0]
 ----
@GetMapping("/objects/links/{matrixVars}")
 Map<String, List<String>> getObjects(@MatrixVariable Map<String, List<String>> matrixVars);
 ----
 Note that both variable name and the path segment placeholder are called `matrixVars`.
 [source,java,indent=0]
 ----
@FeignClient("demo")
 public interface DemoTemplate {
 	@GetMapping(path = "/stores")
 	CollectionModel<Store> getStores();
 }
 ----
 === Feign `CollectionFormat` support
 We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation.
 You can annotate a Feign client method (or the whole class to affect all methods) with it by passing the desired `feign.CollectionFormat` as annotation value.
 In the following example, the `CSV` format is used instead of the default `EXPLODED` to process the method.
 [source,java,indent=0]
 ----
@FeignClient(name = "demo")
 protected interface PageableFeignClient {
    @CollectionFormat(feign.CollectionFormat.CSV)
    @GetMapping(path = "/page")
    ResponseEntity performRequest(Pageable page);
 }
 ----
 TIP: Set the `CSV` format while sending `Pageable` as a query parameter in order for it to be encoded correctly.
 === Reactive Support
 As the https://github.com/OpenFeign/feign[OpenFeign project] does not currently support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], neither does Spring Cloud OpenFeign.We will add support for it here as soon as it becomes available in the core project.
 Until that is done, we recommend using https://github.com/Playtika/feign-reactive[feign-reactive] for Spring WebClient support.
 ==== Early Initialization Errors
 Depending on how you are using your Feign clients you may see initialization errors when starting your application.
 To work around this problem you can use an `ObjectProvider` when autowiring your client.
 [source,java,indent=0]
 ----
@Autowired
 ObjectProvider<TestFeignClient> testFeignClient;
 ----
 === 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]
 ----
 spring.cloud.openfeign.autoconfiguration.jackson.enabled=true
 ----
 === Spring `@RefreshScope` Support
 If Feign client refresh is enabled, each feign client is created with `feign.Request.Options` as a refresh-scoped bean. This means properties such as `connectTimeout` and `readTimeout` can be refreshed against any Feign client instance through `POST /actuator/refresh`.
 By default, refresh behavior in Feign clients is disabled. Use the following property to enable refresh behavior:
 [source,java]
 ----
 spring.cloud.openfeign.client.refresh-enabled=true
 ----
 TIP: DO NOT annotate the `@FeignClient` interface with the `@RefreshScope` annotation.
 === OAuth2 Support
 OAuth2 support can be enabled by setting following flag:
 ----
 spring.cloud.openfeign.oauth2.enabled=true
 ----
 When the flag is set to true, and the oauth2 client context resource details are present, a bean of class `OAuth2FeignRequestInterceptor` is created. Before each request, the interceptor resolves the required access token and includes it as a header.
 Sometimes, when load balancing is enabled for Feign clients, you may want to use load balancing for fetching access tokens, too. To do so, you should ensure that the load balancer is on the classpath (spring-cloud-starter-loadbalancer) and explicitly enable load balancing for OAuth2FeignRequestInterceptor by setting the following flag:
 ----
 spring.cloud.openfeign.oauth2.load-balanced=true
 ----
 === Transform the load-balanced HTTP request
 You can use the selected `ServiceInstance` to transform the load-balanced HTTP Request.
 For `Request`, you need to implement and define `LoadBalancerFeignRequestTransformer`, as follows:
 [source,java,indent=0]
 ----
 	@Bean
 	public LoadBalancerFeignRequestTransformer transformer() {
 		return new LoadBalancerFeignRequestTransformer() {
 			@Override
 			public Request transformRequest(Request request, ServiceInstance instance) {
 				Map<String, Collection<String>> headers = new HashMap<>(request.headers());
 				headers.put("X-ServiceId", Collections.singletonList(instance.getServiceId()));
 				headers.put("X-InstanceId", Collections.singletonList(instance.getInstanceId()));
 				return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
 						request.requestTemplate());
 			}
 		};
 	}
 ----
 If multiple transformers are defined, they are applied in the order in which beans are defined.
 Alternatively, you can use `LoadBalancerFeignRequestTransformer.DEFAULT_ORDER` to specify the order.
 == Configuration properties
 To see the list of all Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    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
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -1,42 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.1.0.M2</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>4.0.0-SNAPSHOT</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git</connection>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git</developerConnection>
+		</connection>
 		<developerConnection>
 			scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git
 		</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
-		<jackson.version>2.7.3</jackson.version>
+		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.1.0.M2</spring-cloud-commons.version>
+		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-netflix.version>2.1.0.M2</spring-cloud-netflix.version>
 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- Sonar -->
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec
 		</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
 	</properties>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -46,34 +53,48 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs
 							</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs
 							</location>
 						</file>
 					</additionalConfig>
 				</configuration>
 			</plugin>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
-				<version>${maven-compiler-plugin.version}</version>
+				<artifactId>maven-checkstyle-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.basepom.maven</groupId>
 				<artifactId>duplicate-finder-maven-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
+					<ignoredResourcePatterns>
-					<target>1.8</target>
+						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
 					</ignoredResourcePatterns>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<reporting>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</reporting>
 	<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>
@@ -106,7 +127,7 @@
 		<module>spring-cloud-openfeign-core</module>
 		<module>spring-cloud-starter-openfeign</module>
 		<module>docs</module>
-    </modules>
+	</modules>
 	<profiles>
 		<profile>
 			<id>spring</id>
@@ -114,7 +135,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -125,7 +146,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -143,7 +164,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -154,7 +175,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -162,7 +183,7 @@
 				<pluginRepository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/libs-release-local</url>
+					<url>https://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -184,7 +205,8 @@
 								</goals>
 								<configuration>
 									<propertyName>surefireArgLine</propertyName>
-									<destFile>${project.build.directory}/jacoco.exec</destFile>
+									<destFile>${project.build.directory}/jacoco.exec
 									</destFile>
 								</configuration>
 							</execution>
 							<execution>
@@ -195,7 +217,8 @@
 								</goals>
 								<configuration>
 									<!-- Sets the path to the file which contains the execution data. -->
-									<dataFile>${project.build.directory}/jacoco.exec</dataFile>
+									<dataFile>${project.build.directory}/jacoco.exec
 									</dataFile>
 								</configuration>
 							</execution>
 						</executions>
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.M2</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -20,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>
@@ -49,6 +46,11 @@
 			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-hateoas</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
@@ -59,15 +61,16 @@
 			<artifactId>reactor-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava-reactive-streams</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.annotation</groupId>
 					<artifactId>javax.annotation-api</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -83,11 +86,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>
@@ -96,12 +94,24 @@
 		<dependency>
 			<groupId>io.github.openfeign.form</groupId>
 			<artifactId>feign-form-spring</artifactId>
 			<exclusions>
 <!--				Vulnerable in 3.8.0-->
 				<exclusion>
 					<groupId>commons-io</groupId>
 					<artifactId>commons-io</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-slf4j</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-micrometer</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-httpclient</artifactId>
@@ -109,7 +119,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-hystrix</artifactId>
+			<artifactId>feign-hc5</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -117,56 +127,30 @@
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-java8</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-serialization</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-metrics-event-stream</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-javanica</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey.contribs</groupId>
 			<artifactId>jersey-apache-client4</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security.oauth.boot</groupId>
 			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.xml.bind</groupId>
 					<artifactId>jaxb-api</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>javax.activation</groupId>
 					<artifactId>javax.activation-api</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>com.sun.activation</groupId>
 					<artifactId>jakarta.activation</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
@@ -187,19 +171,19 @@
 			<artifactId>spring-cloud-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
+			<groupId>org.springframework.boot</groupId>
-			<artifactId>ribbon</artifactId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -211,25 +195,42 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.4.0</version>
+			<version>3.19.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.vavr</groupId>
 			<artifactId>vavr</artifactId>
 			<version>0.10.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-loadbalancer</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.11.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
 			<id>java8plus</id>
-				<activation>
+			<activation>
-					<jdk>[1.8,2.0)</jdk>
+				<jdk>[1.8,2.0)</jdk>
-				</activation>
+			</activation>
-				<build>
+			<build>
-					<plugins>
+				<plugins>
-						<plugin>
+					<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
+						<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-compiler-plugin</artifactId>
+						<artifactId>maven-compiler-plugin</artifactId>
-							<configuration>
+						<configuration>
-								<compilerArgs>
+							<compilerArgs>
-									<arg>-parameters</arg>
+								<arg>-parameters</arg>
-								</compilerArgs>
+							</compilerArgs>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -32,17 +32,15 @@ public interface AnnotatedParameterProcessor {
 	/**
 	 * Retrieves the processor supported annotation type.
 	 *
 	 * @return the annotation type
 	 */
 	Class<? extends Annotation> getAnnotationType();
 	/**
 	 * Process the annotated parameter.
-	 *
+	 * @param context the parameter context
 	 * @param context	the parameter context
 	 * @param annotation the annotation instance
-	 * @param method	 the method that contains the annotation
+	 * @param method the method that contains the annotation
 	 * @return whether the parameter is http
 	 */
 	boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method);
@@ -56,32 +54,30 @@ public interface AnnotatedParameterProcessor {
 		/**
 		 * Retrieves the method metadata.
 		 *
 		 * @return the method metadata
 		 */
 		MethodMetadata getMethodMetadata();
 		/**
 		 * Retrieves the index of the parameter.
 		 *
 		 * @return the parameter index
 		 */
 		int getParameterIndex();
 		/**
 		 * Sets the parameter name.
 		 *
 		 * @param name the name of the parameter
 		 */
 		void setParameterName(String name);
 		/**
 		 * Sets the template parameter.
 		 *
 		 * @param name the template parameter
 		 * @param rest the existing parameter values
 		 * @return parameters
 		 */
 		Collection<String> setTemplateParameter(String name, Collection<String> rest);
 	}
 }
@@ -0,0 +1,42 @@
 /*
 * Copyright 2013-2022 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.Capability;
 import feign.InvocationHandlerFactory;
 import org.springframework.cache.interceptor.CacheInterceptor;
 /**
 * Allows Spring's @Cache* annotations to be declared on the feign client's methods.
 *
 * @author Sam Kruglov
 */
 public class CachingCapability implements Capability {
 	private final CacheInterceptor cacheInterceptor;
 	public CachingCapability(CacheInterceptor cacheInterceptor) {
 		this.cacheInterceptor = cacheInterceptor;
 	}
 	@Override
 	public InvocationHandlerFactory enrich(InvocationHandlerFactory invocationHandlerFactory) {
 		return new FeignCachingInvocationHandlerFactory(invocationHandlerFactory, cacheInterceptor);
 	}
 }
@@ -0,0 +1,34 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.lang.reflect.Method;
 import feign.Target;
 /**
 * Used to resolve a circuitbreaker name which will be used in
 * {@link org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory}.
 *
 * @author Kwangyong Kim
 * @since 2020.0.4
 */
 public interface CircuitBreakerNameResolver {
 	String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method);
 }
@@ -0,0 +1,42 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 /**
 * Indicates which collection format should be used while processing the annotated method.
 *
 * @author Olga Maciaszek-Sharma
 * @author Sam Kruglov
 * @see feign.CollectionFormat
 */
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
 public @interface CollectionFormat {
 	/**
 	 * Allows setting the {@link feign.CollectionFormat} to be used while processing the
 	 * annotated method.
 	 * @return the {@link feign.CollectionFormat} to be used
 	 */
 	feign.CollectionFormat value();
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,18 +1,17 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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;
@@ -27,7 +26,8 @@ class DefaultTargeter implements Targeter {
 	@Override
 	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-						Target.HardCodedTarget<T> target) {
+			Target.HardCodedTarget<T> target) {
 		return feign.target(target);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -25,10 +25,11 @@ import java.lang.annotation.Target;
 import org.springframework.context.annotation.Import;
 /**
- * Scans for interfaces that declare they are feign clients (via {@link FeignClient
+ * Scans for interfaces that declare they are feign clients (via
- * <code>@FeignClient</code>}). Configures component scanning directives for use with
+ * {@link org.springframework.cloud.openfeign.FeignClient} <code>@FeignClient</code>).
- * {@link org.springframework.context.annotation.Configuration
+ * Configures component scanning directives for use with
- * <code>@Configuration</code>} classes.
+ * {@link org.springframework.context.annotation.Configuration}
 * <code>@Configuration</code> classes.
 *
 * @author Spencer Gibb
 * @author Dave Syer
@@ -55,7 +56,6 @@ public @interface EnableFeignClients {
 	 * <p>
 	 * Use {@link #basePackageClasses()} for a type-safe alternative to String-based
 	 * package names.
 	 *
 	 * @return the array of 'basePackages'.
 	 */
 	String[] basePackages() default {};
@@ -66,7 +66,6 @@ public @interface EnableFeignClients {
 	 * <p>
 	 * Consider creating a special no-op marker class or interface in each package that
 	 * serves no purpose other than being referenced by this attribute.
 	 *
 	 * @return the array of 'basePackageClasses'.
 	 */
 	Class<?>[] basePackageClasses() default {};
@@ -77,12 +76,15 @@ public @interface EnableFeignClients {
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
 	 *
 	 * @see FeignClientsConfiguration for the defaults
 	 * @return list of default configurations
 	 */
 	Class<?>[] defaultConfiguration() default {};
 	/**
-	 * List of classes annotated with @FeignClient. If not empty, disables classpath scanning.
+	 * List of classes annotated with @FeignClient. If not empty, disables classpath
-	 * @return
+	 * scanning.
 	 * @return list of FeignClient classes
 	 */
 	Class<?>[] clients() default {};
 }
@@ -0,0 +1,87 @@
 /*
 * Copyright 2013-2022 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,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,49 +16,89 @@
 package org.springframework.cloud.openfeign;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 import com.fasterxml.jackson.databind.Module;
 import feign.Capability;
 import feign.Client;
 import feign.Feign;
 import feign.RequestInterceptor;
 import feign.Target;
 import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 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.cache.interceptor.CacheInterceptor;
 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.client.loadbalancer.LoadBalancerInterceptor;
 import org.springframework.cloud.client.loadbalancer.RetryLoadBalancerInterceptor;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorConfigurer;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
 import org.springframework.cloud.openfeign.support.SortJacksonModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
-import feign.Client;
+import static org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorBuilder.buildWithConfigurers;
 import feign.Feign;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import okhttp3.ConnectionPool;
 import javax.annotation.PreDestroy;
 /**
 * @author Spencer Gibb
 * @author Julien Roy
 * @author Grzegorz Poznachowski
 * @author Nikita Konev
 * @author Tim Peeters
 * @author Olga Maciaszek-Sharma
 * @author Nguyen Ky Thanh
 * @author Andrii Bohutskyi
 * @author Kwangyong Kim
 * @author Sam Kruglov
 * @author Wojciech Mąka
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Feign.class)
-@EnableConfigurationProperties({FeignClientProperties.class, FeignHttpClientProperties.class})
+@EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class,
 		FeignEncoderProperties.class })
 public class FeignAutoConfiguration {
 	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);
 	@Autowired(required = false)
 	private List<FeignClientSpecification> configurations = new ArrayList<>();
@@ -74,36 +114,112 @@ public class FeignAutoConfiguration {
 		return context;
 	}
-	@Configuration
+	@Bean
-	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
+	@ConditionalOnProperty(value = "spring.cloud.openfeign.cache.enabled", matchIfMissing = true)
-	protected static class HystrixFeignTargeterConfiguration {
+	@ConditionalOnBean(CacheInterceptor.class)
-		@Bean
+	public Capability cachingCapability(CacheInterceptor cacheInterceptor) {
-		@ConditionalOnMissingBean
+		return new CachingCapability(cacheInterceptor);
 		public Targeter feignTargeter() {
 			return new HystrixTargeter();
 		}
 	}
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
+	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
 	@ConditionalOnProperty(value = "spring.cloud.openfeign.autoconfiguration.jackson.enabled", havingValue = "true")
 	protected static class FeignJacksonConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(PageJacksonModule.class)
 		public PageJacksonModule pageJacksonModule() {
 			return new PageJacksonModule();
 		}
 		@Bean
 		@ConditionalOnMissingBean(SortJacksonModule.class)
 		public SortJacksonModule sortModule() {
 			return new SortJacksonModule();
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@Conditional(FeignCircuitBreakerDisabledConditions.class)
 	protected static class DefaultFeignTargeterConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		public Targeter feignTargeter() {
 			return new DefaultTargeter();
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(CircuitBreaker.class)
 	@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "true")
 	protected static class CircuitBreakerPresentFeignTargeterConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(CircuitBreakerFactory.class)
 		public Targeter defaultFeignTargeter() {
 			return new DefaultTargeter();
 		}
 		@Bean
 		@ConditionalOnMissingBean(CircuitBreakerNameResolver.class)
 		@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
 				havingValue = "false")
 		public CircuitBreakerNameResolver circuitBreakerNameResolver() {
 			return new DefaultCircuitBreakerNameResolver();
 		}
 		@Bean
 		@ConditionalOnMissingBean(CircuitBreakerNameResolver.class)
 		@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
 				havingValue = "true", matchIfMissing = true)
 		public CircuitBreakerNameResolver alphanumericCircuitBreakerNameResolver() {
 			return new AlphanumericCircuitBreakerNameResolver();
 		}
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnBean(CircuitBreakerFactory.class)
 		public Targeter circuitBreakerFeignTargeter(CircuitBreakerFactory circuitBreakerFactory,
 				@Value("${spring.cloud.openfeign.circuitbreaker.group.enabled:false}") boolean circuitBreakerGroupEnabled,
 				CircuitBreakerNameResolver circuitBreakerNameResolver) {
 			return new FeignCircuitBreakerTargeter(circuitBreakerFactory, circuitBreakerGroupEnabled,
 					circuitBreakerNameResolver);
 		}
 		static class DefaultCircuitBreakerNameResolver implements CircuitBreakerNameResolver {
 			@Override
 			public String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method) {
 				return Feign.configKey(target.type(), method);
 			}
 		}
 		static class AlphanumericCircuitBreakerNameResolver extends DefaultCircuitBreakerNameResolver {
 			@Override
 			public String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method) {
 				return super.resolveCircuitBreakerName(feignClientName, target, method).replaceAll("[^a-zA-Z0-9]", "");
 			}
 		}
 	}
 	// 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
+	// see corresponding configurations in FeignLoadBalancerAutoConfiguration
-	// for load balanced ribbon clients.
+	// for load-balanced clients.
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
-	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.enabled", matchIfMissing = true)
 	@Conditional(HttpClient5DisabledConditions.class)
 	protected static class HttpClientFeignConfiguration {
 		private final Timer connectionManagerTimer = new Timer(
 				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
@@ -117,11 +233,10 @@ public class FeignAutoConfiguration {
 		public HttpClientConnectionManager connectionManager(
 				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 				FeignHttpClientProperties httpClientProperties) {
-			final HttpClientConnectionManager connectionManager = connectionManagerFactory
+			final HttpClientConnectionManager connectionManager = connectionManagerFactory.newConnectionManager(
-					.newConnectionManager(httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
+					httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
-							httpClientProperties.getMaxConnectionsPerRoute(),
+					httpClientProperties.getMaxConnectionsPerRoute(), httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLive(),
+					httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
 							httpClientProperties.getTimeToLiveUnit(), registryBuilder);
 			this.connectionManagerTimer.schedule(new TimerTask() {
 				@Override
 				public void run() {
@@ -137,11 +252,9 @@ public class FeignAutoConfiguration {
 				FeignHttpClientProperties httpClientProperties) {
 			RequestConfig defaultRequestConfig = RequestConfig.custom()
 					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
+					.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
-					.build();
+			this.httpClient = httpClientFactory.createBuilder().setConnectionManager(httpClientConnectionManager)
-			this.httpClient = httpClientFactory.createBuilder().
+					.setDefaultRequestConfig(defaultRequestConfig).build();
 					setConnectionManager(httpClientConnectionManager).
 					setDefaultRequestConfig(defaultRequestConfig).build();
 			return this.httpClient;
 		}
@@ -152,19 +265,26 @@ public class FeignAutoConfiguration {
 		}
 		@PreDestroy
-		public void destroy() throws Exception {
+		public void destroy() {
-			connectionManagerTimer.cancel();
+			this.connectionManagerTimer.cancel();
-			if(httpClient != null) {
+			if (this.httpClient != null) {
-				httpClient.close();
+				try {
 					this.httpClient.close();
 				}
 				catch (IOException e) {
 					if (LOG.isErrorEnabled()) {
 						LOG.error("Could not correctly close httpClient.");
 					}
 				}
 			}
 		}
 	}
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	@ConditionalOnProperty(value = "feign.okhttp.enabled")
+	@ConditionalOnProperty("spring.cloud.openfeign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {
 		private okhttp3.OkHttpClient okHttpClient;
@@ -172,31 +292,31 @@ public class FeignAutoConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(ConnectionPool.class)
 		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
-													   OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+			int maxTotalConnections = httpClientProperties.getMaxConnections();
-			Long timeToLive = httpClientProperties.getTimeToLive();
+			long timeToLive = httpClientProperties.getTimeToLive();
 			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
 			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 		}
 		@Bean
-		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
+		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory, ConnectionPool connectionPool,
-										   ConnectionPool connectionPool, FeignHttpClientProperties httpClientProperties) {
+				FeignHttpClientProperties httpClientProperties) {
-			Boolean followRedirects = httpClientProperties.isFollowRedirects();
+			boolean followRedirects = httpClientProperties.isFollowRedirects();
-			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+			int connectTimeout = httpClientProperties.getConnectionTimeout();
-			Boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
+			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation).
+			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
-					connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).
+			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
-					followRedirects(followRedirects).
+					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
-					connectionPool(connectionPool).build();
+					.readTimeout(readTimeout).connectionPool(connectionPool).build();
 			return this.okHttpClient;
 		}
 		@PreDestroy
 		public void destroy() {
-			if(okHttpClient != null) {
+			if (this.okHttpClient != null) {
-				okHttpClient.dispatcher().executorService().shutdown();
+				this.okHttpClient.dispatcher().executorService().shutdown();
-				okHttpClient.connectionPool().evictAll();
+				this.okHttpClient.connectionPool().evictAll();
 			}
 		}
@@ -205,6 +325,56 @@ public class FeignAutoConfiguration {
 		public Client feignClient(okhttp3.OkHttpClient client) {
 			return new OkHttpClient(client);
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttp5Client.class)
 	@ConditionalOnMissingBean(org.apache.hc.client5.http.impl.classic.CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true")
 	@Import(org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration.class)
 	protected static class HttpClient5FeignConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(Client.class)
 		public Client feignClient(org.apache.hc.client5.http.impl.classic.CloseableHttpClient httpClient5) {
 			return new ApacheHttp5Client(httpClient5);
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OAuth2ClientContext.class)
 	@ConditionalOnProperty("spring.cloud.openfeign.oauth2.enabled")
 	@Deprecated // spring-security-oauth2 reached EOL
 	protected static class Oauth2FeignConfiguration {
 		@ConditionalOnBean({ RetryLoadBalancerInterceptor.class, OAuth2ClientContext.class,
 				OAuth2ProtectedResourceDetails.class })
 		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
 		@Bean
 		public OAuth2FeignRequestInterceptorConfigurer retryLoadBalancerInterceptorInjectingConfigurer(
 				final RetryLoadBalancerInterceptor loadBalancerInterceptor) {
 			return builder -> builder.withAccessTokenProviderInterceptors(loadBalancerInterceptor);
 		}
 		@ConditionalOnBean({ LoadBalancerInterceptor.class, OAuth2ClientContext.class,
 				OAuth2ProtectedResourceDetails.class })
 		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
 		@Bean
 		public OAuth2FeignRequestInterceptorConfigurer loadBalancerInterceptorInjectingConfigurer(
 				final LoadBalancerInterceptor loadBalancerInterceptor) {
 			return builder -> builder.withAccessTokenProviderInterceptors(loadBalancerInterceptor);
 		}
 		@Bean
 		@ConditionalOnMissingBean(OAuth2FeignRequestInterceptor.class)
 		@ConditionalOnBean({ OAuth2ClientContext.class, OAuth2ProtectedResourceDetails.class })
 		public RequestInterceptor oauth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
 				OAuth2ProtectedResourceDetails resource, List<OAuth2FeignRequestInterceptorConfigurer> configurers) {
 			return buildWithConfigurers(oAuth2ClientContext, resource, configurers);
 		}
 	}
 }
@@ -0,0 +1,31 @@
 /*
 * Copyright 2013-2022 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;
 /**
 * Allows application to customize the Feign builder.
 *
 * @author Matt King
 */
@FunctionalInterface
 public interface FeignBuilderCustomizer {
 	void customize(Feign.Builder builder);
 }
@@ -0,0 +1,82 @@
 /*
 * Copyright 2013-2022 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.AccessibleObject;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Optional;
 import feign.InvocationHandlerFactory;
 import feign.Target;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.cache.interceptor.CacheInterceptor;
 /**
 * Allows Spring's @Cache* annotations to be declared on the feign client's methods.
 *
 * @author Sam Kruglov
 */
 public class FeignCachingInvocationHandlerFactory implements InvocationHandlerFactory {
 	private final InvocationHandlerFactory delegateFactory;
 	private final CacheInterceptor cacheInterceptor;
 	public FeignCachingInvocationHandlerFactory(InvocationHandlerFactory delegateFactory,
 			CacheInterceptor cacheInterceptor) {
 		this.delegateFactory = delegateFactory;
 		this.cacheInterceptor = cacheInterceptor;
 	}
 	@Override
 	public InvocationHandler create(Target target, Map<Method, MethodHandler> dispatch) {
 		final InvocationHandler delegateHandler = delegateFactory.create(target, dispatch);
 		return (proxy, method, argsNullable) -> {
 			Object[] args = Optional.ofNullable(argsNullable).orElseGet(() -> new Object[0]);
 			return cacheInterceptor.invoke(new MethodInvocation() {
 				@Override
 				public Method getMethod() {
 					return method;
 				}
 				@Override
 				public Object[] getArguments() {
 					return args;
 				}
 				@Override
 				public Object proceed() throws Throwable {
 					return delegateHandler.invoke(proxy, method, args);
 				}
 				@Override
 				public Object getThis() {
 					return target;
 				}
 				@Override
 				public AccessibleObject getStaticPart() {
 					return method;
 				}
 			});
 		};
 	}
 }
@@ -0,0 +1,101 @@
 /*
 * Copyright 2013-2022 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
 * @author Andrii Bohutskyi
 * @author Kwangyong Kim
 * @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;
 		private boolean circuitBreakerGroupEnabled;
 		private CircuitBreakerNameResolver circuitBreakerNameResolver;
 		Builder circuitBreakerFactory(CircuitBreakerFactory circuitBreakerFactory) {
 			this.circuitBreakerFactory = circuitBreakerFactory;
 			return this;
 		}
 		Builder feignClientName(String feignClientName) {
 			this.feignClientName = feignClientName;
 			return this;
 		}
 		Builder circuitBreakerGroupEnabled(boolean circuitBreakerGroupEnabled) {
 			this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled;
 			return this;
 		}
 		Builder circuitBreakerNameResolver(CircuitBreakerNameResolver circuitBreakerNameResolver) {
 			this.circuitBreakerNameResolver = circuitBreakerNameResolver;
 			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, feignClientName, target, dispatch, nullableFallbackFactory,
 					circuitBreakerGroupEnabled, circuitBreakerNameResolver));
 			return super.build();
 		}
 	}
 }
@@ -0,0 +1,40 @@
 /*
 * Copyright 2013-2022 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 = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "false",
 			matchIfMissing = true)
 	static class CircuitBreakerDisabled {
 	}
 }
@@ -0,0 +1,176 @@
 /*
 * Copyright 2013-2022 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.InvocationTargetException;
 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.InvocationHandlerFactory;
 import feign.Target;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import static feign.Util.checkNotNull;
 class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 	private final CircuitBreakerFactory factory;
 	private final String feignClientName;
 	private final Target<?> target;
 	private final Map<Method, InvocationHandlerFactory.MethodHandler> dispatch;
 	private final FallbackFactory<?> nullableFallbackFactory;
 	private final Map<Method, Method> fallbackMethodMap;
 	private final boolean circuitBreakerGroupEnabled;
 	private final CircuitBreakerNameResolver circuitBreakerNameResolver;
 	FeignCircuitBreakerInvocationHandler(CircuitBreakerFactory factory, String feignClientName, Target<?> target,
 			Map<Method, InvocationHandlerFactory.MethodHandler> dispatch, FallbackFactory<?> nullableFallbackFactory,
 			boolean circuitBreakerGroupEnabled, CircuitBreakerNameResolver circuitBreakerNameResolver) {
 		this.factory = factory;
 		this.feignClientName = feignClientName;
 		this.target = checkNotNull(target, "target");
 		this.dispatch = checkNotNull(dispatch, "dispatch");
 		this.fallbackMethodMap = toFallbackMethod(dispatch);
 		this.nullableFallbackFactory = nullableFallbackFactory;
 		this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled;
 		this.circuitBreakerNameResolver = circuitBreakerNameResolver;
 	}
 	@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 = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method);
 		CircuitBreaker circuitBreaker = circuitBreakerGroupEnabled ? factory.create(circuitName, feignClientName)
 				: 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 exception) {
 					unwrapAndRethrow(exception);
 				}
 				return null;
 			};
 			return circuitBreaker.run(supplier, fallbackFunction);
 		}
 		return circuitBreaker.run(supplier);
 	}
 	private void unwrapAndRethrow(Exception exception) {
 		if (exception instanceof InvocationTargetException || exception instanceof NoFallbackAvailableException) {
 			Throwable underlyingException = exception.getCause();
 			if (underlyingException instanceof RuntimeException) {
 				throw (RuntimeException) underlyingException;
 			}
 			if (underlyingException != null) {
 				throw new IllegalStateException(underlyingException);
 			}
 			throw new IllegalStateException(exception);
 		}
 	}
 	private Supplier<Object> asSupplier(final Method method, final Object[] args) {
 		final RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
 		return () -> {
 			try {
 				RequestContextHolder.setRequestAttributes(requestAttributes);
 				return dispatch.get(method).invoke(args);
 			}
 			catch (RuntimeException throwable) {
 				throw throwable;
 			}
 			catch (Throwable throwable) {
 				throw new RuntimeException(throwable);
 			}
 		};
 	}
 	/**
 	 * If the method param of InvocationHandler.invoke is not accessible, i.e in a
 	 * package-private interface, the fallback call will cause of access restrictions. But
 	 * methods in dispatch are copied methods. So setting access to dispatch method
 	 * doesn't take effect to the method in InvocationHandler.invoke. Use map to store a
 	 * copy of method to invoke the fallback to bypass this and reducing the count of
 	 * reflection calls.
 	 * @return cached methods map for fallback invoking
 	 */
 	static Map<Method, Method> toFallbackMethod(Map<Method, InvocationHandlerFactory.MethodHandler> dispatch) {
 		Map<Method, Method> result = new LinkedHashMap<Method, Method>();
 		for (Method method : dispatch.keySet()) {
 			method.setAccessible(true);
 			result.put(method, method);
 		}
 		return result;
 	}
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof FeignCircuitBreakerInvocationHandler) {
 			FeignCircuitBreakerInvocationHandler other = (FeignCircuitBreakerInvocationHandler) obj;
 			return this.target.equals(other.target);
 		}
 		return false;
 	}
 	@Override
 	public int hashCode() {
 		return this.target.hashCode();
 	}
 	@Override
 	public String toString() {
 		return this.target.toString();
 	}
 }
@@ -0,0 +1,96 @@
 /*
 * Copyright 2013-2022 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;
 	private final boolean circuitBreakerGroupEnabled;
 	private final CircuitBreakerNameResolver circuitBreakerNameResolver;
 	FeignCircuitBreakerTargeter(CircuitBreakerFactory circuitBreakerFactory, boolean circuitBreakerGroupEnabled,
 			CircuitBreakerNameResolver circuitBreakerNameResolver) {
 		this.circuitBreakerFactory = circuitBreakerFactory;
 		this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled;
 		this.circuitBreakerNameResolver = circuitBreakerNameResolver;
 	}
 	@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(circuitBreakerFactory).feignClientName(feignClientName)
 				.circuitBreakerGroupEnabled(circuitBreakerGroupEnabled)
 				.circuitBreakerNameResolver(circuitBreakerNameResolver);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -26,88 +27,111 @@ 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
+ * created (e.g. for autowiring into another component). If SC LoadBalancer is available
- * used to load balance the backend requests, and the load balancer can be configured
+ * it will be used to load balance the backend requests, and the load balancer can be
- * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
+ * 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)
@Documented
@Inherited
 public @interface FeignClient {
 	/**
 	 * The name of the service with optional protocol prefix. Synonym for {@link #name()
 	 * name}. A name must be specified for all clients, whether or not a url is provided.
 	 * Can be specified as property key, eg: ${propertyKey}.
 	 * @return the name of the service with optional protocol prefix
 	 */
 	@AliasFor("name")
 	String value() default "";
 	/**
-	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
+	 * This will be used as the bean name instead of name if present, but will not be used
-	 *
+	 * as a service id.
-	 * @deprecated use {@link #name() name} instead
+	 * @return bean name instead of name if present
 	 */
-	@Deprecated
+	String contextId() default "";
 	String serviceId() default "";
 	/**
-	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
+	 * @return The service id with optional protocol prefix. Synonym for {@link #value()
 	 * value}.
 	 */
 	@AliasFor("value")
 	String name() default "";
-	
+
 	/**
-	 * Sets the <code>@Qualifier</code> value for the feign client.
+	 * @return the <code>@Qualifier</code> value for the feign client.
 	 * @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 "";
 	/**
-	 * An absolute URL or resolvable hostname (the protocol is optional).
+	 * @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).
 	 */
 	String url() default "";
 	/**
-	 * Whether 404s should be decoded instead of throwing FeignExceptions
+	 * @return whether 404s should be decoded instead of throwing FeignExceptions
 	 */
 	boolean decode404() default false;
 	/**
-	 * A custom <code>@Configuration</code> for the feign client. Can contain override
+	 * A custom configuration class for the feign client. Can contain override
 	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
 	 *
 	 * @see FeignClientsConfiguration for the defaults
 	 * @return list of configurations for feign client
 	 */
 	Class<?>[] configuration() default {};
 	/**
 	 * Fallback class for the specified Feign client interface. The fallback class must
 	 * implement the interface annotated by this annotation and be a valid spring bean.
 	 * @return fallback class for the specified Feign client interface
 	 */
 	Class<?> fallback() default void.class;
 	/**
 	 * Define a fallback factory for the specified Feign client interface. The fallback
 	 * factory must produce instances of fallback classes that implement the interface
-	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring
+	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring bean.
 	 * 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;
 	/**
-	 * Path prefix to be used by all method-level mappings. Can be used with or without
+	 * @return path prefix to be used by all method-level mappings.
 	 * <code>@RibbonClient</code>.
 	 */
 	String path() default "";
 	/**
-	 * Whether to mark the feign proxy as a primary bean. Defaults to true.
+	 * @return whether to mark the feign proxy as a primary bean. Defaults to true.
 	 */
 	boolean primary() default true;
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,6 +16,8 @@
 package org.springframework.cloud.openfeign;
 import feign.Feign;
 import org.springframework.context.ApplicationContext;
 /**
@@ -25,6 +27,8 @@ import org.springframework.context.ApplicationContext;
 * {@link FeignClient} annotation.
 *
 * @author Sven Döring
 * @author Matt King
 * @author Sam Kruglov
 */
 public class FeignClientBuilder {
@@ -35,59 +39,91 @@ public class FeignClientBuilder {
 	}
 	public <T> Builder<T> forType(final Class<T> type, final String name) {
-		return new Builder<>(applicationContext, type, name);
+		return new Builder<>(this.applicationContext, type, name);
 	}
-	public static class Builder<T> {
+	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.
 	 *
 	 * @param <T> type of target
 	 */
 	public static final class Builder<T> {
 		private FeignClientFactoryBean feignClientFactoryBean;
-		private Builder(final ApplicationContext applicationContext, final Class<T> type,
+		private Builder(final ApplicationContext applicationContext, final Class<T> type, final String name) {
-				final String name) {
+			this(applicationContext, new FeignClientFactoryBean(), type, name);
-			this.feignClientFactoryBean = new FeignClientFactoryBean();
+		}
 		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);
 			this.feignClientFactoryBean.setName(FeignClientsRegistrar.getName(name));
 			this.feignClientFactoryBean.setContextId(FeignClientsRegistrar.getName(name));
 			this.feignClientFactoryBean.setInheritParentContext(true);
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
-			this.url("").path("").decode404(false).fallback(void.class)
+			this.url("").path("").decode404(false);
 					.fallbackFactory(void.class);
 		}
-		public Builder url(final String url) {
+		public Builder<T> url(final String url) {
 			this.feignClientFactoryBean.setUrl(FeignClientsRegistrar.getUrl(url));
 			return this;
 		}
-		public Builder path(final String path) {
+		/**
 		 * 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;
 		}
 		public Builder<T> path(final String path) {
 			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
 			return this;
 		}
-		public Builder decode404(final boolean decode404) {
+		public Builder<T> decode404(final boolean decode404) {
 			this.feignClientFactoryBean.setDecode404(decode404);
 			return this;
 		}
-		public Builder fallback(final Class<T> fallback) {
+		public Builder<T> inheritParentContext(final boolean inheritParentContext) {
 			this.feignClientFactoryBean.setInheritParentContext(inheritParentContext);
 			return this;
 		}
 		public Builder<T> fallback(final Class<? extends T> fallback) {
 			FeignClientsRegistrar.validateFallback(fallback);
 			this.feignClientFactoryBean.setFallback(fallback);
 			return this;
 		}
 		public Builder fallbackFactory(final Class<T> fallbackFactory) {
 			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
 			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
 			return this;
 		}
 		/**
 		 * @param <T> the target type of the Feign client to be created
 		 * @return the created Feign client
 		 */
-		public <T> T build() {
+		public T build() {
 			return this.feignClientFactoryBean.getTarget();
 		}
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,24 +16,20 @@
 package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import org.springframework.beans.BeanUtils;
+import feign.Capability;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import feign.Client;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -41,48 +37,91 @@ 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.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 /**
 * @author Spencer Gibb
 * @author Venil Noronha
 * @author Eko Kurniawan Khannedy
 * @author Gregor Zurowski
 * @author Matt King
 * @author Olga Maciaszek-Sharma
 * @author Ilia Ilinykh
 * @author Marcin Grzejszczak
 * @author Jonatan Ivanov
 * @author Sam Kruglov
 * @author Jasbir Singh
 * @author Hyeonmin Park
 * @author Felix Dittrich
 */
-class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
+public class FeignClientFactoryBean
-		ApplicationContextAware {
+		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {
 	/***********************************
-	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some lifecycle race condition.
+	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
 	 * lifecycle race condition.
 	 ***********************************/
 	private static Log LOG = LogFactory.getLog(FeignClientFactoryBean.class);
 	private Class<?> type;
 	private String name;
 	private String url;
 	private String contextId;
 	private String path;
 	private boolean decode404;
 	private boolean inheritParentContext = true;
 	private ApplicationContext applicationContext;
 	private BeanFactory beanFactory;
 	private Class<?> fallback = void.class;
 	private Class<?> fallbackFactory = void.class;
-	@Override
+	private int readTimeoutMillis = new Request.Options().readTimeoutMillis();
-	public void afterPropertiesSet() throws Exception {
+
-		Assert.hasText(this.name, "Name must be set");
+	private int connectTimeoutMillis = new Request.Options().connectTimeoutMillis();
-	}
+
 	private boolean followRedirects = new Request.Options().isFollowRedirects();
 	private boolean refreshableClient = false;
 	private final List<FeignBuilderCustomizer> additionalCustomizers = new ArrayList<>();
 	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
+	public void afterPropertiesSet() {
-		this.applicationContext = context;
+		Assert.hasText(contextId, "Context id must be set");
 		Assert.hasText(name, "Name must be set");
 	}
 	protected Feign.Builder feign(FeignContext context) {
 		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
-		Logger logger = loggerFactory.create(this.type);
+		Logger logger = loggerFactory.create(type);
 		// @formatter:off
 		Feign.Builder builder = get(context, Feign.Builder.class)
@@ -98,52 +137,101 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		return builder;
 	}
 	private void applyBuildCustomizers(FeignContext context, Feign.Builder builder) {
 		Map<String, FeignBuilderCustomizer> customizerMap = context.getInstances(contextId,
 				FeignBuilderCustomizer.class);
 		if (customizerMap != null) {
 			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 = applicationContext.getBean(FeignClientProperties.class);
+		FeignClientProperties properties = beanFactory != null ? beanFactory.getBean(FeignClientProperties.class)
-		if (properties != null) {
+				: applicationContext.getBean(FeignClientProperties.class);
 		FeignClientConfigurer feignClientConfigurer = getOptional(context, FeignClientConfigurer.class);
 		setInheritParentContext(feignClientConfigurer.inheritParentConfiguration());
 		if (properties != null && inheritParentContext) {
 			if (properties.isDefaultToProperties()) {
 				configureUsingConfiguration(context, builder);
 				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
+				configureUsingProperties(properties.getConfig().get(contextId), builder);
-			} else {
+			}
 			else {
 				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
+				configureUsingProperties(properties.getConfig().get(contextId), builder);
 				configureUsingConfiguration(context, builder);
 			}
-		} else {
+		}
 		else {
 			configureUsingConfiguration(context, builder);
 		}
 	}
 	protected void configureUsingConfiguration(FeignContext context, Feign.Builder builder) {
-		Logger.Level level = getOptional(context, Logger.Level.class);
+		Logger.Level level = getInheritedAwareOptional(context, Logger.Level.class);
 		if (level != null) {
 			builder.logLevel(level);
 		}
-		Retryer retryer = getOptional(context, Retryer.class);
+		Retryer retryer = getInheritedAwareOptional(context, Retryer.class);
 		if (retryer != null) {
 			builder.retryer(retryer);
 		}
-		ErrorDecoder errorDecoder = getOptional(context, ErrorDecoder.class);
+		ErrorDecoder errorDecoder = getInheritedAwareOptional(context, ErrorDecoder.class);
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
-		Request.Options options = getOptional(context, Request.Options.class);
+		else {
-		if (options != null) {
+			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context, FeignErrorDecoderFactory.class);
-			builder.options(options);
+			if (errorDecoderFactory != null) {
 				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(type);
 				builder.errorDecoder(factoryErrorDecoder);
 			}
 		}
-		Map<String, RequestInterceptor> requestInterceptors = context.getInstances(
+		Request.Options options = getInheritedAwareOptional(context, Request.Options.class);
-				this.name, RequestInterceptor.class);
+		if (options == null) {
-		if (requestInterceptors != null) {
+			options = getOptionsByName(context, contextId);
 			builder.requestInterceptors(requestInterceptors.values());
 		}
 		if (options != null) {
 			builder.options(options);
 			readTimeoutMillis = options.readTimeoutMillis();
 			connectTimeoutMillis = options.connectTimeoutMillis();
 			followRedirects = options.isFollowRedirects();
 		}
 		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(context,
 				RequestInterceptor.class);
 		if (requestInterceptors != null) {
 			List<RequestInterceptor> interceptors = new ArrayList<>(requestInterceptors.values());
 			AnnotationAwareOrderComparator.sort(interceptors);
 			builder.requestInterceptors(interceptors);
 		}
 		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context, QueryMapEncoder.class);
 		if (queryMapEncoder != null) {
 			builder.queryMapEncoder(queryMapEncoder);
 		}
 		if (decode404) {
 			builder.decode404();
 		}
 		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(context,
 				ExceptionPropagationPolicy.class);
 		if (exceptionPropagationPolicy != null) {
 			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
 		}
 		Map<String, Capability> capabilities = getInheritedAwareInstances(context, Capability.class);
 		if (capabilities != null) {
 			capabilities.values().stream().sorted(AnnotationAwareOrderComparator.INSTANCE)
 					.forEach(builder::addCapability);
 		}
 	}
-	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) {
+	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config,
 			Feign.Builder builder) {
 		if (config == null) {
 			return;
 		}
@@ -152,8 +240,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			builder.logLevel(config.getLoggerLevel());
 		}
-		if (config.getConnectTimeout() != null && config.getReadTimeout() != null) {
+		if (!refreshableClient) {
-			builder.options(new Request.Options(config.getConnectTimeout(), config.getReadTimeout()));
+			connectTimeoutMillis = config.getConnectTimeout() != null ? config.getConnectTimeout()
 					: connectTimeoutMillis;
 			readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout() : readTimeoutMillis;
 			followRedirects = config.isFollowRedirects() != null ? config.isFollowRedirects() : followRedirects;
 			builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS, readTimeoutMillis,
 					TimeUnit.MILLISECONDS, followRedirects));
 		}
 		if (config.getRetryer() != null) {
@@ -184,6 +278,9 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			builder.encoder(getOrInstantiate(config.getEncoder()));
 		}
 		addDefaultRequestHeaders(config, builder);
 		addDefaultQueryParams(config, builder);
 		if (Objects.nonNull(config.getDecoder())) {
 			builder.decoder(getOrInstantiate(config.getDecoder()));
 		}
@@ -191,86 +288,173 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		if (Objects.nonNull(config.getContract())) {
 			builder.contract(getOrInstantiate(config.getContract()));
 		}
 		if (Objects.nonNull(config.getExceptionPropagationPolicy())) {
 			builder.exceptionPropagationPolicy(config.getExceptionPropagationPolicy());
 		}
 		if (config.getCapabilities() != null) {
 			config.getCapabilities().stream().map(this::getOrInstantiate).forEach(builder::addCapability);
 		}
 		if (config.getQueryMapEncoder() != null) {
 			builder.queryMapEncoder(getOrInstantiate(config.getQueryMapEncoder()));
 		}
 	}
 	private void addDefaultQueryParams(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) {
 		Map<String, Collection<String>> defaultQueryParameters = config.getDefaultQueryParameters();
 		if (Objects.nonNull(defaultQueryParameters)) {
 			builder.requestInterceptor(requestTemplate -> {
 				Map<String, Collection<String>> queries = requestTemplate.queries();
 				defaultQueryParameters.keySet().forEach(key -> {
 					if (!queries.containsKey(key)) {
 						requestTemplate.query(key, defaultQueryParameters.get(key));
 					}
 				});
 			});
 		}
 	}
 	private void addDefaultRequestHeaders(FeignClientProperties.FeignClientConfiguration config,
 			Feign.Builder builder) {
 		Map<String, Collection<String>> defaultRequestHeaders = config.getDefaultRequestHeaders();
 		if (Objects.nonNull(defaultRequestHeaders)) {
 			builder.requestInterceptor(requestTemplate -> {
 				Map<String, Collection<String>> headers = requestTemplate.headers();
 				defaultRequestHeaders.keySet().forEach(key -> {
 					if (!headers.containsKey(key)) {
 						requestTemplate.header(key, defaultRequestHeaders.get(key));
 					}
 				});
 			});
 		}
 	}
 	private <T> T getOrInstantiate(Class<T> tClass) {
 		try {
-			return applicationContext.getBean(tClass);
+			return beanFactory != null ? beanFactory.getBean(tClass) : applicationContext.getBean(tClass);
-		} catch (NoSuchBeanDefinitionException e) {
+		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
 		}
 	}
 	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(this.name, type);
+		T instance = context.getInstance(contextId, type);
 		if (instance == null) {
-			throw new IllegalStateException("No bean found of type " + type + " for "
+			throw new IllegalStateException("No bean found of type " + type + " for " + contextId);
 					+ this.name);
 		}
 		return instance;
 	}
 	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(this.name, type);
+		return context.getInstance(contextId, type);
 	}
-	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
+	protected <T> T getInheritedAwareOptional(FeignContext context, Class<T> type) {
-			HardCodedTarget<T> target) {
+		if (inheritParentContext) {
 			return getOptional(context, type);
 		}
 		else {
 			return context.getInstanceWithoutAncestors(contextId, type);
 		}
 	}
 	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context, Class<T> type) {
 		if (inheritParentContext) {
 			return context.getInstances(contextId, type);
 		}
 		else {
 			return context.getInstancesWithoutAncestors(contextId, type);
 		}
 	}
 	protected <T> T loadBalance(Feign.Builder builder, FeignContext context, HardCodedTarget<T> target) {
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
 			builder.client(client);
 			applyBuildCustomizers(context, builder);
 			Targeter targeter = get(context, Targeter.class);
 			return targeter.target(this, builder, context, target);
 		}
 		throw new IllegalStateException(
-				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon?");
+				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-loadbalancer?");
 	}
 	/**
 	 * Meant to get Options bean from context with bean name.
 	 * @param context context of Feign client
 	 * @param contextId name of feign client
 	 * @return returns Options found in context
 	 */
 	protected Request.Options getOptionsByName(FeignContext context, String contextId) {
 		if (refreshableClient) {
 			return context.getInstance(contextId, Request.Options.class.getCanonicalName() + "-" + contextId,
 					Request.Options.class);
 		}
 		return null;
 	}
 	@Override
-	public Object getObject() throws Exception {
+	public Object getObject() {
 		return getTarget();
 	}
 	/**
 	 * @param <T> the target type of the Feign client
-	 * @return a {@link Feign} client created with the specified data and the context information
+	 * @return a {@link Feign} client created with the specified data and the context
 	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = applicationContext.getBean(FeignContext.class);
+		FeignContext context = beanFactory != null ? beanFactory.getBean(FeignContext.class)
 				: applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);
-		if (!StringUtils.hasText(this.url)) {
+		if (!StringUtils.hasText(url)) {
-			String url;
+
-			if (!this.name.startsWith("http")) {
+			if (LOG.isInfoEnabled()) {
-				url = "http://" + this.name;
+				LOG.info("For '" + name + "' URL not provided. Will try picking an instance via load-balancing.");
 			}
 			if (!name.startsWith("http")) {
 				url = "http://" + name;
 			}
 			else {
-				url = this.name;
+				url = name;
 			}
 			url += cleanPath();
-			return (T) loadBalance(builder, context, new HardCodedTarget<>(this.type,
+			return (T) loadBalance(builder, context, new HardCodedTarget<>(type, name, url));
 					this.name, url));
 		}
-		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
+		if (StringUtils.hasText(url) && !url.startsWith("http")) {
-			this.url = "http://" + this.url;
+			url = "http://" + url;
 		}
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
-			if (client instanceof LoadBalancerFeignClient) {
+			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
-				// but ribbon is on the classpath, so unwrap
+				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient)client).getDelegate();
+				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);
 		}
 		applyBuildCustomizers(context, builder);
 		Targeter targeter = get(context, Targeter.class);
-		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(
+		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(type, name, url));
 				this.type, this.name, url));
 	}
 	private String cleanPath() {
 		if (path == null) {
 			return "";
 		}
 		String path = this.path.trim();
 		if (StringUtils.hasLength(path)) {
 			if (!path.startsWith("/")) {
@@ -285,7 +469,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	@Override
 	public Class<?> getObjectType() {
-		return this.type;
+		return type;
 	}
 	@Override
@@ -309,6 +493,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		this.name = name;
 	}
 	public String getContextId() {
 		return contextId;
 	}
 	public void setContextId(String contextId) {
 		this.contextId = contextId;
 	}
 	public String getUrl() {
 		return url;
 	}
@@ -333,10 +525,28 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		this.decode404 = decode404;
 	}
 	public boolean isInheritParentContext() {
 		return inheritParentContext;
 	}
 	public void setInheritParentContext(boolean inheritParentContext) {
 		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;
 	}
 	public Class<?> getFallback() {
 		return fallback;
 	}
@@ -353,39 +563,52 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		this.fallbackFactory = fallbackFactory;
 	}
 	public void setRefreshableClient(boolean refreshableClient) {
 		this.refreshableClient = refreshableClient;
 	}
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
 		}
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(applicationContext, that.applicationContext) &&
+		return Objects.equals(applicationContext, that.applicationContext)
-				decode404 == that.decode404 &&
+				&& Objects.equals(beanFactory, that.beanFactory) && decode404 == that.decode404
-				Objects.equals(fallback, that.fallback) &&
+				&& inheritParentContext == that.inheritParentContext && Objects.equals(fallback, that.fallback)
-				Objects.equals(fallbackFactory, that.fallbackFactory) &&
+				&& Objects.equals(fallbackFactory, that.fallbackFactory) && Objects.equals(name, that.name)
-				Objects.equals(name, that.name) &&
+				&& Objects.equals(path, that.path) && Objects.equals(type, that.type) && Objects.equals(url, that.url)
-				Objects.equals(path, that.path) &&
+				&& Objects.equals(connectTimeoutMillis, that.connectTimeoutMillis)
-				Objects.equals(type, that.type) &&
+				&& Objects.equals(readTimeoutMillis, that.readTimeoutMillis)
-				Objects.equals(url, that.url);
+				&& Objects.equals(followRedirects, that.followRedirects)
 				&& Objects.equals(refreshableClient, that.refreshableClient);
 	}
 	@Override
 	public int hashCode() {
-		return Objects.hash(applicationContext, decode404, fallback, fallbackFactory,
+		return Objects.hash(applicationContext, beanFactory, decode404, inheritParentContext, fallback, fallbackFactory,
-				name, path, type, url);
+				name, path, type, url, readTimeoutMillis, connectTimeoutMillis, followRedirects, refreshableClient);
 	}
 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{")
+		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type).append(", ").append("name='")
-				.append("type=").append(type).append(", ")
+				.append(name).append("', ").append("url='").append(url).append("', ").append("path='").append(path)
-				.append("name='").append(name).append("', ")
+				.append("', ").append("decode404=").append(decode404).append(", ").append("inheritParentContext=")
-				.append("url='").append(url).append("', ")
+				.append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext)
-				.append("path='").append(path).append("', ")
+				.append(", ").append("beanFactory=").append(beanFactory).append(", ").append("fallback=")
-				.append("decode404=").append(decode404).append(", ")
+				.append(fallback).append(", ").append("fallbackFactory=").append(fallbackFactory).append("}")
-				.append("applicationContext=").append(applicationContext).append(", ")
+				.append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}").append("readTimeoutMillis=")
-				.append("fallback=").append(fallback).append(", ")
+				.append(readTimeoutMillis).append("}").append("followRedirects=").append(followRedirects)
-				.append("fallbackFactory=").append(fallbackFactory)
+				.append("refreshableClient=").append(refreshableClient).append("}").toString();
-				.append("}").toString();
+	}
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}
 }
@@ -0,0 +1,52 @@
 /*
 * Copyright 2021-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.util.Map;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 /**
 * @author Jonatan Ivanov
 */
 class FeignClientMetricsEnabledCondition implements Condition {
 	@Override
 	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		FeignClientProperties feignClientProperties = context.getBeanFactory()
 				.getBeanProvider(FeignClientProperties.class).getIfAvailable();
 		if (feignClientProperties != null) {
 			Map<String, FeignClientProperties.FeignClientConfiguration> feignClientConfigMap = feignClientProperties
 					.getConfig();
 			if (feignClientConfigMap != null) {
 				FeignClientProperties.FeignClientConfiguration feignClientConfig = feignClientConfigMap
 						.get(context.getEnvironment().getProperty("spring.cloud.openfeign.client.name"));
 				if (feignClientConfig != null) {
 					FeignClientProperties.MetricsProperties metrics = feignClientConfig.getMetrics();
 					if (metrics != null && metrics.getEnabled() != null) {
 						return metrics.getEnabled();
 					}
 				}
 			}
 		}
 		return true;
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,26 +13,37 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
-import feign.Contract;
+import java.util.Collection;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import feign.Capability;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.RequestInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 /**
 * @author Eko Kurniawan Khannedy
 * @author Ilia Ilinykh
 * @author Ram Anaswara
 * @author Jonatan Ivanov
 * @author Olga Maciaszek-Sharma
 * @author Hyeonmin Park
 */
-@ConfigurationProperties("feign.client")
+@ConfigurationProperties("spring.cloud.openfeign.client")
 public class FeignClientProperties {
 	private boolean defaultToProperties = true;
@@ -41,6 +52,12 @@ public class FeignClientProperties {
 	private Map<String, FeignClientConfiguration> config = new HashMap<>();
 	/**
 	 * Feign clients do not encode slash `/` characters by default. To change this
 	 * behavior, set the `decodeSlash` to `false`.
 	 */
 	private boolean decodeSlash = true;
 	public boolean isDefaultToProperties() {
 		return defaultToProperties;
 	}
@@ -65,21 +82,35 @@ public class FeignClientProperties {
 		this.config = config;
 	}
 	public boolean isDecodeSlash() {
 		return decodeSlash;
 	}
 	public void setDecodeSlash(boolean decodeSlash) {
 		this.decodeSlash = decodeSlash;
 	}
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
 		}
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties &&
+		return defaultToProperties == that.defaultToProperties && Objects.equals(defaultConfig, that.defaultConfig)
-				Objects.equals(defaultConfig, that.defaultConfig) &&
+				&& Objects.equals(config, that.config) && Objects.equals(decodeSlash, that.decodeSlash);
 				Objects.equals(config, that.config);
 	}
 	@Override
 	public int hashCode() {
-		return Objects.hash(defaultToProperties, defaultConfig, config);
+		return Objects.hash(defaultToProperties, defaultConfig, config, decodeSlash);
 	}
 	/**
 	 * Feign client configuration.
 	 */
 	public static class FeignClientConfiguration {
 		private Logger.Level loggerLevel;
@@ -94,6 +125,10 @@ public class FeignClientProperties {
 		private List<Class<RequestInterceptor>> requestInterceptors;
 		private Map<String, Collection<String>> defaultRequestHeaders;
 		private Map<String, Collection<String>> defaultQueryParameters;
 		private Boolean decode404;
 		private Class<Decoder> decoder;
@@ -102,6 +137,16 @@ public class FeignClientProperties {
 		private Class<Contract> contract;
 		private ExceptionPropagationPolicy exceptionPropagationPolicy;
 		private List<Class<Capability>> capabilities;
 		private Class<QueryMapEncoder> queryMapEncoder;
 		private MetricsProperties metrics;
 		private Boolean followRedirects;
 		public Logger.Level getLoggerLevel() {
 			return loggerLevel;
 		}
@@ -150,6 +195,22 @@ public class FeignClientProperties {
 			this.requestInterceptors = requestInterceptors;
 		}
 		public Map<String, Collection<String>> getDefaultRequestHeaders() {
 			return defaultRequestHeaders;
 		}
 		public void setDefaultRequestHeaders(Map<String, Collection<String>> defaultRequestHeaders) {
 			this.defaultRequestHeaders = defaultRequestHeaders;
 		}
 		public Map<String, Collection<String>> getDefaultQueryParameters() {
 			return defaultQueryParameters;
 		}
 		public void setDefaultQueryParameters(Map<String, Collection<String>> defaultQueryParameters) {
 			this.defaultQueryParameters = defaultQueryParameters;
 		}
 		public Boolean getDecode404() {
 			return decode404;
 		}
@@ -182,28 +243,111 @@ public class FeignClientProperties {
 			this.contract = contract;
 		}
 		public ExceptionPropagationPolicy getExceptionPropagationPolicy() {
 			return exceptionPropagationPolicy;
 		}
 		public void setExceptionPropagationPolicy(ExceptionPropagationPolicy exceptionPropagationPolicy) {
 			this.exceptionPropagationPolicy = exceptionPropagationPolicy;
 		}
 		public List<Class<Capability>> getCapabilities() {
 			return capabilities;
 		}
 		public void setCapabilities(List<Class<Capability>> capabilities) {
 			this.capabilities = capabilities;
 		}
 		public Class<QueryMapEncoder> getQueryMapEncoder() {
 			return queryMapEncoder;
 		}
 		public void setQueryMapEncoder(Class<QueryMapEncoder> queryMapEncoder) {
 			this.queryMapEncoder = queryMapEncoder;
 		}
 		public MetricsProperties getMetrics() {
 			return metrics;
 		}
 		public void setMetrics(MetricsProperties metrics) {
 			this.metrics = metrics;
 		}
 		public Boolean isFollowRedirects() {
 			return followRedirects;
 		}
 		public void setFollowRedirects(Boolean followRedirects) {
 			this.followRedirects = followRedirects;
 		}
 		@Override
 		public boolean equals(Object o) {
-			if (this == o) return true;
+			if (this == o) {
-			if (o == null || getClass() != o.getClass()) return false;
+				return true;
 			}
 			if (o == null || getClass() != o.getClass()) {
 				return false;
 			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel &&
+			return loggerLevel == that.loggerLevel && Objects.equals(connectTimeout, that.connectTimeout)
-					Objects.equals(connectTimeout, that.connectTimeout) &&
+					&& Objects.equals(readTimeout, that.readTimeout) && Objects.equals(retryer, that.retryer)
-					Objects.equals(readTimeout, that.readTimeout) &&
+					&& Objects.equals(errorDecoder, that.errorDecoder)
-					Objects.equals(retryer, that.retryer) &&
+					&& Objects.equals(requestInterceptors, that.requestInterceptors)
-					Objects.equals(errorDecoder, that.errorDecoder) &&
+					&& Objects.equals(decode404, that.decode404) && Objects.equals(encoder, that.encoder)
-					Objects.equals(requestInterceptors, that.requestInterceptors) &&
+					&& Objects.equals(decoder, that.decoder) && Objects.equals(contract, that.contract)
-					Objects.equals(decode404, that.decode404) &&
+					&& Objects.equals(exceptionPropagationPolicy, that.exceptionPropagationPolicy)
-					Objects.equals(encoder, that.encoder) &&
+					&& Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders)
-					Objects.equals(decoder, that.decoder) &&
+					&& Objects.equals(defaultQueryParameters, that.defaultQueryParameters)
-					Objects.equals(contract, that.contract);
+					&& Objects.equals(capabilities, that.capabilities)
 					&& Objects.equals(queryMapEncoder, that.queryMapEncoder) && Objects.equals(metrics, that.metrics)
 					&& Objects.equals(followRedirects, that.followRedirects);
 		}
 		@Override
 		public int hashCode() {
-			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer,
+			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer, errorDecoder, requestInterceptors,
-					errorDecoder, requestInterceptors, decode404, encoder, decoder, contract);
+					decode404, encoder, decoder, contract, exceptionPropagationPolicy, defaultQueryParameters,
 					defaultRequestHeaders, capabilities, queryMapEncoder, metrics, followRedirects);
 		}
 	}
 	/**
 	 * Metrics configuration for Feign Client.
 	 */
 	public static class MetricsProperties {
 		private Boolean enabled = true;
 		public Boolean getEnabled() {
 			return enabled;
 		}
 		public void setEnabled(Boolean enabled) {
 			this.enabled = enabled;
 		}
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
 			if (o == null || getClass() != o.getClass()) {
 				return false;
 			}
 			MetricsProperties that = (MetricsProperties) o;
 			return Objects.equals(enabled, that.enabled);
 		}
 		@Override
 		public int hashCode() {
 			return Objects.hash(enabled);
 		}
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,22 +16,23 @@
 package org.springframework.cloud.openfeign;
 import org.springframework.cloud.context.named.NamedContextFactory;
 import java.util.Arrays;
 import java.util.Objects;
 import org.springframework.cloud.context.named.NamedContextFactory;
 /**
 * @author Dave Syer
 * @author Gregor Zurowski
 */
-class FeignClientSpecification implements NamedContextFactory.Specification {
+public class FeignClientSpecification implements NamedContextFactory.Specification {
 	private String name;
 	private Class<?>[] configuration;
-	public FeignClientSpecification() {}
+	FeignClientSpecification() {
 	}
 	public FeignClientSpecification(String name, Class<?>[] configuration) {
 		this.name = name;
@@ -39,7 +40,7 @@ class FeignClientSpecification implements NamedContextFactory.Specification {
 	}
 	public String getName() {
-		return name;
+		return this.name;
 	}
 	public void setName(String name) {
@@ -47,7 +48,7 @@ class FeignClientSpecification implements NamedContextFactory.Specification {
 	}
 	public Class<?>[] getConfiguration() {
-		return configuration;
+		return this.configuration;
 	}
 	public void setConfiguration(Class<?>[] configuration) {
@@ -56,24 +57,25 @@ class FeignClientSpecification implements NamedContextFactory.Specification {
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
 		}
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
 		FeignClientSpecification that = (FeignClientSpecification) o;
-		return Objects.equals(name, that.name) &&
+		return Objects.equals(this.name, that.name) && Arrays.equals(this.configuration, that.configuration);
 				Arrays.equals(configuration, that.configuration);
 	}
 	@Override
 	public int hashCode() {
-		return Objects.hash(name, configuration);
+		return Objects.hash(this.name, this.configuration);
 	}
 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientSpecification{")
+		return new StringBuilder("FeignClientSpecification{").append("name='").append(this.name).append("', ")
-				.append("name='").append(name).append("', ")
+				.append("configuration=").append(Arrays.toString(this.configuration)).append("}").toString();
 				.append("configuration=").append(Arrays.toString(configuration))
 				.append("}").toString();
 	}
 }
@@ -1,18 +1,17 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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;
@@ -20,39 +19,61 @@ package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.List;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.form.MultipartFormContentProcessor;
 import feign.form.spring.SpringFormEncoder;
 import feign.micrometer.MicrometerCapability;
 import feign.optionals.OptionalDecoder;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.support.AbstractFormWriter;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 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.SpringDecoder;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.format.support.FormattingConversionService;
-import com.netflix.hystrix.HystrixCommand;
+import static feign.form.ContentType.MULTIPART;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
 /**
 * @author Dave Syer
 * @author Venil Noronha
 * @author Darren Foong
 * @author Jonatan Ivanov
 * @author Olga Maciaszek-Sharma
 * @author Hyeonmin Park
 * @author Yanming Zhou
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
 	@Autowired
@@ -67,22 +88,63 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private Logger logger;
 	@Autowired(required = false)
 	private SpringDataWebProperties springDataWebProperties;
 	@Autowired(required = false)
 	private FeignClientProperties feignClientProperties;
 	@Autowired(required = false)
 	private FeignEncoderProperties encoderProperties;
 	@Bean
 	@ConditionalOnMissingBean
-	public Decoder feignDecoder() {
+	public Decoder feignDecoder(ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
+		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(messageConverters, customizers)));
 	}
 	@Bean
 	@ConditionalOnMissingBean
-	public Encoder feignEncoder() {
+	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
-		return new SpringEncoder(this.messageConverters);
+	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
 			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		return springEncoder(formWriterProvider, encoderProperties, customizers);
 	}
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider,
 			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		PageableSpringEncoder encoder = new PageableSpringEncoder(
 				springEncoder(formWriterProvider, encoderProperties, customizers));
 		if (springDataWebProperties != null) {
 			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() {
 		PageableSpringQueryMapEncoder queryMapEncoder = new PageableSpringQueryMapEncoder();
 		if (springDataWebProperties != null) {
 			queryMapEncoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
 			queryMapEncoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter());
 			queryMapEncoder.setSortParameter(springDataWebProperties.getSort().getSortParameter());
 		}
 		return queryMapEncoder;
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
-		return new SpringMvcContract(this.parameterProcessors, feignConversionService);
+		boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash();
 		return new SpringMvcContract(parameterProcessors, feignConversionService, decodeSlash);
 	}
 	@Bean
@@ -94,35 +156,97 @@ public class FeignClientsConfiguration {
 		return conversionService;
 	}
 	@Configuration
 	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
 	protected static class HystrixFeignConfiguration {
 		@Bean
 		@Scope("prototype")
 		@ConditionalOnMissingBean
 		@ConditionalOnProperty(name = "feign.hystrix.enabled")
 		public Feign.Builder feignHystrixBuilder() {
 			return HystrixFeign.builder();
 		}
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	public Retryer feignRetryer() {
 		return Retryer.NEVER_RETRY;
 	}
 	@Bean
 	@Scope("prototype")
 	@ConditionalOnMissingBean
 	public Feign.Builder feignBuilder(Retryer retryer) {
 		return Feign.builder().retryer(retryer);
 	}
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
 		return new DefaultFeignLoggerFactory(logger);
 	}
 	@Bean
 	@ConditionalOnMissingBean(FeignClientConfigurer.class)
 	public FeignClientConfigurer feignClientConfigurer() {
 		return new FeignClientConfigurer() {
 		};
 	}
 	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
 			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
 		if (formWriter != null) {
 			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties,
 					customizers);
 		}
 		else {
 			return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers);
 		}
 	}
 	private class SpringPojoFormEncoder extends SpringFormEncoder {
 		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
 			super();
 			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(MULTIPART);
 			processor.addFirstWriter(formWriter);
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@Conditional(FeignCircuitBreakerDisabledConditions.class)
 	protected static class DefaultFeignBuilderConfiguration {
 		@Bean
 		@Scope("prototype")
 		@ConditionalOnMissingBean
 		public Feign.Builder feignBuilder(Retryer retryer) {
 			return Feign.builder().retryer(retryer);
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(CircuitBreaker.class)
 	@ConditionalOnProperty("spring.cloud.openfeign.circuitbreaker.enabled")
 	protected static class CircuitBreakerPresentFeignBuilderConfiguration {
 		@Bean
 		@Scope("prototype")
 		@ConditionalOnMissingBean({ Feign.Builder.class, CircuitBreakerFactory.class })
 		public Feign.Builder defaultFeignBuilder(Retryer retryer) {
 			return Feign.builder().retryer(retryer);
 		}
 		@Bean
 		@Scope("prototype")
 		@ConditionalOnMissingBean
 		@ConditionalOnBean(CircuitBreakerFactory.class)
 		public Feign.Builder circuitBreakerFeignBuilder() {
 			return FeignCircuitBreaker.builder();
 		}
 	}
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(type = "io.micrometer.core.instrument.MeterRegistry")
 	@ConditionalOnClass(name = "feign.micrometer.MicrometerCapability")
 	@ConditionalOnProperty(name = "spring.cloud.openfeign.metrics.enabled", matchIfMissing = true)
 	@Conditional(FeignClientMetricsEnabledCondition.class)
 	protected static class MetricsConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
 			return new MicrometerCapability(meterRegistry);
 		}
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,20 +16,30 @@
 package org.springframework.cloud.openfeign;
 import java.io.IOException;
 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;
 import feign.Request;
 import org.springframework.aop.scope.ScopedProxyUtils;
 import org.springframework.beans.factory.FactoryBean;
 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;
@@ -42,14 +52,10 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.ClassMetadata;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.AbstractClassTestingTypeFilter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 /**
@@ -57,9 +63,12 @@ import org.springframework.util.StringUtils;
 * @author Jakub Narloch
 * @author Venil Noronha
 * @author Gang Li
 * @author Michal Domagala
 * @author Marcin Grzejszczak
 * @author Olga Maciaszek-Sharma
 * @author Jasbir Singh
 */
-class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
+class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {
 		ResourceLoaderAware, EnvironmentAware {
 	// patterned after Spring Integration IntegrationComponentScanRegistrar
 	// and RibbonClientsConfigurationRegistgrar
@@ -68,163 +77,16 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 	private Environment environment;
-	public FeignClientsRegistrar() {
+	FeignClientsRegistrar() {
 	}
 	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 	@Override
 	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);
 		if (defaultAttrs != null && defaultAttrs.containsKey("defaultConfiguration")) {
 			String name;
 			if (metadata.hasEnclosingClass()) {
 				name = "default." + metadata.getEnclosingClassName();
 			}
 			else {
 				name = "default." + metadata.getClassName();
 			}
 			registerClientConfiguration(registry, name,
 					defaultAttrs.get("defaultConfiguration"));
 		}
 	}
 	public void registerFeignClients(AnnotationMetadata metadata,
 			BeanDefinitionRegistry registry) {
 		ClassPathScanningCandidateComponentProvider scanner = getScanner();
 		scanner.setResourceLoader(this.resourceLoader);
 		Set<String> basePackages;
 		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) {
 			scanner.addIncludeFilter(annotationTypeFilter);
 			basePackages = getBasePackages(metadata);
 		}
 		else {
 			final Set<String> clientClasses = new HashSet<>();
 			basePackages = new HashSet<>();
 			for (Class<?> clazz : clients) {
 				basePackages.add(ClassUtils.getPackageName(clazz));
 				clientClasses.add(clazz.getCanonicalName());
 			}
 			AbstractClassTestingTypeFilter filter = new AbstractClassTestingTypeFilter() {
 				@Override
 				protected boolean match(ClassMetadata metadata) {
 					String cleaned = metadata.getClassName().replaceAll("\\$", ".");
 					return clientClasses.contains(cleaned);
 				}
 			};
 			scanner.addIncludeFilter(
 					new AllTypeFilter(Arrays.asList(filter, annotationTypeFilter)));
 		}
 		for (String basePackage : basePackages) {
 			Set<BeanDefinition> candidateComponents = scanner
 					.findCandidateComponents(basePackage);
 			for (BeanDefinition candidateComponent : candidateComponents) {
 				if (candidateComponent instanceof AnnotatedBeanDefinition) {
 					// 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");
 					Map<String, Object> attributes = annotationMetadata
 							.getAnnotationAttributes(
 									FeignClient.class.getCanonicalName());
 					String name = getClientName(attributes);
 					registerClientConfiguration(registry, name,
 							attributes.get("configuration"));
 					registerFeignClient(registry, annotationMetadata, attributes);
 				}
 			}
 		}
 	}
 	private void registerFeignClient(BeanDefinitionRegistry registry,
 			AnnotationMetadata annotationMetadata, Map<String, Object> attributes) {
 		String className = annotationMetadata.getClassName();
 		BeanDefinitionBuilder definition = BeanDefinitionBuilder
 				.genericBeanDefinition(FeignClientFactoryBean.class);
 		validate(attributes);
 		definition.addPropertyValue("url", getUrl(attributes));
 		definition.addPropertyValue("path", getPath(attributes));
 		String name = getName(attributes);
 		definition.addPropertyValue("name", name);
 		definition.addPropertyValue("type", className);
 		definition.addPropertyValue("decode404", attributes.get("decode404"));
 		definition.addPropertyValue("fallback", attributes.get("fallback"));
 		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 		String alias = name + "FeignClient";
 		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();
 		boolean primary = (Boolean)attributes.get("primary"); // has a default, won't be null
 		beanDefinition.setPrimary(primary);
 		String qualifier = getQualifier(attributes);
 		if (StringUtils.hasText(qualifier)) {
 			alias = qualifier;
 		}
 		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className,
 				new String[] { alias });
 		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
 	}
 	private void validate(Map<String, Object> attributes) {
 		AnnotationAttributes annotation = AnnotationAttributes.fromMap(attributes);
 		// This blows up if an aliased property is overspecified
 		// FIXME annotation.getAliasedString("name", FeignClient.class, null);
 		validateFallback(annotation.getClass("fallback"));
 		validateFallbackFactory(annotation.getClass("fallbackFactory"));
 	}
 	static void validateFallback(final Class clazz) {
-		Assert.isTrue(
+		Assert.isTrue(!clazz.isInterface(), "Fallback class must implement the interface annotated by @FeignClient");
 			!clazz.isInterface(),
 			"Fallback class must implement the interface annotated by @FeignClient"
 		);
 	}
 	static void validateFallbackFactory(final Class clazz) {
-		Assert.isTrue(!clazz.isInterface(),
+		Assert.isTrue(!clazz.isInterface(), "Fallback factory must produce instances "
-			"Fallback factory must produce instances of fallback classes that implement the interface annotated by @FeignClient"
+				+ "of fallback classes that implement the interface annotated by @FeignClient");
 		);
 	}
 	/* for testing */ String getName(Map<String, Object> attributes) {
 		String name = (String) attributes.get("serviceId");
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("name");
 		}
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("value");
 		}
 		name = resolve(name);
 		return getName(name);
 	}
 	static String getName(String name) {
@@ -237,7 +99,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 			String url;
 			if (!name.startsWith("http://") && !name.startsWith("https://")) {
 				url = "http://" + name;
-			} else {
+			}
 			else {
 				url = name;
 			}
 			host = new URI(url).getHost();
@@ -249,18 +112,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return name;
 	}
 	private String resolve(String value) {
 		if (StringUtils.hasText(value)) {
 			return this.environment.resolvePlaceholders(value);
 		}
 		return value;
 	}
 	private String getUrl(Map<String, Object> attributes) {
 		String url = resolve((String) attributes.get("url"));
 		return getUrl(url);
 	}
 	static String getUrl(String url) {
 		if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) {
 			if (!url.contains("://")) {
@@ -276,11 +127,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return url;
 	}
 	private String getPath(Map<String, Object> attributes) {
 		String path = resolve((String) attributes.get("path"));
 		return getPath(path);
 	}
 	static String getPath(String path) {
 		if (StringUtils.hasText(path)) {
 			path = path.trim();
@@ -294,6 +140,187 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return path;
 	}
 	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 	@Override
 	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);
 		if (defaultAttrs != null && defaultAttrs.containsKey("defaultConfiguration")) {
 			String name;
 			if (metadata.hasEnclosingClass()) {
 				name = "default." + metadata.getEnclosingClassName();
 			}
 			else {
 				name = "default." + metadata.getClassName();
 			}
 			registerClientConfiguration(registry, name, defaultAttrs.get("defaultConfiguration"));
 		}
 	}
 	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");
 		if (clients == null || clients.length == 0) {
 			ClassPathScanningCandidateComponentProvider scanner = getScanner();
 			scanner.setResourceLoader(this.resourceLoader);
 			scanner.addIncludeFilter(new AnnotationTypeFilter(FeignClient.class));
 			Set<String> basePackages = getBasePackages(metadata);
 			for (String basePackage : basePackages) {
 				candidateComponents.addAll(scanner.findCandidateComponents(basePackage));
 			}
 		}
 		else {
 			for (Class<?> clazz : clients) {
 				candidateComponents.add(new AnnotatedGenericBeanDefinition(clazz));
 			}
 		}
 		for (BeanDefinition candidateComponent : candidateComponents) {
 			if (candidateComponent instanceof AnnotatedBeanDefinition) {
 				// 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");
 				Map<String, Object> attributes = annotationMetadata
 						.getAnnotationAttributes(FeignClient.class.getCanonicalName());
 				String name = getClientName(attributes);
 				registerClientConfiguration(registry, name, attributes.get("configuration"));
 				registerFeignClient(registry, annotationMetadata, 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);
 		factoryBean.setRefreshableClient(isClientRefreshEnabled());
 		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(clazz, () -> {
 			factoryBean.setUrl(getUrl(beanFactory, attributes));
 			factoryBean.setPath(getPath(beanFactory, attributes));
 			factoryBean.setDecode404(Boolean.parseBoolean(String.valueOf(attributes.get("decode404"))));
 			Object fallback = attributes.get("fallback");
 			if (fallback != null) {
 				factoryBean.setFallback(fallback instanceof Class ? (Class<?>) fallback
 						: ClassUtils.resolveClassName(fallback.toString(), null));
 			}
 			Object fallbackFactory = attributes.get("fallbackFactory");
 			if (fallbackFactory != null) {
 				factoryBean.setFallbackFactory(fallbackFactory instanceof Class ? (Class<?>) fallbackFactory
 						: ClassUtils.resolveClassName(fallbackFactory.toString(), null));
 			}
 			return factoryBean.getObject();
 		});
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 		definition.setLazyInit(true);
 		validate(attributes);
 		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" };
 		}
 		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers);
 		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
 		registerOptionsBeanDefinition(registry, contextId);
 	}
 	private void validate(Map<String, Object> attributes) {
 		AnnotationAttributes annotation = AnnotationAttributes.fromMap(attributes);
 		// This blows up if an aliased property is overspecified
 		// FIXME annotation.getAliasedString("name", FeignClient.class, null);
 		validateFallback(annotation.getClass("fallback"));
 		validateFallbackFactory(annotation.getClass("fallbackFactory"));
 	}
 	/* 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");
 		}
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("value");
 		}
 		name = resolve(beanFactory, name);
 		return getName(name);
 	}
 	private String getContextId(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
 		String contextId = (String) attributes.get("contextId");
 		if (!StringUtils.hasText(contextId)) {
 			return getName(attributes);
 		}
 		contextId = resolve(beanFactory, contextId);
 		return getName(contextId);
 	}
 	private String resolve(ConfigurableBeanFactory beanFactory, 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;
 			}
 			Object evaluateValue = resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null));
 			if (evaluateValue != null) {
 				return String.valueOf(evaluateValue);
 			}
 			return null;
 		}
 		return value;
 	}
 	private String getUrl(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
 		String url = resolve(beanFactory, (String) attributes.get("url"));
 		return getUrl(url);
 	}
 	private String getPath(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
 		String path = resolve(beanFactory, (String) attributes.get("path"));
 		return getPath(path);
 	}
 	protected ClassPathScanningCandidateComponentProvider getScanner() {
 		return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
 			@Override
@@ -329,12 +356,11 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		}
 		if (basePackages.isEmpty()) {
-			basePackages.add(
+			basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
 					ClassUtils.getPackageName(importingClassMetadata.getClassName()));
 		}
 		return basePackages;
 	}
-	
+
 	private String getQualifier(Map<String, Object> client) {
 		if (client == null) {
 			return null;
@@ -346,11 +372,26 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		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;
 		}
-		String value = (String) client.get("value");
+		String value = (String) client.get("contextId");
 		if (!StringUtils.hasText(value)) {
 			value = (String) client.get("value");
 		}
 		if (!StringUtils.hasText(value)) {
 			value = (String) client.get("name");
 		}
@@ -361,18 +402,15 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 			return value;
 		}
-		throw new IllegalStateException("Either 'name' or 'value' must be provided in @"
+		throw new IllegalStateException(
-				+ FeignClient.class.getSimpleName());
+				"Either 'name' or 'value' must be provided in @" + FeignClient.class.getSimpleName());
 	}
-	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name,
+	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, Object configuration) {
-			Object configuration) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FeignClientSpecification.class);
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
 				.genericBeanDefinition(FeignClientSpecification.class);
 		builder.addConstructorArgValue(name);
 		builder.addConstructorArgValue(configuration);
-		registry.registerBeanDefinition(
+		registry.registerBeanDefinition(name + "." + FeignClientSpecification.class.getSimpleName(),
 				name + "." + FeignClientSpecification.class.getSimpleName(),
 				builder.getBeanDefinition());
 	}
@@ -382,36 +420,27 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 	}
 	/**
-	 * Helper class to create a {@link TypeFilter} that matches if all the delegates
+	 * This method is meant to create {@link Request.Options} beans definition with
-	 * match.
+	 * refreshScope.
-	 *
+	 * @param registry spring bean definition registry
-	 * @author Oliver Gierke
+	 * @param contextId name of feign client
 	 */
-	private static class AllTypeFilter implements TypeFilter {
+	private void registerOptionsBeanDefinition(BeanDefinitionRegistry registry, String contextId) {
-
+		if (isClientRefreshEnabled()) {
-		private final List<TypeFilter> delegates;
+			String beanName = Request.Options.class.getCanonicalName() + "-" + contextId;
-
+			BeanDefinitionBuilder definitionBuilder = BeanDefinitionBuilder
-		/**
+					.genericBeanDefinition(OptionsFactoryBean.class);
-		 * Creates a new {@link AllTypeFilter} to match if all the given delegates match.
+			definitionBuilder.setScope("refresh");
-		 *
+			definitionBuilder.addPropertyValue("contextId", contextId);
-		 * @param delegates must not be {@literal null}.
+			BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(definitionBuilder.getBeanDefinition(),
-		 */
+					beanName);
-		public AllTypeFilter(List<TypeFilter> delegates) {
+			definitionHolder = ScopedProxyUtils.createScopedProxy(definitionHolder, registry, true);
-			Assert.notNull(delegates, "This argument is required, it must not be null");
+			BeanDefinitionReaderUtils.registerBeanDefinition(definitionHolder, registry);
 			this.delegates = delegates;
 		}
 		@Override
 		public boolean match(MetadataReader metadataReader,
 				MetadataReaderFactory metadataReaderFactory) throws IOException {
 			for (TypeFilter filter : this.delegates) {
 				if (!filter.match(metadataReader, metadataReaderFactory)) {
 					return false;
 				}
 			}
 			return true;
 		}
 	}
 	private boolean isClientRefreshEnabled() {
 		return environment.getProperty("spring.cloud.openfeign.client.refresh-enabled", Boolean.class, false);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,7 +16,12 @@
 package org.springframework.cloud.openfeign;
 import java.util.Map;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.cloud.context.named.NamedContextFactory;
 import org.springframework.lang.Nullable;
 /**
 * A factory that creates instances of feign classes. It creates a Spring
@@ -24,11 +29,32 @@ import org.springframework.cloud.context.named.NamedContextFactory;
 *
 * @author Spencer Gibb
 * @author Dave Syer
 * @author Matt King
 * @author Jasbir Singh
 */
 public class FeignContext extends NamedContextFactory<FeignClientSpecification> {
 	public FeignContext() {
-		super(FeignClientsConfiguration.class, "feign", "feign.client.name");
+		super(FeignClientsConfiguration.class, "spring.cloud.openfeign", "spring.cloud.openfeign.client.name");
 	}
 	@Nullable
 	public <T> T getInstanceWithoutAncestors(String name, Class<T> type) {
 		try {
 			return BeanFactoryUtils.beanOfType(getContext(name), type);
 		}
 		catch (BeansException ex) {
 			return null;
 		}
 	}
 	@Nullable
 	public <T> Map<String, T> getInstancesWithoutAncestors(String name, Class<T> type) {
 		return getContext(name).getBeansOfType(type);
 	}
 	public <T> T getInstance(String contextName, String beanName, Class<T> type) {
 		return getContext(contextName).getBean(beanName, type);
 	}
 }
@@ -0,0 +1,37 @@
 /*
 * Copyright 2020-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import feign.codec.ErrorDecoder;
 /**
 * Allows an application to use a custom Feign {@link feign.codec.ErrorDecoder}.
 *
 * @author Michael Cramer
 */
 public interface FeignErrorDecoderFactory {
 	/**
 	 * Factory method to provide a {@link feign.codec.ErrorDecoder} for a given
 	 * {@link Class}.
 	 * @param type the {@link Class} for which a {@link feign.codec.ErrorDecoder} instance
 	 * is to be created
 	 * @return a {@link feign.codec.ErrorDecoder} instance
 	 */
 	ErrorDecoder create(Class<?> type);
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -27,10 +27,9 @@ public interface FeignLoggerFactory {
 	/**
 	 * Factory method to provide a {@link Logger} for a given {@link Class}.
 	 *
 	 * @param type the {@link Class} for which a {@link Logger} instance is to be created
 	 * @return a {@link Logger} instance
 	 */
-	public Logger create(Class<?> type);
+	Logger create(Class<?> type);
 }
@@ -0,0 +1,43 @@
 /*
 * Copyright 2013-2022 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 = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "false",
 			matchIfMissing = true)
 	static class HttpClient5Disabled {
 	}
 }
@@ -1,98 +0,0 @@
 /*
 * Copyright 2013-2016 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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.util.Assert;
 import feign.Feign;
 import feign.Target;
 import feign.hystrix.FallbackFactory;
 import feign.hystrix.HystrixFeign;
 import feign.hystrix.SetterFactory;
 /**
 * @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;
 		SetterFactory setterFactory = getOptional(factory.getName(), context,
 			SetterFactory.class);
 		if (setterFactory != null) {
 			builder.setterFactory(setterFactory);
 		}
 		Class<?> fallback = factory.getFallback();
 		if (fallback != void.class) {
 			return targetWithFallback(factory.getName(), context, target, builder, fallback);
 		}
 		Class<?> fallbackFactory = factory.getFallbackFactory();
 		if (fallbackFactory != void.class) {
 			return targetWithFallbackFactory(factory.getName(), 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);
 	}
 }
@@ -0,0 +1,86 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import feign.Request;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 /**
 * This factory bean is meant to create {@link Request.Options} instance as per the
 * applicable configurations.
 *
 * @author Jasbir Singh
 */
 public class OptionsFactoryBean implements FactoryBean<Request.Options>, ApplicationContextAware {
 	private ApplicationContext applicationContext;
 	private String contextId;
 	private Request.Options options;
 	@Override
 	public Class<?> getObjectType() {
 		return Request.Options.class;
 	}
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}
 	@Override
 	public Request.Options getObject() throws Exception {
 		if (options != null) {
 			return options;
 		}
 		options = new Request.Options();
 		FeignClientProperties properties = applicationContext.getBean(FeignClientProperties.class);
 		options = createOptionsWithApplicableValues(properties.getConfig().get(properties.getDefaultConfig()), options);
 		options = createOptionsWithApplicableValues(properties.getConfig().get(contextId), options);
 		return options;
 	}
 	public void setContextId(String contextId) {
 		this.contextId = contextId;
 	}
 	private Request.Options createOptionsWithApplicableValues(
 			FeignClientProperties.FeignClientConfiguration clientConfiguration, Request.Options options) {
 		if (Objects.isNull(clientConfiguration)) {
 			return options;
 		}
 		int connectTimeoutMillis = Objects.nonNull(clientConfiguration.getConnectTimeout())
 				? clientConfiguration.getConnectTimeout() : options.connectTimeoutMillis();
 		int readTimeoutMillis = Objects.nonNull(clientConfiguration.getReadTimeout())
 				? clientConfiguration.getReadTimeout() : options.readTimeoutMillis();
 		boolean followRedirects = Objects.nonNull(clientConfiguration.isFollowRedirects())
 				? clientConfiguration.isFollowRedirects() : options.isFollowRedirects();
 		return new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS, readTimeoutMillis,
 				TimeUnit.MILLISECONDS, followRedirects);
 	}
 }
@@ -0,0 +1,53 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import feign.QueryMap;
 import org.springframework.core.annotation.AliasFor;
 /**
 * Spring MVC equivalent of OpenFeign's {@link feign.QueryMap} parameter annotation.
 *
 * @author Aram Peres
 * @see feign.QueryMap
 * @see org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor
 */
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.PARAMETER })
 public @interface SpringQueryMap {
 	/**
 	 * @see QueryMap#encoded()
 	 * @return alias for {@link #encoded()}.
 	 */
 	@AliasFor("encoded")
 	boolean value() default false;
 	/**
 	 * @see QueryMap#encoded()
 	 * @return Specifies whether parameter names and values are already encoded.
 	 */
 	@AliasFor("value")
 	boolean encoded() default false;
 }
@@ -1,18 +1,17 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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;
@@ -23,7 +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);
+			Target.HardCodedTarget<T> target);
 }
@@ -0,0 +1,67 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.CookieValue;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
 /**
 * @{link CookieValue} annotation processor.
 * @author Gong Yi
 *
 */
 public class CookieValueParameterProcessor implements AnnotatedParameterProcessor {
 	private static final Class<CookieValue> ANNOTATION = CookieValue.class;
 	@Override
 	public Class<? extends Annotation> getAnnotationType() {
 		return ANNOTATION;
 	}
 	@Override
 	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		MethodMetadata data = context.getMethodMetadata();
 		CookieValue cookie = ANNOTATION.cast(annotation);
 		String name = cookie.value().trim();
 		checkState(emptyToNull(name) != null, "Cookie.name() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 		String cookieExpression = data.template().headers().getOrDefault(HttpHeaders.COOKIE, Arrays.asList("")).stream()
 				.findFirst().orElse("");
 		if (cookieExpression.length() == 0) {
 			cookieExpression = String.format("%s={%s}", name, name);
 		}
 		else {
 			cookieExpression += String.format("; %s={%s}", name, name);
 		}
 		data.template().removeHeader(HttpHeaders.COOKIE);
 		data.template().header(HttpHeaders.COOKIE, cookieExpression);
 		return true;
 	}
 }
@@ -0,0 +1,79 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.stream.Collectors;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.MatrixVariable;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
 /**
 * {@link MatrixVariable} annotation processor.
 *
 * Can expand maps or single objects. Values are assigned from the objects
 * {@code toString()} method.
 *
 * @author Matt King
 * @see AnnotatedParameterProcessor
 */
 public class MatrixVariableParameterProcessor implements AnnotatedParameterProcessor {
 	private static final Class<MatrixVariable> ANNOTATION = MatrixVariable.class;
 	@Override
 	public Class<? extends Annotation> getAnnotationType() {
 		return ANNOTATION;
 	}
 	@Override
 	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();
 		String name = ANNOTATION.cast(annotation).value();
 		checkState(emptyToNull(name) != null, "MatrixVariable annotation was empty on param %s.",
 				context.getParameterIndex());
 		context.setParameterName(name);
 		if (Map.class.isAssignableFrom(parameterType)) {
 			data.indexToExpander().put(parameterIndex, this::expandMap);
 		}
 		else {
 			data.indexToExpander().put(parameterIndex, object -> ";" + name + "=" + object.toString());
 		}
 		return true;
 	}
 	private String expandMap(Object object) {
 		Map<String, Object> paramMap = (Map) object;
 		return paramMap.keySet().stream().filter(key -> paramMap.get(key) != null)
 				.map(key -> ";" + key + "=" + paramMap.get(key).toString()).collect(Collectors.joining());
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -21,11 +21,11 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.PathVariable;
 import feign.MethodMetadata;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
@@ -34,6 +34,7 @@ import static feign.Util.emptyToNull;
 *
 * @author Jakub Narloch
 * @author Abhijit Sarkar
 * @author Yanming Zhou
 * @see AnnotatedParameterProcessor
 */
 public class PathVariableParameterProcessor implements AnnotatedParameterProcessor {
@@ -48,14 +49,14 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 	@Override
 	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
+		checkState(emptyToNull(name) != null, "PathVariable annotation was empty on param %s.",
-				"PathVariable annotation was empty on param %s.", context.getParameterIndex());
+				context.getParameterIndex());
 		context.setParameterName(name);
 		MethodMetadata data = context.getMethodMetadata();
 		String varName = '{' + name + '}';
-		if (!data.template().url().contains(varName)
+		String varNameRegex = ".*\\{" + name + "(:[^}]+)?\\}.*";
-				&& !searchMapValues(data.template().queries(), varName)
+		if (!data.template().url().matches(varNameRegex) && !searchMapValues(data.template().queries(), varName)
 				&& !searchMapValues(data.template().headers(), varName)) {
 			data.formParams().add(name);
 		}
@@ -74,4 +75,5 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 		}
 		return false;
 	}
 }
@@ -0,0 +1,53 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 /**
 * {@link SpringQueryMap} parameter processor.
 *
 * @author Aram Peres
 * @see AnnotatedParameterProcessor
 */
 public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
 	private static final Class<SpringQueryMap> ANNOTATION = SpringQueryMap.class;
 	@Override
 	public Class<? extends Annotation> getAnnotationType() {
 		return ANNOTATION;
 	}
 	@Override
 	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int paramIndex = context.getParameterIndex();
 		MethodMetadata metadata = context.getMethodMetadata();
 		if (metadata.queryMapIndex() == null) {
 			metadata.queryMapIndex(paramIndex);
 			metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
 		}
 		return true;
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -21,11 +21,11 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.RequestHeader;
 import feign.MethodMetadata;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
@@ -59,12 +59,12 @@ public class RequestHeaderParameterProcessor implements AnnotatedParameterProces
 		}
 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
+		checkState(emptyToNull(name) != null, "RequestHeader.value() was empty on parameter %s", parameterIndex);
 				"RequestHeader.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 		Collection<String> header = context.setTemplateParameter(name, data.template().headers().get(name));
 		data.template().header(name, header);
 		return true;
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -21,14 +21,14 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.RequestParam;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
 import feign.MethodMetadata;
 /**
 * {@link RequestParam} parameter processor.
 *
@@ -60,14 +60,12 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 		RequestParam requestParam = ANNOTATION.cast(annotation);
 		String name = requestParam.value();
-		checkState(emptyToNull(name) != null,
+		checkState(emptyToNull(name) != null, "RequestParam.value() was empty on parameter %s", parameterIndex);
 				"RequestParam.value() was empty on parameter %s",
 				parameterIndex);
 		context.setParameterName(name);
-		Collection<String> query = context.setTemplateParameter(name,
+		Collection<String> query = context.setTemplateParameter(name, data.template().queries().get(name));
 				data.template().queries().get(name));
 		data.template().query(name, query);
 		return true;
 	}
 }
@@ -0,0 +1,61 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import feign.MethodMetadata;
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.web.bind.annotation.RequestPart;
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
 /**
 * {@link RequestPart} parameter processor.
 *
 * @author Aaron Whiteside
 * @see AnnotatedParameterProcessor
 */
 public class RequestPartParameterProcessor implements AnnotatedParameterProcessor {
 	private static final Class<RequestPart> ANNOTATION = RequestPart.class;
 	@Override
 	public Class<? extends Annotation> getAnnotationType() {
 		return ANNOTATION;
 	}
 	@Override
 	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		MethodMetadata data = context.getMethodMetadata();
 		String name = ANNOTATION.cast(annotation).value();
 		checkState(emptyToNull(name) != null, "RequestPart.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 		data.formParams().add(name);
 		Collection<String> names = context.setTemplateParameter(name, data.indexToName().get(parameterIndex));
 		data.indexToName().put(parameterIndex, names);
 		return true;
 	}
 }
@@ -0,0 +1,45 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.clientconfig;
 /**
 * Additional Feign Client configuration that are not included in
 * {@link org.springframework.cloud.openfeign.FeignClient}.
 *
 * @author Matt King
 */
 public interface FeignClientConfigurer {
 	/**
 	 * @return whether to mark the feign proxy as a primary bean. Defaults to true.
 	 */
 	default boolean primary() {
 		return true;
 	}
 	/**
 	 * FALSE will only apply configurations from classes listed in
 	 * <code>configuration()</code>. Will still use parent instance of
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, and
 	 * {@link feign.Contract} if none are provided.
 	 * @return weather to inherit parent context for client configuration.
 	 */
 	default boolean inheritParentConfiguration() {
 		return true;
 	}
 }
@@ -0,0 +1,146 @@
 /*
 * Copyright 2013-2022 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.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import jakarta.annotation.PreDestroy;
 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;
 		}
 	}
 }
@@ -0,0 +1,125 @@
 /*
 * Copyright 2013-2022 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.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;
 import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 /**
 * Default configuration for {@link CloseableHttpClient}.
 *
 * @author Ryan Baxter
 * @author Marcin Grzejszczak
 * @author Spencer Gibb
 * @author Olga Maciaszek-Sharma
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(CloseableHttpClient.class)
 public class HttpClientFeignConfiguration {
 	private static final Log LOG = LogFactory.getLog(HttpClientFeignConfiguration.class);
 	private final Timer connectionManagerTimer = new Timer("FeignApacheHttpClientConfiguration.connectionManagerTimer",
 			true);
 	private CloseableHttpClient httpClient;
 	@Autowired(required = false)
 	private RegistryBuilder registryBuilder;
 	@Bean
 	@ConditionalOnMissingBean(HttpClientConnectionManager.class)
 	public HttpClientConnectionManager connectionManager(
 			ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 			FeignHttpClientProperties httpClientProperties) {
 		final HttpClientConnectionManager connectionManager = connectionManagerFactory.newConnectionManager(
 				httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
 				httpClientProperties.getMaxConnectionsPerRoute(), httpClientProperties.getTimeToLive(),
 				httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
 		this.connectionManagerTimer.schedule(new TimerTask() {
 			@Override
 			public void run() {
 				connectionManager.closeExpiredConnections();
 			}
 		}, 30000, httpClientProperties.getConnectionTimerRepeat());
 		return connectionManager;
 	}
 	@Bean
 	@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", havingValue = "true")
 	public CloseableHttpClient customHttpClient(HttpClientConnectionManager httpClientConnectionManager,
 			FeignHttpClientProperties httpClientProperties) {
 		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement().useSystemProperties();
 		this.httpClient = createClient(builder, httpClientConnectionManager, httpClientProperties);
 		return this.httpClient;
 	}
 	@Bean
 	@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", havingValue = "false",
 			matchIfMissing = true)
 	public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
 			HttpClientConnectionManager httpClientConnectionManager, FeignHttpClientProperties httpClientProperties) {
 		this.httpClient = createClient(httpClientFactory.createBuilder(), httpClientConnectionManager,
 				httpClientProperties);
 		return this.httpClient;
 	}
 	private CloseableHttpClient createClient(HttpClientBuilder builder,
 			HttpClientConnectionManager httpClientConnectionManager, FeignHttpClientProperties httpClientProperties) {
 		RequestConfig defaultRequestConfig = RequestConfig.custom()
 				.setConnectTimeout(httpClientProperties.getConnectionTimeout())
 				.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
 		CloseableHttpClient httpClient = builder.setDefaultRequestConfig(defaultRequestConfig)
 				.setConnectionManager(httpClientConnectionManager).build();
 		return httpClient;
 	}
 	@PreDestroy
 	public void destroy() {
 		this.connectionManagerTimer.cancel();
 		if (this.httpClient != null) {
 			try {
 				this.httpClient.close();
 			}
 			catch (IOException e) {
 				if (LOG.isErrorEnabled()) {
 					LOG.error("Could not correctly close httpClient.");
 				}
 			}
 		}
 	}
 }
@@ -0,0 +1,77 @@
 /*
 * Copyright 2013-2022 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.time.Duration;
 import java.util.concurrent.TimeUnit;
 import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 /**
 * Defualt configuration for {@link OkHttpClient}.
 *
 * @author Ryan Baxter
 * @author Marcin Grzejszczak
 * @author Spencer Gibb
 * @author Olga Maciaszek-Sharma
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 public class OkHttpFeignConfiguration {
 	private okhttp3.OkHttpClient okHttpClient;
 	@Bean
 	@ConditionalOnMissingBean(ConnectionPool.class)
 	public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
 		int maxTotalConnections = httpClientProperties.getMaxConnections();
 		long timeToLive = httpClientProperties.getTimeToLive();
 		TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
 		return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 	}
 	@Bean
 	public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory, ConnectionPool connectionPool,
 			FeignHttpClientProperties httpClientProperties) {
 		boolean followRedirects = httpClientProperties.isFollowRedirects();
 		int connectTimeout = httpClientProperties.getConnectionTimeout();
 		Duration reaTimeout = httpClientProperties.getOkHttp().getReadTimeout();
 		this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation())
 				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 				.readTimeout(reaTimeout).connectionPool(connectionPool).build();
 		return this.okHttpClient;
 	}
 	@PreDestroy
 	public void destroy() {
 		if (this.okHttpClient != null) {
 			this.okHttpClient.dispatcher().executorService().shutdown();
 			this.okHttpClient.connectionPool().evictAll();
 		}
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign.encoding;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.springframework.util.Assert;
 /**
@@ -34,7 +35,6 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	/**
 	 * Creates new instance of {@link BaseRequestInterceptor}.
 	 *
 	 * @param properties the encoding properties
 	 */
 	protected BaseRequestInterceptor(FeignClientEncodingProperties properties) {
@@ -44,10 +44,9 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	/**
 	 * Adds the header if it wasn't yet specified.
 	 *
 	 * @param requestTemplate the request
-	 * @param name			the header name
+	 * @param name the header name
-	 * @param values		  the header values
+	 * @param values the header values
 	 */
 	protected void addHeader(RequestTemplate requestTemplate, String name, String... values) {
@@ -57,7 +56,7 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	}
 	protected FeignClientEncodingProperties getProperties() {
-		return properties;
+		return this.properties;
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -35,19 +35,21 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignAcceptGzipEncodingInterceptor
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", matchIfMissing = false)
-//The OK HTTP client uses "transparent" compression.
+// The OK HTTP client uses "transparent" compression.
-//If the accept-encoding header is present it disable transparent compression
+// If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignAcceptGzipEncodingAutoConfiguration {
 	@Bean
-	public FeignAcceptGzipEncodingInterceptor feignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	public FeignAcceptGzipEncodingInterceptor feignAcceptGzipEncodingInterceptor(
 			FeignClientEncodingProperties properties) {
 		return new FeignAcceptGzipEncodingInterceptor(properties);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -19,10 +19,11 @@ package org.springframework.cloud.openfeign.encoding;
 import feign.RequestTemplate;
 /**
- * Enables the HTTP response payload compression by specifying the {@code Accept-Encoding} headers.
+ * Enables the HTTP response payload compression by specifying the {@code Accept-Encoding}
- * Although this does not yet mean that the requests will be compressed, it requires the remote server
+ * headers. Although this does not yet mean that the requests will be compressed, it
- * to understand the header and be configured to compress responses. Still no all responses might be compressed
+ * requires the remote server to understand the header and be configured to compress
- * based on the media type matching and other factors like the response content length.
+ * responses. Still no all responses might be compressed based on the media type matching
 * and other factors like the response content length.
 *
 * @author Jakub Narloch
 */
@@ -30,7 +31,6 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 	/**
 	 * Creates new instance of {@link FeignAcceptGzipEncodingInterceptor}.
 	 *
 	 * @param properties the encoding properties
 	 */
 	protected FeignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
@@ -46,4 +46,5 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
 				HttpEncoding.DEFLATE_ENCODING);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,23 +16,23 @@
 package org.springframework.cloud.openfeign.encoding;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import java.util.Arrays;
 import java.util.Objects;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 /**
 * The Feign encoding properties.
 *
 * @author Jakub Narloch
 */
-@ConfigurationProperties("feign.compression.request")
+@ConfigurationProperties("spring.cloud.openfeign.compression.request")
 public class FeignClientEncodingProperties {
 	/**
 	 * The list of supported mime types.
 	 */
-	private String[] mimeTypes = new String[]{"text/xml", "application/xml", "application/json"};
+	private String[] mimeTypes = new String[] { "text/xml", "application/xml", "application/json" };
 	/**
 	 * The minimum threshold content size.
@@ -40,7 +40,7 @@ public class FeignClientEncodingProperties {
 	private int minRequestSize = 2048;
 	public String[] getMimeTypes() {
-		return mimeTypes;
+		return this.mimeTypes;
 	}
 	public void setMimeTypes(String[] mimeTypes) {
@@ -48,7 +48,7 @@ public class FeignClientEncodingProperties {
 	}
 	public int getMinRequestSize() {
-		return minRequestSize;
+		return this.minRequestSize;
 	}
 	public void setMinRequestSize(int minRequestSize) {
@@ -57,24 +57,27 @@ public class FeignClientEncodingProperties {
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
 		}
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
 		FeignClientEncodingProperties that = (FeignClientEncodingProperties) o;
-		return Arrays.equals(mimeTypes, that.mimeTypes) &&
+		return Arrays.equals(this.mimeTypes, that.mimeTypes)
-				Objects.equals(minRequestSize, that.minRequestSize);
+				&& Objects.equals(this.minRequestSize, that.minRequestSize);
 	}
 	@Override
 	public int hashCode() {
-		return Objects.hash(mimeTypes, minRequestSize);
+		return Objects.hash(this.mimeTypes, this.minRequestSize);
 	}
 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientEncodingProperties{")
+		return new StringBuilder("FeignClientEncodingProperties{").append("mimeTypes=")
-				.append("mimeTypes=").append(Arrays.toString(mimeTypes)).append(", ")
+				.append(Arrays.toString(this.mimeTypes)).append(", ").append("minRequestSize=")
-				.append("minRequestSize=").append(minRequestSize)
+				.append(this.minRequestSize).append("}").toString();
 				.append("}").toString();
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,11 +16,9 @@
 package org.springframework.cloud.openfeign.encoding;
 import feign.Client;
 import feign.Feign;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 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;
@@ -35,19 +33,20 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignContentGzipEncodingInterceptor
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(Client.class)
+// The OK HTTP client uses "transparent" compression.
-//The OK HTTP client uses "transparent" compression.
+// If the content-encoding header is present it disable transparent compression
 //If the content-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false)
+@ConditionalOnProperty("spring.cloud.openfeign.compression.request.enabled")
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {
 	@Bean
-	public FeignContentGzipEncodingInterceptor feignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	public FeignContentGzipEncodingInterceptor feignContentGzipEncodingInterceptor(
 			FeignClientEncodingProperties properties) {
 		return new FeignContentGzipEncodingInterceptor(properties);
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,13 +16,14 @@
 package org.springframework.cloud.openfeign.encoding;
 import feign.RequestTemplate;
 import java.util.Collection;
 import java.util.Map;
 import feign.RequestTemplate;
 /**
- * Enables the HTTP request payload compression by specifying the {@code Content-Encoding} headers.
+ * Enables the HTTP request payload compression by specifying the {@code Content-Encoding}
 * headers.
 *
 * @author Jakub Narloch
 */
@@ -30,7 +31,6 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	/**
 	 * Creates new instance of {@link FeignContentGzipEncodingInterceptor}.
 	 *
 	 * @param properties the encoding properties
 	 */
 	protected FeignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
@@ -51,7 +51,6 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	/**
 	 * Returns whether the request requires GZIP compression.
 	 *
 	 * @param template the request template
 	 * @return true if request requires compression, false otherwise
 	 */
@@ -64,7 +63,6 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	/**
 	 * Returns whether the request content length exceed configured minimum size.
 	 *
 	 * @param contentLength the content length header value
 	 * @return true if length is grater than minimum size, false otherwise
 	 */
@@ -78,14 +76,14 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			final String strLen = contentLength.iterator().next();
 			final long length = Long.parseLong(strLen);
 			return length > getProperties().getMinRequestSize();
-		} catch (NumberFormatException ex) {
+		}
 		catch (NumberFormatException ex) {
 			return false;
 		}
 	}
 	/**
-	 * Returns whether the content mime types matches the configures mime types.
+	 * Returns whether the content mime types matches the configured mime types.
 	 *
 	 * @param contentTypes the content types
 	 * @return true if any specified content type matches the request content types
 	 */
@@ -107,4 +105,5 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 		return false;
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -52,4 +52,5 @@ public interface HttpEncoding {
 	 * The Deflate encoding.
 	 */
 	String DEFLATE_ENCODING = "deflate";
 }
@@ -0,0 +1,49 @@
 /*
 * Copyright 2016-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.hateoas;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.hateoas.config.HateoasConfiguration;
 import org.springframework.hateoas.config.WebConverters;
 /**
 * @author Hector Espert
 * @author Olga Maciaszek-Sharma
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnWebApplication
@ConditionalOnClass(WebConverters.class)
@AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
 		RepositoryRestMvcAutoConfiguration.class, HateoasConfiguration.class })
 public class FeignHalAutoConfiguration {
 	@Bean
 	@ConditionalOnBean(WebConverters.class)
 	HttpMessageConverterCustomizer webConvertersCustomizer(WebConverters webConverters) {
 		return new WebConvertersCustomizer(webConverters);
 	}
 }
@@ -0,0 +1,41 @@
 /*
 * Copyright 2016-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.hateoas;
 import java.util.List;
 import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.hateoas.config.WebConverters;
 import org.springframework.http.converter.HttpMessageConverter;
 /**
 * @author Olga Maciaszek-Sharma
 */
 public class WebConvertersCustomizer implements HttpMessageConverterCustomizer {
 	private final WebConverters webConverters;
 	public WebConvertersCustomizer(WebConverters webConverters) {
 		this.webConverters = webConverters;
 	}
 	@Override
 	public void accept(List<HttpMessageConverter<?>> httpMessageConverters) {
 		webConverters.augmentClient(httpMessageConverters);
 	}
 }
@@ -0,0 +1,71 @@
 /*
 * Copyright 2013-2022 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 org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
 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;
 /**
 * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
 * that uses {@link Client.Default} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
 class DefaultFeignLoadBalancerConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient,
 			LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
 				loadBalancerClientFactory, transformers);
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		return new RetryableFeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
 				loadBalancedRetryFactory, loadBalancerClientFactory, transformers);
 	}
 }
@@ -0,0 +1,165 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.loadbalancer;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import feign.Client;
 import feign.Request;
 import feign.Response;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.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 LoadBalancerClient} to select a
 * {@link ServiceInstance} to use while resolving the request host.
 *
 * @author Olga Maciaszek-Sharma
 * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@SuppressWarnings({ "unchecked", "rawtypes" })
 public class FeignBlockingLoadBalancerClient implements Client {
 	private static final Log LOG = LogFactory.getLog(FeignBlockingLoadBalancerClient.class);
 	private final Client delegate;
 	private final LoadBalancerClient loadBalancerClient;
 	private final LoadBalancerClientFactory loadBalancerClientFactory;
 	private final List<LoadBalancerFeignRequestTransformer> transformers;
 	/**
 	 * @deprecated in favour of
 	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
 	 */
 	@Deprecated
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = Collections.emptyList();
 	}
 	/**
 	 * @deprecated in favour of
 	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
 	 */
 	@Deprecated
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = Collections.emptyList();
 	}
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = transformers;
 	}
 	@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);
 		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;
 			if (LOG.isWarnEnabled()) {
 				LOG.warn(message);
 			}
 			supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
 					.onComplete(new CompletionContext<ResponseData, ServiceInstance, RequestDataContext>(
 							CompletionContext.Status.DISCARD, lbRequest, lbResponse)));
 			return Response.builder().request(request).status(HttpStatus.SERVICE_UNAVAILABLE.value())
 					.body(message, StandardCharsets.UTF_8).build();
 		}
 		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri).toString();
 		Request newRequest = buildRequest(request, reconstructedUrl, instance);
 		return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbRequest, lbResponse,
 				supportedLifecycleProcessors);
 	}
 	protected Request buildRequest(Request request, String reconstructedUrl) {
 		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
 				request.charset(), request.requestTemplate());
 	}
 	protected Request buildRequest(Request request, String reconstructedUrl, ServiceInstance instance) {
 		Request newRequest = buildRequest(request, reconstructedUrl);
 		if (transformers != null) {
 			for (LoadBalancerFeignRequestTransformer transformer : transformers) {
 				newRequest = transformer.transformRequest(newRequest, instance);
 			}
 		}
 		return newRequest;
 	}
 	// Visible for Sleuth instrumentation
 	public Client getDelegate() {
 		return delegate;
 	}
 	private String getHint(String serviceId) {
 		LoadBalancerProperties properties = loadBalancerClientFactory.getProperties(serviceId);
 		String defaultHint = properties.getHint().getOrDefault("default", "default");
 		String hintPropertyValue = properties.getHint().get(serviceId);
 		return hintPropertyValue != null ? hintPropertyValue : defaultHint;
 	}
 }
@@ -0,0 +1,57 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Client;
 import feign.Feign;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 /**
 * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
 * of {@link Client}.
 *
 * @author Olga Maciaszek-Sharma
 * @author Nguyen Ky Thanh
 * @since 2.2.0
 */
@ConditionalOnClass(Feign.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@AutoConfigureBefore(FeignAutoConfiguration.class)
@AutoConfigureAfter({ BlockingLoadBalancerClientAutoConfiguration.class, LoadBalancerAutoConfiguration.class })
@EnableConfigurationProperties(FeignHttpClientProperties.class)
@Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
 // see
 // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
@Import({ HttpClientFeignLoadBalancerConfiguration.class, OkHttpFeignLoadBalancerConfiguration.class,
 		HttpClient5FeignLoadBalancerConfiguration.class, DefaultFeignLoadBalancerConfiguration.class })
 public class FeignLoadBalancerAutoConfiguration {
 }
@@ -0,0 +1,80 @@
 /*
 * Copyright 2013-2022 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.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 /**
 * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
 * that uses {@link ApacheHttp5Client} under the hood.
 *
 * @author Nguyen Ky Thanh
 * @author changjin wei(魏昌进)
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttp5Client.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true")
@Import(HttpClient5FeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
 class HttpClient5FeignLoadBalancerConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
 			LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
 				transformers);
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
 				loadBalancerClientFactory, transformers);
 	}
 }
@@ -0,0 +1,84 @@
 /*
 * Copyright 2013-2022 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.httpclient.ApacheHttpClient;
 import org.apache.http.client.HttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.HttpClient5DisabledConditions;
 import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 /**
 * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
 * that uses {@link ApacheHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @author Nguyen Ky Thanh
 * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.enabled", matchIfMissing = true)
@Conditional(HttpClient5DisabledConditions.class)
@Import(HttpClientFeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
 class HttpClientFeignLoadBalancerConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
 			LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
 				transformers);
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
 				loadBalancerClientFactory, transformers);
 	}
 }
@@ -0,0 +1,47 @@
 /*
 * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Request;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.core.annotation.Order;
 /**
 * Allows applications to transform the load-balanced {@link Request} given the chosen
 * {@link org.springframework.cloud.client.ServiceInstance}.
 *
 * @author changjin wei(魏昌进)
 */
@Order(LoadBalancerFeignRequestTransformer.DEFAULT_ORDER)
 public interface LoadBalancerFeignRequestTransformer {
 	/**
 	 * Order for the {@link LoadBalancerFeignRequestTransformer}.
 	 */
 	int DEFAULT_ORDER = 0;
 	/**
 	 * Allows transforming load-balanced requests based on the provided
 	 * {@link ServiceInstance}.
 	 * @param request Original request.
 	 * @param instance ServiceInstance returned from LoadBalancer.
 	 * @return New request or original request
 	 */
 	Request transformRequest(Request request, ServiceInstance instance);
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2022 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
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,33 +13,34 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.cloud.openfeign.ribbon;
+
 package org.springframework.cloud.openfeign.loadbalancer;
 import java.io.ByteArrayInputStream;
 import java.net.URI;
 import feign.Response;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
 import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
 import org.springframework.util.StreamUtils;
 /**
- * A {@link RetryableStatusCodeException} for {@link Response}s
+ * A {@link RetryableStatusCodeException} for {@link Response}s.
 *
 * @author Ryan Baxter
 */
-public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
+public class LoadBalancerResponseStatusCodeException extends RetryableStatusCodeException {
 	private Response response;
-	public RibbonResponseStatusCodeException(String serviceId, Response response, byte[] body, URI uri) {
+	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)
+		this.response = Response.builder().body(new ByteArrayInputStream(body), body.length).headers(response.headers())
-				.headers(response.headers()).reason(response.reason())
+				.reason(response.reason()).status(response.status()).request(response.request()).build();
 				.status(response.status()).request(response.request()).build();
 	}
 	@Override
 	public Response getResponse() {
-		return response;
+		return this.response;
 	}
 }
@@ -0,0 +1,95 @@
 /*
 * Copyright 2013-2022 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.HttpStatusCode;
 /**
 * @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.Request lbRequest,
 			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
 			Set<LoadBalancerLifecycle> supportedLifecycleProcessors, boolean loadBalanced) throws IOException {
 		supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStartRequest(lbRequest, lbResponse));
 		try {
 			Response response = feignClient.execute(feignRequest, options);
 			if (loadBalanced) {
 				supportedLifecycleProcessors.forEach(
 						lifecycle -> lifecycle.onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS,
 								lbRequest, lbResponse, buildResponseData(response))));
 			}
 			return response;
 		}
 		catch (Exception exception) {
 			if (loadBalanced) {
 				supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onComplete(
 						new CompletionContext<>(CompletionContext.Status.FAILED, exception, lbRequest, lbResponse)));
 			}
 			throw exception;
 		}
 	}
 	static ResponseData buildResponseData(Response response) {
 		HttpHeaders responseHeaders = new HttpHeaders();
 		response.headers().forEach((key, value) -> responseHeaders.put(key, new ArrayList<>(value)));
 		return new ResponseData(HttpStatusCode.valueOf(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.Request lbRequest,
 			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse,
 			Set<LoadBalancerLifecycle> supportedLifecycleProcessors) throws IOException {
 		return executeWithLoadBalancerLifecycleProcessing(feignClient, options, feignRequest, lbRequest, lbResponse,
 				supportedLifecycleProcessors, true);
 	}
 }
@@ -0,0 +1,80 @@
 /*
 * Copyright 2013-2022 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.okhttp.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
 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;
 /**
 * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
 * that uses {@link OkHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty("spring.cloud.openfeign.okhttp.enabled")
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@Import(OkHttpFeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
 class OkHttpFeignLoadBalancerConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient, LoadBalancerClient loadBalancerClient,
 			LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
 				transformers);
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, okhttp3.OkHttpClient okHttpClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
 				loadBalancerClientFactory, transformers);
 	}
 }
@@ -0,0 +1,55 @@
 /*
 * Copyright 2013-2022 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 org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.retry.support.RetryTemplate;
 /**
 * A condition that verifies that {@link RetryTemplate} is on the classpath, a
 * {@link LoadBalancedRetryFactory} bean is present and
 * <code>spring.cloud.loadbalancer.retry.enabled</code> is not set to <code>false</code>.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.6
 */
 public class OnRetryNotEnabledCondition extends AnyNestedCondition {
 	public OnRetryNotEnabledCondition() {
 		super(ConfigurationPhase.REGISTER_BEAN);
 	}
 	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
 	static class OnNoRetryTemplateCondition {
 	}
 	@ConditionalOnMissingBean(LoadBalancedRetryFactory.class)
 	static class OnRetryFactoryCondition {
 	}
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "false")
 	static class OnLoadBalancerRetryEnabledCondition {
 	}
 }
@@ -0,0 +1,282 @@
 /*
 * Copyright 2013-2022 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.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import feign.Client;
 import feign.Request;
 import feign.Response;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.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.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycle;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerLifecycleValidator;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.cloud.client.loadbalancer.RetryableRequestContext;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 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.Assert;
 import org.springframework.util.StreamUtils;
 import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils.buildRequestData;
 /**
 * A {@link Client} implementation that provides Spring Retry support for requests
 * load-balanced with Spring Cloud LoadBalancer.
 *
 * @author Olga Maciaszek-Sharma
 * @author changjin wei(魏昌进)
 * @since 2.2.6
 */
@SuppressWarnings({ "rawtypes", "unchecked" })
 public class RetryableFeignBlockingLoadBalancerClient implements Client {
 	private static final Log LOG = LogFactory.getLog(RetryableFeignBlockingLoadBalancerClient.class);
 	private final Client delegate;
 	private final LoadBalancerClient loadBalancerClient;
 	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
 	private final LoadBalancerClientFactory loadBalancerClientFactory;
 	private final List<LoadBalancerFeignRequestTransformer> transformers;
 	/**
 	 * @deprecated in favour of
 	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
 	 */
 	@Deprecated
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
 			LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = Collections.emptyList();
 	}
 	/**
 	 * @deprecated in favour of
 	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
 	 */
 	@Deprecated
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = Collections.emptyList();
 	}
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
 			List<LoadBalancerFeignRequestTransformer> transformers) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 		this.transformers = transformers;
 	}
 	@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);
 		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, ResponseData.class, ServiceInstance.class);
 			String hint = getHint(serviceId);
 			DefaultRequest<RetryableRequestContext> lbRequest = new DefaultRequest<>(
 					new RetryableRequestContext(null, buildRequestData(request), hint));
 			// On retries the policy will choose the server and set it in the context
 			// and extract the server and update the request being made
 			if (context instanceof LoadBalancedRetryContext) {
 				LoadBalancedRetryContext lbContext = (LoadBalancedRetryContext) context;
 				ServiceInstance serviceInstance = lbContext.getServiceInstance();
 				if (serviceInstance == null) {
 					if (LOG.isDebugEnabled()) {
 						LOG.debug("Service instance retrieved from LoadBalancedRetryContext: was null. "
 								+ "Reattempting service instance selection");
 					}
 					ServiceInstance previousServiceInstance = lbContext.getPreviousServiceInstance();
 					lbRequest.getContext().setPreviousServiceInstance(previousServiceInstance);
 					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, RetryableRequestContext>(
 									CompletionContext.Status.DISCARD, lbRequest, 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, retrievedServiceInstance);
 				}
 			}
 			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
 					retrievedServiceInstance);
 			Response response = LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing(delegate, options,
 					feignRequest, lbRequest, lbResponse, supportedLifecycleProcessors,
 					retrievedServiceInstance != null);
 			int responseStatus = response.status();
 			if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) {
 				if (LOG.isDebugEnabled()) {
 					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()));
 			}
 			return response;
 		}, new LoadBalancedRecoveryCallback<Response, Response>() {
 			@Override
 			protected Response createResponse(Response response, URI uri) {
 				return response;
 			}
 		});
 	}
 	protected Request buildRequest(Request request, String reconstructedUrl) {
 		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(), request.body(),
 				request.charset(), request.requestTemplate());
 	}
 	protected Request buildRequest(Request request, String reconstructedUrl, ServiceInstance instance) {
 		Request newRequest = buildRequest(request, reconstructedUrl);
 		if (transformers != null) {
 			for (LoadBalancerFeignRequestTransformer transformer : transformers) {
 				newRequest = transformer.transformRequest(newRequest, instance);
 			}
 		}
 		return newRequest;
 	}
 	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);
 		if (retryListeners != null && retryListeners.length != 0) {
 			retryTemplate.setListeners(retryListeners);
 		}
 		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
 				: new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy, loadBalancerClient, serviceId));
 		return retryTemplate;
 	}
 	// Visible for Sleuth instrumentation
 	public Client getDelegate() {
 		return delegate;
 	}
 	private HttpRequest toHttpRequest(Request request) {
 		return new HttpRequest() {
 			@Override
 			public HttpMethod getMethod() {
 				return HttpMethod.resolve(request.httpMethod().name());
 			}
 			@Override
 			public String getMethodValue() {
 				return getMethod().name();
 			}
 			@Override
 			public URI getURI() {
 				return URI.create(request.url());
 			}
 			@Override
 			public HttpHeaders getHeaders() {
 				Map<String, List<String>> headers = new HashMap<>();
 				Map<String, Collection<String>> feignHeaders = request.headers();
 				for (String key : feignHeaders.keySet()) {
 					headers.put(key, new ArrayList<>(feignHeaders.get(key)));
 				}
 				HttpHeaders httpHeaders = new HttpHeaders();
 				httpHeaders.putAll(headers);
 				return httpHeaders;
 			}
 		};
 	}
 	private String getHint(String serviceId) {
 		LoadBalancerProperties properties = loadBalancerClientFactory.getProperties(serviceId);
 		String defaultHint = properties.getHint().getOrDefault("default", "default");
 		String hintPropertyValue = properties.getHint().get(serviceId);
 		return hintPropertyValue != null ? hintPropertyValue : defaultHint;
 	}
 }
@@ -1,67 +0,0 @@
 /*
 * Copyright 2013-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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 org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ILoadBalancer;
 /**
 * Factory for SpringLoadBalancer instances that caches the entries created.
 *
 * @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 = loadBalancedRetryFactory != null ? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
 			loadBalancedRetryFactory) : new FeignLoadBalancer(lb, config, serverIntrospector);
 		this.cache.put(clientName, client);
 		return client;
 	}
 }
@@ -1,38 +0,0 @@
 /*
 * Copyright 2013-2017 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
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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
 class DefaultFeignLoadBalancedConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
 							  SpringClientFactory clientFactory) {
 		return new LoadBalancerFeignClient(new Client.Default(null, null),
 				cachingFactory, clientFactory);
 	}
 }
@@ -1,235 +0,0 @@
 /*
 * Copyright 2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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.Request;
 import feign.Response;
 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 org.springframework.cloud.netflix.ribbon.RibbonProperties;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 import com.netflix.client.AbstractLoadBalancerAwareClient;
 import com.netflix.client.ClientException;
 import com.netflix.client.ClientRequest;
 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 static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecureConnectionIfNeeded;
 /**
 * @author Dave Syer
 * @author Spencer Gibb
 * @author Ryan Baxter
 * @author Tim Ysewyn
 */
 public class FeignLoadBalancer extends
 		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
 	private final RibbonProperties ribbon;
 	protected int connectTimeout;
 	protected int readTimeout;
 	protected IClientConfig clientConfig;
 	protected ServerIntrospector serverIntrospector;
 	public FeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
 							 ServerIntrospector serverIntrospector) {
 		super(lb, clientConfig);
 		this.setRetryHandler(RetryHandler.DEFAULT);
 		this.clientConfig = clientConfig;
 		this.ribbon = RibbonProperties.from(clientConfig);
 		RibbonProperties ribbon = this.ribbon;
 		this.connectTimeout = ribbon.getConnectTimeout();
 		this.readTimeout = ribbon.getReadTimeout();
 		this.serverIntrospector = serverIntrospector;
 	}
 	@Override
 	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
 			throws IOException {
 		Request.Options options;
 		if (configOverride != null) {
 			RibbonProperties override = RibbonProperties.from(configOverride);
 			options = new Request.Options(
 					override.connectTimeout(this.connectTimeout),
 					override.readTimeout(this.readTimeout));
 		}
 		else {
 			options = new Request.Options(this.connectTimeout, this.readTimeout);
 		}
 		Response response = request.client().execute(request.toRequest(), options);
 		return new RibbonResponse(request.getUri(), response);
 	}
 	@Override
 	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
 			RibbonRequest request, IClientConfig requestConfig) {
 		if (this.ribbon.isOkToRetryOnAllOperations()) {
 			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
 					requestConfig);
 		}
 		if (!request.toRequest().method().equals("GET")) {
 			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
 					requestConfig);
 		}
 		else {
 			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
 					requestConfig);
 		}
 	}
 	@Override
 	public URI reconstructURIWithServer(Server server, URI original) {
 		URI uri = updateToSecureConnectionIfNeeded(original, this.clientConfig, this.serverIntrospector, server);
 		return super.reconstructURIWithServer(server, uri);
 	}
 	protected static class RibbonRequest extends ClientRequest implements Cloneable {
 		private final Request request;
 		private final Client client;
 		protected RibbonRequest(Client client, Request request, URI uri) {
 			this.client = client;
 			setUri(uri);
 			this.request = toRequest(request);
 		}
 		private Request toRequest(Request request) {
 			Map<String, Collection<String>> headers = new LinkedHashMap<>(
 					request.headers());
 			return Request.create(request.method(),getUri().toASCIIString(),headers,request.body(),request.charset());
 		}
 		Request toRequest() {
 			return toRequest(this.request);
 		}
 		Client client() {
 			return this.client;
 		}
 		HttpRequest toHttpRequest() {
 			return new HttpRequest() {
 				@Override
 				public HttpMethod getMethod() {
 					return HttpMethod.resolve(RibbonRequest.this.toRequest().method());
 				}
 				@Override
 				public String getMethodValue() {
 					return getMethod().name();
 				}
 				@Override
 				public URI getURI() {
 					return RibbonRequest.this.getUri();
 				}
 				@Override
 				public HttpHeaders getHeaders() {
 					Map<String, List<String>> headers = new HashMap<>();
 					Map<String, Collection<String>> feignHeaders = RibbonRequest.this.toRequest().headers();
 					for(String key : feignHeaders.keySet()) {
 						headers.put(key, new ArrayList<String>(feignHeaders.get(key)));
 					}
 					HttpHeaders httpHeaders = new HttpHeaders();
 					httpHeaders.putAll(headers);
 					return httpHeaders;
 				}
 			};
 		}
 		public Request getRequest() {
 			return request;
 		}
 		public Client getClient() {
 			return client;
 		}
 		@Override
 		public Object clone() {
 			return new RibbonRequest(this.client, this.request, getUri());
 		}
 	}
 	protected static class RibbonResponse implements IResponse {
 		private final URI uri;
 		private final Response response;
 		protected RibbonResponse(URI uri, Response response) {
 			this.uri = uri;
 			this.response = response;
 		}
 		@Override
 		public Object getPayload() throws ClientException {
 			return this.response.body();
 		}
 		@Override
 		public boolean hasPayload() {
 			return this.response.body() != null;
 		}
 		@Override
 		public boolean isSuccess() {
 			return this.response.status() == 200;
 		}
 		@Override
 		public URI getRequestedURI() {
 			return this.uri;
 		}
 		@Override
 		public Map<String, Collection<String>> getHeaders() {
 			return this.response.headers();
 		}
 		Response toResponse() {
 			return this.response;
 		}
 		@Override
 		public void close() throws IOException {
 			if (this.response != null && this.response.body() != null) {
 				this.response.body().close();
 			}
 		}
 	}
 }
@@ -1,119 +0,0 @@
 /*
 *
 *  * Copyright 2013-2016 the original author or authors.
 *  *
 *  * Licensed under the Apache License, Version 2.0 (the "License");
 *  * you may not use this file except in compliance with the License.
 *  * You may obtain a copy of the License at
 *  *
 *  *      http://www.apache.org/licenses/LICENSE-2.0
 *  *
 *  * Unless required by applicable law or agreed to in writing, software
 *  * distributed under the License is distributed on an "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(serviceId, 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 serviceId;
 		}
 		@Override
 		public String getHost() {
 			return request.getURI().getHost();
 		}
 		@Override
 		public int getPort() {
 			return request.getURI().getPort();
 		}
 		@Override
 		public boolean isSecure() {
 			return "https".equals(request.getURI().getScheme());
 		}
 		@Override
 		public URI getUri() {
 			return request.getURI();
 		}
 		@Override
 		public Map<String, String> getMetadata() {
 			return metadata;
 		}
 	}
 }
@@ -1,79 +0,0 @@
 /*
 * Copyright 2013-2017 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
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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 org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 import com.netflix.loadbalancer.ILoadBalancer;
 import feign.Feign;
 import feign.Request;
 /**
 * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
 * load balancer.
 *
 * @author Dave Syer
 */
@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
@Configuration
@AutoConfigureBefore(FeignAutoConfiguration.class)
@EnableConfigurationProperties({ FeignHttpClientProperties.class })
 //Order is important here, last should be the default, first should be optional
 // see https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
@Import({ HttpClientFeignLoadBalancedConfiguration.class,
 		OkHttpFeignLoadBalancedConfiguration.class,
 		DefaultFeignLoadBalancedConfiguration.class })
 public class FeignRibbonClientAutoConfiguration {
 	@Bean
 	@Primary
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
 	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
 			SpringClientFactory factory) {
 		return new CachingSpringLoadBalancerFactory(factory);
 	}
 	@Bean
 	@Primary
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
 		SpringClientFactory factory,
 		LoadBalancedRetryFactory retryFactory) {
 		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	public Request.Options feignRequestOptions() {
 		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
 	}
 }
@@ -1,128 +0,0 @@
 /*
 * Copyright 2013-2017 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
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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 java.util.Timer;
 import java.util.TimerTask;
 import javax.annotation.PreDestroy;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 /**
 * @author Spencer Gibb
 */
@Configuration
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 class HttpClientFeignLoadBalancedConfiguration {
 	@Configuration
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	protected static class HttpClientFeignConfiguration {
 		private final Timer connectionManagerTimer = new Timer(
 				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
 		private CloseableHttpClient httpClient;
 		@Autowired(required = false)
 		private RegistryBuilder registryBuilder;
 		@Bean
 		@ConditionalOnMissingBean(HttpClientConnectionManager.class)
 		public HttpClientConnectionManager connectionManager(
 				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
 				FeignHttpClientProperties httpClientProperties) {
 			final HttpClientConnectionManager connectionManager = connectionManagerFactory
 					.newConnectionManager(httpClientProperties.isDisableSslValidation(), httpClientProperties.getMaxConnections(),
 							httpClientProperties.getMaxConnectionsPerRoute(),
 							httpClientProperties.getTimeToLive(),
 							httpClientProperties.getTimeToLiveUnit(), registryBuilder);
 			this.connectionManagerTimer.schedule(new TimerTask() {
 				@Override
 				public void run() {
 					connectionManager.closeExpiredConnections();
 				}
 			}, 30000, httpClientProperties.getConnectionTimerRepeat());
 			return connectionManager;
 		}
 		@Bean
 		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
 		public CloseableHttpClient customHttpClient(HttpClientConnectionManager httpClientConnectionManager,
 											  FeignHttpClientProperties httpClientProperties) {
 			HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement().useSystemProperties();
 			this.httpClient = createClient(builder, httpClientConnectionManager, httpClientProperties);
 			return this.httpClient;
 		}
 		@Bean
 		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
 		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory, HttpClientConnectionManager httpClientConnectionManager,
 											  FeignHttpClientProperties httpClientProperties) {
 			this.httpClient = createClient(httpClientFactory.createBuilder(), httpClientConnectionManager, httpClientProperties);
 			return this.httpClient;
 		}
 		private CloseableHttpClient createClient(HttpClientBuilder builder, HttpClientConnectionManager httpClientConnectionManager,
 												 FeignHttpClientProperties httpClientProperties) {
 			RequestConfig defaultRequestConfig = RequestConfig.custom()
 					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
 					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
 					.build();
 			CloseableHttpClient httpClient = builder.setDefaultRequestConfig(defaultRequestConfig).
 					setConnectionManager(httpClientConnectionManager).build();
 			return httpClient;
 		}
 		@PreDestroy
 		public void destroy() throws Exception {
 			connectionManagerTimer.cancel();
 			if(httpClient != null) {
 				httpClient.close();
 			}
 		}
 	}
 		@Bean
 		@ConditionalOnMissingBean(Client.class)
 		public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
 								  SpringClientFactory clientFactory, HttpClient httpClient) {
 			ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 			return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 		}
 }
@@ -1,132 +0,0 @@
 /*
 * Copyright 2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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 org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import com.netflix.client.ClientException;
 import com.netflix.client.config.CommonClientConfigKey;
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
 import feign.Client;
 import feign.Request;
 import feign.Response;
 /**
 * @author Dave Syer
 *
 */
 public class LoadBalancerFeignClient implements Client {
 	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
 	private final Client delegate;
 	private CachingSpringLoadBalancerFactory lbClientFactory;
 	private SpringClientFactory clientFactory;
 	public LoadBalancerFeignClient(Client delegate,
 								   CachingSpringLoadBalancerFactory lbClientFactory,
 								   SpringClientFactory clientFactory) {
 		this.delegate = delegate;
 		this.lbClientFactory = lbClientFactory;
 		this.clientFactory = clientFactory;
 	}
 	@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;
 	}
 	static URI cleanUrl(String originalUrl, String host) {
 		String newUrl = originalUrl.replaceFirst(host, "");
 		StringBuffer buffer = new StringBuffer(newUrl);
 		if((newUrl.startsWith("https://") && newUrl.length() == 8) ||
 				(newUrl.startsWith("http://") && newUrl.length() == 7)) {
 			buffer.append("/");
 		}
 		return URI.create(buffer.toString());
 	}
 	private FeignLoadBalancer lbClient(String clientName) {
 		return this.lbClientFactory.create(clientName);
 	}
 	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
 		public FeignOptionsClientConfig(Request.Options options) {
 			setProperty(CommonClientConfigKey.ConnectTimeout,
 					options.connectTimeoutMillis());
 			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
 		}
 		@Override
 		public void loadProperties(String clientName) {
 		}
 		@Override
 		public void loadDefaultValues() {
 		}
 	}
 }
@@ -1,87 +0,0 @@
 /*
 * Copyright 2013-2017 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
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "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 okhttp3.ConnectionPool;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.PreDestroy;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 /**
 * @author Spencer Gibb
 */
@Configuration
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty(value = "feign.okhttp.enabled")
 class OkHttpFeignLoadBalancedConfiguration {
 	@Configuration
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 	protected static class OkHttpFeignConfiguration {
 		private okhttp3.OkHttpClient okHttpClient;
 		@Bean
 		@ConditionalOnMissingBean(ConnectionPool.class)
 		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 													   OkHttpClientConnectionPoolFactory connectionPoolFactory) {
 			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
 			Long timeToLive = httpClientProperties.getTimeToLive();
 			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
 			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 		}
 		@Bean
 		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
 										   ConnectionPool connectionPool, FeignHttpClientProperties httpClientProperties) {
 			Boolean followRedirects = httpClientProperties.isFollowRedirects();
 			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
 			this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation()).
 					connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).
 					followRedirects(followRedirects).
 					connectionPool(connectionPool).build();
 			return this.okHttpClient;
 		}
 		@PreDestroy
 		public void destroy() {
 			if(okHttpClient != null) {
 				okHttpClient.dispatcher().executorService().shutdown();
 				okHttpClient.connectionPool().evictAll();
 			}
 		}
 	}
 	@Bean
 	@ConditionalOnMissingBean(Client.class)
 	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
 							  SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 	}
 }
@@ -1,131 +0,0 @@
 /*
 *
 *  * Copyright 2013-2016 the original author or authors.
 *  *
 *  * Licensed under the Apache License, Version 2.0 (the "License");
 *  * you may not use this file except in compliance with the License.
 *  * You may obtain a copy of the License at
 *  *
 *  *      http://www.apache.org/licenses/LICENSE-2.0
 *  *
 *  * Unless required by applicable law or agreed to in writing, software
 *  * distributed under the License is distributed on an "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.Request;
 import feign.Response;
 import java.io.IOException;
 import java.net.URI;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
 import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
 import org.springframework.cloud.netflix.ribbon.RibbonProperties;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
 import org.springframework.retry.backoff.BackOffPolicy;
 import org.springframework.retry.backoff.NoBackOffPolicy;
 import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.StreamUtils;
 import com.netflix.client.DefaultLoadBalancerRetryHandler;
 import com.netflix.client.RequestSpecificRetryHandler;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ILoadBalancer;
 import com.netflix.loadbalancer.Server;
 /**
 * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
 * @author Ryan Baxter
 * @author Gang Li
 */
 public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements ServiceInstanceChooser {
 	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 = loadBalancedRetryFactory.createRetryPolicy(this.getClientName(), this);
 		RetryTemplate retryTemplate = new RetryTemplate();
 		BackOffPolicy backOffPolicy = loadBalancedRetryFactory.createBackOffPolicy(this.getClientName());
 		retryTemplate.setBackOffPolicy(backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
 		RetryListener[] retryListeners = this.loadBalancedRetryFactory.createRetryListeners(this.getClientName());
 		if (retryListeners != null && retryListeners.length != 0) {
 			retryTemplate.setListeners(retryListeners);
 		}
 		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
 				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this, this.getClientName()));
 		return retryTemplate.execute(new RetryCallback<RibbonResponse, IOException>() {
 			@Override
 			public RibbonResponse doWithRetry(RetryContext retryContext) throws IOException {
 				Request feignRequest = null;
 				//on retries the policy will choose the server and set it in the context
 				//extract the server and update the request being made
 				if (retryContext instanceof LoadBalancedRetryContext) {
 					ServiceInstance service = ((LoadBalancedRetryContext) retryContext).getServiceInstance();
 					if (service != null) {
 						feignRequest = ((RibbonRequest) request.replaceUri(reconstructURIWithServer(new Server(service.getHost(), service.getPort()), request.getUri()))).toRequest();
 					}
 				}
 				if (feignRequest == null) {
 					feignRequest = request.toRequest();
 				}
 				Response response = request.client().execute(feignRequest, options);
 				if (retryPolicy.retryableStatusCode(response.status())) {
 					byte[] byteArray = response.body() == null ? new byte[]{} : StreamUtils.copyToByteArray(response.body().asInputStream());
 					response.close();
 					throw new RibbonResponseStatusCodeException(RetryableFeignLoadBalancer.this.clientName, response,
 							byteArray, request.getUri());
 				}
 				return new RibbonResponse(request.getUri(), response);
 			}
 		}, new LoadBalancedRecoveryCallback<RibbonResponse, Response>() {
 			@Override
 			protected RibbonResponse createResponse(Response response, URI uri) {
 				return new RibbonResponse(uri, response);
 			}
 		});
 	}
 	@Override
 	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
 			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
 		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(), requestConfig);
 	}
 	@Override
 	public ServiceInstance choose(String serviceId) {
 		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
 				this.getLoadBalancer().chooseServer(serviceId));
 	}
 }
@@ -0,0 +1,183 @@
 /*
 * Copyright 2015-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.security;
 import java.util.Arrays;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.http.AccessTokenRequiredException;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
 import org.springframework.security.oauth2.client.token.AccessTokenProvider;
 import org.springframework.security.oauth2.client.token.AccessTokenProviderChain;
 import org.springframework.security.oauth2.client.token.AccessTokenRequest;
 import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider;
 import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeAccessTokenProvider;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitAccessTokenProvider;
 import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 /**
 * Pre-defined custom RequestInterceptor for Feign Requests. It uses the
 * {@link OAuth2ClientContext OAuth2ClientContext} provided from the environment and
 * construct a new header on the request before it is made by Feign.
 *
 * @author Joao Pedro Evangelista
 * @author Tim Ysewyn
 * @since 3.0.0
 */
@Deprecated // spring-security-oauth2 reached EOL
 public class OAuth2FeignRequestInterceptor implements RequestInterceptor {
 	/**
 	 * The name of the token.
 	 */
 	public static final String BEARER = "Bearer";
 	/**
 	 * The name of the header.
 	 */
 	public static final String AUTHORIZATION = "Authorization";
 	private final OAuth2ClientContext oAuth2ClientContext;
 	private final OAuth2ProtectedResourceDetails resource;
 	private final String tokenType;
 	private final String header;
 	private AccessTokenProvider accessTokenProvider = new AccessTokenProviderChain(Arrays.<AccessTokenProvider>asList(
 			new AuthorizationCodeAccessTokenProvider(), new ImplicitAccessTokenProvider(),
 			new ResourceOwnerPasswordAccessTokenProvider(), new ClientCredentialsAccessTokenProvider()));
 	/**
 	 * Default constructor which uses the provided OAuth2ClientContext and Bearer tokens
 	 * within Authorization header.
 	 * @param oAuth2ClientContext provided context
 	 * @param resource type of resource to be accessed
 	 */
 	public OAuth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
 			OAuth2ProtectedResourceDetails resource) {
 		this(oAuth2ClientContext, resource, BEARER, AUTHORIZATION);
 	}
 	/**
 	 * Fully customizable constructor for changing token type and header name, in cases of
 	 * Bearer and Authorization is not the default such as "bearer", "authorization".
 	 * @param oAuth2ClientContext current oAuth2 Context
 	 * @param resource type of resource to be accessed
 	 * @param tokenType type of token e.g. "token", "Bearer"
 	 * @param header name of the header e.g. "Authorization", "authorization"
 	 */
 	public OAuth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
 			OAuth2ProtectedResourceDetails resource, String tokenType, String header) {
 		this.oAuth2ClientContext = oAuth2ClientContext;
 		this.resource = resource;
 		this.tokenType = tokenType;
 		this.header = header;
 	}
 	/**
 	 * Create a template with the header of provided name and extracted extract.
 	 *
 	 * @see RequestInterceptor#apply(RequestTemplate)
 	 */
 	@Override
 	public void apply(RequestTemplate template) {
 		template.header(header); // Clears out the header, no "clear" method available.
 		template.header(header, extract(tokenType));
 	}
 	/**
 	 * Extracts the token extract id the access token exists or returning an empty extract
 	 * if there is no one on the context it may occasionally causes Unauthorized response
 	 * since the token extract is empty.
 	 * @param tokenType type name of token
 	 * @return token value from context if it exists otherwise empty String
 	 */
 	protected String extract(String tokenType) {
 		OAuth2AccessToken accessToken = getToken();
 		return String.format("%s %s", tokenType, accessToken.getValue());
 	}
 	/**
 	 * Extract the access token within the request or try to acquire a new one by
 	 * delegating it to {@link #acquireAccessToken()}.
 	 * @return valid token
 	 */
 	public OAuth2AccessToken getToken() {
 		OAuth2AccessToken accessToken = oAuth2ClientContext.getAccessToken();
 		if (accessToken == null || accessToken.isExpired()) {
 			try {
 				accessToken = acquireAccessToken();
 			}
 			catch (UserRedirectRequiredException e) {
 				oAuth2ClientContext.setAccessToken(null);
 				String stateKey = e.getStateKey();
 				if (stateKey != null) {
 					Object stateToPreserve = e.getStateToPreserve();
 					if (stateToPreserve == null) {
 						stateToPreserve = "NONE";
 					}
 					oAuth2ClientContext.setPreservedState(stateKey, stateToPreserve);
 				}
 				throw e;
 			}
 		}
 		return accessToken;
 	}
 	/**
 	 * Try to acquire the token using a access token provider.
 	 * @return valid access token
 	 * @throws UserRedirectRequiredException in case the user needs to be redirected to an
 	 * approval page or login page
 	 */
 	protected OAuth2AccessToken acquireAccessToken() throws UserRedirectRequiredException {
 		AccessTokenRequest tokenRequest = oAuth2ClientContext.getAccessTokenRequest();
 		if (tokenRequest == null) {
 			throw new AccessTokenRequiredException(
 					"Cannot find valid context on request for resource '" + resource.getId() + "'.", resource);
 		}
 		String stateKey = tokenRequest.getStateKey();
 		if (stateKey != null) {
 			tokenRequest.setPreservedState(oAuth2ClientContext.removePreservedState(stateKey));
 		}
 		OAuth2AccessToken existingToken = oAuth2ClientContext.getAccessToken();
 		if (existingToken != null) {
 			oAuth2ClientContext.setAccessToken(existingToken);
 		}
 		OAuth2AccessToken obtainableAccessToken;
 		obtainableAccessToken = accessTokenProvider.obtainAccessToken(resource, tokenRequest);
 		if (obtainableAccessToken == null || obtainableAccessToken.getValue() == null) {
 			throw new IllegalStateException(
 					" Access token provider returned a null token, which is illegal according to the contract.");
 		}
 		oAuth2ClientContext.setAccessToken(obtainableAccessToken);
 		return obtainableAccessToken;
 	}
 	public void setAccessTokenProvider(AccessTokenProvider accessTokenProvider) {
 		this.accessTokenProvider = accessTokenProvider;
 	}
 }
--- a/Show More
+++ b/Show More