Going back to snapshots.

.github/dependabot.yml

@@ -1,49 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "3.1.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "4.0.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "main"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 3.1.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 4.0.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: main
-    ignore:
-      # only upgrade by minor or patch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major

.github/workflows/deploy-docs.yml

@@ -1,32 +0,0 @@
-name: Deploy Docs
-on:
-  push:
-    branches-ignore: [ gh-pages ]
-    tags: '**'
-  repository_dispatch:
-    types: request-build-reference # legacy
-  #schedule:
-  #- cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch:
-permissions:
-  actions: write
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    # if: github.repository_owner == 'spring-cloud'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: docs-build
-          fetch-depth: 1
-      - name: Dispatch (partial build)
-        if: github.ref_type == 'branch'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
-      - name: Dispatch (full build)
-        if: github.ref_type == 'tag'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 2.2.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ 2.2.x ]
 
 jobs:
   build:
@@ -16,18 +16,20 @@ jobs:
 
     strategy:
       matrix:
-        java: ["17"]
+        java: ["8", "11", "16"]
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
         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@v3
+          java-version: 1.8
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
         with:
-          fail_ci_if_error: true
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U

.gitignore

@@ -1,6 +1,3 @@
-/application.yml
-/application.properties
-asciidoctor.css
 *~
 #*
 *#
@@ -8,7 +5,6 @@ asciidoctor.css
 .classpath
 .project
 .settings/
-.settings
 .springBeans
 target/
 bin/
@@ -22,16 +18,7 @@ _site/
 .shelf
 *.swp
 *.swo
-/spring-cloud-release-tools*.jar
-antrun
 .vscode/
 .flattened-pom.xml
-node
-node_modules
-build
-_configprops.adoc
-_spans.adoc
-_metrics.adoc
-_conventions.adoc
-package.json
-package-lock.json
+.sdkmanrc
+

.java-version

@@ -1 +0,0 @@
-17

.mvn/maven.config

@@ -1,2 +1 @@
--DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
--P spring
+-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +1 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

.sdkmanrc

@@ -1,3 +0,0 @@
-# Enable auto-env through the sdkman_auto_env config
-# Add key=value pairs of SDKs to use below
-java=17.0.1-tem

README.adoc

@@ -5,23 +5,44 @@ Edit the files in the src/main/asciidoc/ directory instead.
 ////
 
 
-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://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
 
-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/main"]
+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.
 
 
-[[features]]
 == Features
 
 * Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 
-[[building]]
 == Building
 
-:jdkversion: 17
+:jdkversion: 1.8
 
-[[basic-compile-and-test]]
-== Basic Compile and Test
+=== Basic Compile and Test
 
 To build the source you will need to install JDK {jdkversion}.
 
@@ -48,36 +69,31 @@ source control.
 The projects that require middleware (i.e. Redis) for testing generally
 require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
 
-[[documentation]]
-== Documentation
 
-The spring-cloud-build module has a "docs" profile, and if you switch
-that on it will try to build asciidoc sources using https://docs.antora.org/antora/latest/[Antora] from
-`modules/ROOT/`.
+=== Documentation
 
-As part of that process it will look for a
-`docs/src/main/asciidoc/README.adoc` and process it by loading all the includes, but not
+The spring-cloud-build module has a "docs" profile, and if you switch
+that on it will try to build asciidoc sources from
+`src/main/asciidoc`. As part of that process it will look for a
+`README.adoc` and process it by loading all the includes, but not
 parsing or rendering it, just copying it to `${main.basedir}`
-(defaults to `$\{basedir}`, i.e. the root of the project). If there are
+(defaults to `${basedir}`, i.e. the root of the project). If there are
 any changes in the README it will then show up after a Maven build as
 a modified file in the correct place. Just commit it and push the change.
 
-[[working-with-the-code]]
-== Working with the code
+=== Working with the code
 If you don't have an IDE preference we would recommend that you use
 https://www.springsource.com/developer/sts[Spring Tools Suite] or
 https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.
 
-[[activate-the-spring-maven-profile]]
-=== Activate the Spring Maven profile
+==== 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]]
-=== Importing into eclipse with m2eclipse
+==== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".
@@ -91,8 +107,7 @@ add the "spring" profile to your `settings.xml`. Alternatively you can
 copy the repository settings from the "spring" profile of the parent
 pom into your `settings.xml`.
 
-[[importing-into-eclipse-without-m2eclipse]]
-=== Importing into eclipse without m2eclipse
+==== Importing into eclipse without m2eclipse
 If you prefer not to use m2eclipse you can generate eclipse project metadata using the
 following command:
 
@@ -105,12 +120,189 @@ The generated eclipse projects can be imported by selecting `import existing pro
 from the `file` menu.
 
 
-[[contributing]]
+
 == Contributing
 
-NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {github-project}[github].
+: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
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+=== Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+=== Code of Conduct
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+conduct]. By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+=== Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+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
+  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
+  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
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  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
+  other target branch in the main project).
+* 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).
+
+=== 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.
 
-[[license]]
 == License
 
 The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/main/LICENSE.txt[here].

docs/antora-playbook.yml

@@ -1,39 +0,0 @@
-antora:
-  extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
-      root_component_name: 'cloud-openfeign'
-    - '@springio/antora-extensions/static-page-extension'
-site:
-  title: Spring Cloud Openfeign
-  url: https://docs.spring.io/spring-cloud-openfeign/reference/
-content:
-  sources:
-    - url: ./..
-      branches: HEAD
-      start_path: docs
-      worktrees: true
-asciidoc:
-  attributes:
-    page-stackoverflow-url: https://stackoverflow.com/tags/spring-cloud
-    page-pagination: ''
-    hide-uri-scheme: '@'
-    tabs-sync-option: '@'
-    chomp: 'all'
-  extensions:
-    - '@asciidoctor/tabs'
-    - '@springio/asciidoctor-extensions'
-  sourcemap: true
-urls:
-  latest_version_segment: ''
-runtime:
-  log:
-    failure_level: warn
-    format: pretty
-ui:
-  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.2/ui-bundle.zip

docs/antora.yml

@@ -1,12 +0,0 @@
-name: cloud-openfeign
-version: true
-title: Spring Cloud OpenFeign
-nav:
-  - modules/ROOT/nav.adoc
-ext:
-  collector:
-    run:
-      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
-      local: true
-    scan:
-      dir: ./target/classes/antora-resources/

docs/modules/ROOT/nav.adoc

@@ -1,4 +0,0 @@
-* xref:index.adoc[Introduction]
-* xref:spring-cloud-openfeign.adoc[]
-* xref:appendix.adoc[]
-** xref:configprops.adoc[]

docs/modules/ROOT/pages/configprops.adoc

@@ -1,6 +0,0 @@
-[[configuration-properties]]
-= Configuration Properties
-
-Below you can find a list of configuration properties.
-
-include::partial$_configprops.adoc[]

docs/modules/ROOT/pages/index.adoc

@@ -1 +0,0 @@
-include::intro.adoc[]

docs/modules/ROOT/pages/spring-cloud-openfeign.adoc

@@ -1,953 +0,0 @@
-[[features]]
-= Spring Cloud OpenFeign Features
-
-[[spring-cloud-feign]]
-== Declarative REST Client: Feign
-
-https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
-It makes writing web service clients easier.
-To use Feign create an interface and annotate it.
-It has pluggable annotation support including Feign annotations and JAX-RS annotations.
-Feign also supports pluggable encoders and decoders.
-Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
-Spring Cloud integrates Eureka, 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 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
-
-[source,java,indent=0]
-----
-@SpringBootApplication
-@EnableFeignClients
-public class Application {
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-}
-----
-
-.StoreClient.java
-[source,java,indent=0]
-----
-@FeignClient("stores")
-public interface StoreClient {
-	@RequestMapping(method = RequestMethod.GET, value = "/stores")
-	List<Store> getStores();
-
-	@RequestMapping(method = RequestMethod.GET, value = "/stores")
-	Page<Store> getStores(Pageable pageable);
-
-	@RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
-	Store update(@PathVariable("storeId") Long storeId, Store store);
-
-	@RequestMapping(method = RequestMethod.DELETE, value = "/stores/{storeId:\\d+}")
-	void delete(@PathVariable Long storeId);
-}
-----
-
-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].
-You can also specify a URL using the `url` attribute
-(absolute value or just a hostname). The name of the bean in the
-application context is the fully qualified name of the interface.
-To specify your own alias value you can use the `qualifiers` value
-of the `@FeignClient` annotation.
-
-The load-balancer client above will want to discover the physical addresses
-for the "stores" service. If your application is a Eureka client then
-it will resolve the service in the Eureka service registry. If you
-don't want to use Eureka, you can configure a list of servers
-in your external configuration using https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
-
-Spring Cloud OpenFeign supports all the features available for the blocking mode of Spring Cloud LoadBalancer. You can read more about them in the https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[project documentation].
-
-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)`
-
-[[attribute-resolution-mode]]
-==== Attribute resolution mode
-
-While creating `Feign` client beans, we resolve the values passed via the `@FeignClient` annotation. As of `4.x`, the values are being resolved eagerly. This is a good solution for most use-cases, and it also allows for AOT support.
-
-If you need the attributes to be resolved lazily, set the `spring.cloud.openfeign.lazy-attributes-resolution` property value to `true`.
-
-TIP: For Spring Cloud Contract test integration, lazy attribute resolution should be used.
-
-[[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:
-
-[source,java,indent=0]
-----
-@FeignClient(name = "stores", configuration = FooConfiguration.class)
-public interface StoreClient {
-	//..
-}
-----
-
-In this case the client is composed from the components already in `FeignClientsConfiguration` together with any in `FooConfiguration` (where the latter will override the former).
-
-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: Using `contextId` attribute of the `@FeignClient` annotation in addition to changing the name of
-the `ApplicationContext` ensemble, it will override the alias of the client name
-and it will be used as part of the name of the configuration bean created for that client.
-
-WARNING: Previously, using the `url` attribute, did not require the `name` attribute. Using `name` is now required.
-
-Placeholders are supported in the `name` and `url` attributes.
-
-[source,java,indent=0]
-----
-@FeignClient(name = "${feign.name}", url = "${feign.url}")
-public interface StoreClient {
-	//..
-}
-----
-
-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`
-* `MicrometerObservationCapability` micrometerObservationCapability: If `feign-micrometer` is on the classpath and `ObservationRegistry` is available
-* `MicrometerCapability` micrometerCapability: If `feign-micrometer` is on the classpath, `MeterRegistry` is available and `ObservationRegistry` is not available
-* `CachingCapability` cachingCapability: If `@EnableCaching` annotation is used. Can be disabled via `spring.cloud.openfeign.cache.enabled`.
-* `Contract` feignContract: `SpringMvcContract`
-* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
-* `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
-If none of them is on the classpath, the default feign client is used.
-
-NOTE: `spring-cloud-starter-openfeign` supports `spring-cloud-starter-loadbalancer`. However, as is an optional dependency, you need to make sure it has been added to your project if you want to use it.
-
-The OkHttpClient, Apache HttpClient 5 and Http2Client Feign clients can be used by setting `spring.cloud.openfeign.okhttp.enabled` or `spring.cloud.openfeign.httpclient.hc5.enabled` or `spring.cloud.openfeign.http2client.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.hc.client5.http.impl.classic.CloseableHttpClient` when using Apache HC5.
-
-You can further customise http clients by setting values in the `spring.cloud.openfeign.httpclient.xxx` properties. The ones prefixed just with `httpclient` will work for all the clients, the ones prefixed with `httpclient.hc5` to Apache HttpClient 5, the ones prefixed with `httpclient.okhttp` to OkHttpClient and the ones prefixed with `httpclient.http2` to Http2Client. You can find a full list of properties you can customise in the appendix.
-
-TIP: Starting with Spring Cloud OpenFeign 4, the Feign Apache HttpClient 4 is no longer supported. We suggest using Apache HttpClient 5 instead.
-
-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`
-* `ErrorDecoder`
-* `Request.Options`
-* `Collection<RequestInterceptor>`
-* `SetterFactory`
-* `QueryMapEncoder`
-* `Capability` (`MicrometerObservationCapability` 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:
-
-[source,java,indent=0]
-----
-@Configuration
-public class FooConfiguration {
-	@Bean
-	public Contract feignContract() {
-		return new feign.Contract.Default();
-	}
-
-	@Bean
-	public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-		return new BasicAuthRequestInterceptor("user", "password");
-	}
-}
-----
-
-This replaces the `SpringMvcContract` with `feign.Contract.Default` and adds a `RequestInterceptor` to the collection of `RequestInterceptor`.
-
-`@FeignClient` also can be configured using configuration properties.
-
-application.yml
-[source,yaml]
-----
-spring:
-	cloud:
-		openfeign:
-			client:
-				config:
-					feignName:
-                        url: http://remote-service.com
-						connectTimeout: 5000
-						readTimeout: 5000
-						loggerLevel: full
-						errorDecoder: com.example.SimpleErrorDecoder
-						retryer: com.example.SimpleRetryer
-						defaultQueryParameters:
-							query: queryValue
-						defaultRequestHeaders:
-							header: headerValue
-						requestInterceptors:
-							- com.example.FooRequestInterceptor
-							- com.example.BarRequestInterceptor
-						responseInterceptor: com.example.BazResponseInterceptor
-						dismiss404: false
-						encoder: com.example.SimpleEncoder
-						decoder: com.example.SimpleDecoder
-						contract: com.example.SimpleContract
-						capabilities:
-							- com.example.FooCapability
-							- com.example.BarCapability
-						queryMapEncoder: com.example.SimpleQueryMapEncoder
-						micrometer.enabled: false
-----
-`feignName` in this example refers to `@FeignClient` `value`, that is also aliased with `@FeignClient` `name` and `@FeignClient` `contextId`. In a load-balanced scenario, it also corresponds to the `serviceId` of the server app that will be used to retrieve the instances. The specified classes for decoders, retryer and other ones must have a bean in the Spring context or have a default constructor.
-
-
-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 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]
-----
-spring:
-	cloud:
-		openfeign:
-			client:
-				config:
-					default:
-						connectTimeout: 5000
-						readTimeout: 5000
-						loggerLevel: basic
-----
-
-If we create both `@Configuration` bean and configuration properties, configuration properties will win.
-It will override `@Configuration` values. But if you want to change the priority to `@Configuration`,
-you can change `spring.cloud.openfeign.client.default-to-properties` to `false`.
-
-If we want to create multiple feign clients with the same name or url
-so that they would point to the same server but each with a different custom configuration then
-we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
-collision of these configuration beans.
-
-[source,java,indent=0]
-----
-@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
-public interface FooClient {
-	//..
-}
-----
-
-[source,java,indent=0]
-----
-@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
-public interface BarClient {
-	//..
-}
-----
-
-It is also possible to configure FeignClient not to inherit beans from the parent context.
-You can do this by overriding the `inheritParentConfiguration()` in a  `FeignClientConfigurer`
-bean to return `false`:
-
-[source,java,indent=0]
-----
-@Configuration
-public class CustomConfiguration{
-
-@Bean
-public FeignClientConfigurer feignClientConfigurer() {
-			return new FeignClientConfigurer() {
-
-				@Override
-				public boolean inheritParentConfiguration() {
-					return false;
-				}
-			};
-
-		}
-}
-----
-
-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]]
-==== `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]]
-=== Creating Feign Clients Manually
-
-In some cases it might be necessary to customize your Feign Clients in a way that is not
-possible using the methods above.  In this case you can create Clients using the
-https://github.com/OpenFeign/feign/#basics[Feign Builder API]. Below is an example
-which creates two Feign Clients with the same interface but configures each one with
-a separate request interceptor.
-
-[source,java,indent=0]
-----
-@Import(FeignClientsConfiguration.class)
-class FooController {
-
-	private FooClient fooClient;
-
-	private FooClient adminClient;
-
-	@Autowired
-	public FooController(Client client, Encoder encoder, Decoder decoder, Contract contract, MicrometerObservationCapability micrometerObservationCapability) {
-		this.fooClient = Feign.builder().client(client)
-				.encoder(encoder)
-				.decoder(decoder)
-				.contract(contract)
-				.addCapability(micrometerObservationCapability)
-				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "https://PROD-SVC");
-
-		this.adminClient = Feign.builder().client(client)
-				.encoder(encoder)
-				.decoder(decoder)
-				.contract(contract)
-				.addCapability(micrometerObservationCapability)
-				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "https://PROD-SVC");
-	}
-}
-----
-
-NOTE: In the above example `FeignClientsConfiguration.class` is the default configuration
-provided by Spring Cloud OpenFeign.
-
-NOTE: `PROD-SVC` is the name of the service the Clients will be making requests to.
-
-NOTE: The Feign `Contract` object defines what annotations and values are valid on interfaces. The
-autowired `Contract` bean provides supports for SpringMVC annotations, instead of
-the default Feign native annotations.
-
-You can also use the `Builder`to configure FeignClient not to inherit beans from the parent context.
-You can do this by overriding calling `inheritParentContext(false)` on the `Builder`.
-
-[[spring-cloud-feign-circuitbreaker]]
-=== Feign Spring Cloud CircuitBreaker Support
-
-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
-	@Scope("prototype")
-	public Feign.Builder feignBuilder() {
-		return Feign.builder();
-	}
-}
-----
-
-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()`.
-
-NOTE: As of 2020.0.2, the circuit breaker name pattern has changed from `<feignClientName>_<calledMethod>`.
-Using `CircuitBreakerNameResolver` introduced in 2020.0.4, circuit breaker names can retain the old pattern.
-
-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(url = "http://localhost:8080")
-public interface DemoClient {
-
-    @GetMapping("demo")
-    String getDemo();
-}
-----
-
-You could configure it using configuration properties by doing the following
-
-[source,yaml,indent=0]
-----
-spring:
-  cloud:
-    openfeign:
-      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 = "testClientWithFactory", url = "http://localhost:${server.port}/",
-			fallbackFactory = TestFallbackFactory.class)
-	protected interface TestClientWithFactory {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
-		String getException();
-
-	}
-
-	@Component
-	static class TestFallbackFactory implements FallbackFactory<FallbackWithFactory> {
-
-		@Override
-		public FallbackWithFactory create(Throwable cause) {
-			return new FallbackWithFactory();
-		}
-
-	}
-
-	static class FallbackWithFactory implements TestClientWithFactory {
-
-		@Override
-		public Hello getHello() {
-			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
-		}
-
-		@Override
-		public String getException() {
-			return "Fixed response";
-		}
-
-	}
-----
-
-[[feign-and-primary]]
-=== Feign and `@Primary`
-
-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]
-----
-@FeignClient(name = "hello", primary = false)
-public interface HelloClient {
-	// methods here
-}
-----
-
-[[spring-cloud-feign-inheritance]]
-=== Feign Inheritance Support
-
-Feign supports boilerplate apis via single-inheritance interfaces.
-This allows grouping common operations into convenient base interfaces.
-
-.UserService.java
-[source,java,indent=0]
-----
-public interface UserService {
-
-	@RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
-	User getUser(@PathVariable("id") long id);
-}
-----
-
-.UserResource.java
-[source,java,indent=0]
-----
-@RestController
-public class UserResource implements UserService {
-
-}
-----
-
-.UserClient.java
-[source,java,indent=0]
-----
-package project.user;
-
-@FeignClient("users")
-public interface UserClient extends UserService {
-
-}
-----
-
-WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
-
-[[feign-request/response-compression]]
-=== Feign request/response compression
-
-You may consider enabling the request or response GZIP compression for your
-Feign requests. You can do this by enabling one of the properties:
-
-[source,java]
-----
-spring.cloud.openfeign.compression.request.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]
-----
-spring.cloud.openfeign.compression.request.enabled=true
-spring.cloud.openfeign.compression.request.mime-types=text/xml,application/xml,application/json
-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.
-
-TIP: Since the OkHttpClient uses "transparent" compression, that is disabled if the `content-encoding` or `accept-encoding` header is present, we do not enable compression when `feign.okhttp.OkHttpClient` is present on the classpath and `spring.cloud.openfeign.okhttp.enabled` is set to `true`.
-
-[[feign-logging]]
-=== Feign logging
-
-A logger is created for each Feign client created. By default, the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
-
-.application.yml
-
-[source,yaml]
-----
-logging.level.project.user.UserClient: DEBUG
-----
-
-The `Logger.Level` object that you may configure per client, tells Feign how much to log. Choices are:
-
-* `NONE`, No logging (*DEFAULT*).
-* `BASIC`, Log only the request method and URL and the response status code and execution time.
-* `HEADERS`, Log the basic information along with request and response headers.
-* `FULL`, Log the headers, body, and metadata for both requests and responses.
-
-For example, the following would set the `Logger.Level` to `FULL`:
-
-[source,java,indent=0]
-----
-@Configuration
-public class FooConfiguration {
-	@Bean
-	Logger.Level feignLoggerLevel() {
-		return Logger.Level.FULL;
-	}
-}
-----
-
-[[feign-capability-support]]
-=== 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 Micrometer is a good real-life example for this. See xref:spring-cloud-openfeign.adoc#micrometer-support[Micrometer Support].
-
-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();
-	}
-}
-----
-
-[[micrometer-support]]
-=== Micrometer Support
-
-If all of the following conditions are true, a `MicrometerObservationCapability` bean is created and registered so that your Feign client is observable by Micrometer:
-
-* `feign-micrometer` is on the classpath
-* A `ObservationRegistry` bean is available
-* feign micrometer properties are set to `true` (by default)
-	- `spring.cloud.openfeign.micrometer.enabled=true` (for all clients)
-	- `spring.cloud.openfeign.client.config.feignName.micrometer.enabled=true` (for a single client)
-
-NOTE: If your application already uses Micrometer, enabling this feature 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 micrometer properties to `false`
-	- `spring.cloud.openfeign.micrometer.enabled=false`
-	- `spring.cloud.openfeign.client.config.feignName.micrometer.enabled=false`
-
-NOTE: `spring.cloud.openfeign.micrometer.enabled=false` disables Micrometer support for *all* Feign clients regardless of the value of the client-level flags: `spring.cloud.openfeign.client.config.feignName.micrometer.enabled`.
-If you want to enable or disable Micrometer support per client, don't set `spring.cloud.openfeign.micrometer.enabled` and use `spring.cloud.openfeign.client.config.feignName.micrometer.enabled`.
-
-You can also customize the `MicrometerObservationCapability` by registering your own bean:
-
-[source,java,indent=0]
-----
-@Configuration
-public class FooConfiguration {
-	@Bean
-	public MicrometerObservationCapability micrometerObservationCapability(ObservationRegistry registry) {
-		return new MicrometerObservationCapability(registry);
-	}
-}
-----
-
-It is still possible to use `MicrometerCapability` with Feign (metrics-only support), you need to disable Micrometer support (`spring.cloud.openfeign.micrometer.enabled=false`) and create a `MicrometerCapability` bean:
-
-[source,java,indent=0]
-----
-@Configuration
-public class FooConfiguration {
-	@Bean
-	public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
-		return new MicrometerCapability(meterRegistry);
-	}
-}
-----
-
-[[feign-caching]]
-=== 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]]
-=== Feign @QueryMap support
-
-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]]
-=== 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 @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]]
-=== 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 DemoFeignClient {
-
-    @CollectionFormat(feign.CollectionFormat.CSV)
-    @GetMapping(path = "/test")
-    ResponseEntity performRequest(String test);
-
-}
-----
-
-[[reactive-support]]
-=== 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]]
-==== 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]]
-=== Spring Data Support
-
-If Jackson Databind and Spring Data Commons are on the classpath, converters for `org.springframework.data.domain.Page` and `org.springframework.data.domain.Sort` will be added automatically.
-
-To disable this behaviour set
-[source,java]
-----
-spring.cloud.openfeign.autoconfiguration.jackson.enabled=false
-----
-
-See `org.springframework.cloud.openfeign.FeignAutoConfiguration.FeignJacksonConfiguration` for details.
-
-[[spring-refreshscope-support]]
-=== 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.
-* A url wrapped under `org.springframework.cloud.openfeign.RefreshableUrl`. This means the URL of Feign client, if defined
-with `spring.cloud.openfeign.client.config.\{feignName}.url` property, can be refreshed against any Feign client instance.
-
-You can refresh these properties 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
-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 `OAuth2AccessTokenInterceptor` is created. Before each request, the interceptor resolves the required access token and includes it as a header.
-`OAuth2AccessTokenInterceptor` uses the `OAuth2AuthorizedClientManager` to get `OAuth2AuthorizedClient` that holds an `OAuth2AccessToken`. If the user has specified an OAuth2 `clientRegistrationId` using the `spring.cloud.openfeign.oauth2.clientRegistrationId` property, it will be used to retrieve the token. If the token is not retrieved or the `clientRegistrationId` has not been specified, the `serviceId` retrieved from the `url` host segment will be used.
-
-TIP:: Using the `serviceId` as OAuth2 client registrationId is convenient for load-balanced Feign clients. For non-load-balanced ones, the property-based `clientRegistrationId` is a suitable approach.
-
-TIP:: If you do not want to use the default setup for the `OAuth2AuthorizedClientManager`, you can just instantiate a bean of this type in your configuration.
-
-[[transform-the-load-balanced-http-request]]
-=== 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.
-
-[[x-forwarded-headers-support]]
-=== X-Forwarded Headers Support
-
-`X-Forwarded-Host` and `X-Forwarded-Proto` support can be enabled by setting following flag:
-
-[source,properties]
-----
-spring.cloud.loadbalancer.x-forwarded.enabled=true
-----
-
-[[supported-ways-to-provide-url-to-a-feign-client]]
-=== Supported Ways To Provide URL To A Feign Client
-You can provide a URL to a Feign client in any of the following ways:
-
-|===
-|Case |Example |Details
-
-|The URL is provided in the `@FeignClient` annotation.
-|`@FeignClient(name="testClient", url="http://localhost:8081")`
-|The URL is resolved from the `url` attribute of the annotation, without load-balancing.
-
-|The URL is provided in the `@FeignClient` annotation and in the
-configuration properties.
-|`@FeignClient(name="testClient", url="http://localhost:8081")` and the property defined in `application.yml` as
-`spring.cloud.openfeign.client.config.testClient.url=http://localhost:8081`
-|The URL is resolved from the `url` attribute of the annotation, without load-balancing.
-The URL provided in the configuration properties remains unused.
-
-|The URL is not provided in the `@FeignClient` annotation but is provided in configuration properties.
-| `@FeignClient(name="testClient")` and the property defined in `application.yml` as
-`spring.cloud.openfeign.client.config.testClient.url=http://localhost:8081`
-|The URL is resolved from configuration properties, without load-balancing. If
-`spring.cloud.openfeign.client.refresh-enabled=true`, then the URL defined in configuration properties can be refreshed as described in <<Spring `@RefreshScope` Support,Spring RefreshScope Support>>.
-
-|The URL is neither provided in the `@FeignClient` annotation nor in configuration properties.
-|`@FeignClient(name="testClient")`
-|The URL is resolved from `name` attribute of annotation, with load balancing.
-
-|===
-
-[[aot-and-native-image-support]]
-=== AOT and Native Image Support
-
-Spring Cloud OpenFeign supports Spring AOT transformations and native images, however, only with refresh mode disabled, Feign clients refresh disabled (default setting) and xref:spring-cloud-openfeign.adoc#attribute-resolution-mode[lazy `@FeignClient` attribute resolution] disabled (default setting).
-
-WARNING: If you want to run Spring Cloud OpenFeign clients in AOT or native image modes, make sure to set `spring.cloud.refresh.enabled` to `false`.
-
-TIP: If you want to run Spring Cloud OpenFeign clients in AOT or native image modes, ensure `spring.cloud.openfeign.client.refresh-enabled` has not been set to `true`.
-
-TIP: If you want to run Spring Cloud OpenFeign clients in AOT or native image modes, ensure `spring.cloud.openfeign.lazy-attributes-resolution` has not been set to `true`.
-
-TIP:  However, if you set the `url` value via properties, it is possible to override the `@FeignClient` `url` value by running the image with `-Dspring.cloud.openfeign.client.config.[clientId].url=[url]` flag. In order to enable overriding, a `url` value also has to be set via properties and not `@FeignClient` attribute during buildtime.
-
-[[configuration-properties]]
-== Configuration properties
-
-To see the list of all Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].

docs/modules/ROOT/partials/_attributes.adoc

@@ -1,3 +0,0 @@
-:sc-ext: java
-:project-full-name: Spring Cloud OpenFeign
-:all: {asterisk}{asterisk}

docs/modules/ROOT/partials/_configprops.adoc

@@ -1,113 +0,0 @@
-|===
-|Name | Default | Description
-
-|spring.cloud.compatibility-verifier.compatible-boot-versions | `+++3.2.x+++` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x}
-|spring.cloud.compatibility-verifier.enabled | `+++false+++` | Enables creation of Spring Cloud compatibility verification.
-|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.
-|spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
-|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
-|spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
-|spring.cloud.decrypt-environment-post-processor.enabled | `+++true+++` | Enable the DecryptEnvironmentPostProcessor.
-|spring.cloud.discovery.client.composite-indicator.enabled | `+++true+++` | Enables discovery client composite health indicator.
-|spring.cloud.discovery.client.health-indicator.enabled | `+++true+++` | 
-|spring.cloud.discovery.client.health-indicator.include-description | `+++false+++` | 
-|spring.cloud.discovery.client.health-indicator.use-services-query | `+++true+++` | Whether or not the indicator should use {@link DiscoveryClient#getServices} to check its health. When set to {@code false} the indicator instead uses the lighter {@link DiscoveryClient#probe()}. This can be helpful in large deployments where the number of services returned makes the operation unnecessarily heavy.
-|spring.cloud.discovery.client.simple.instances |  | 
-|spring.cloud.discovery.client.simple.local.host |  | 
-|spring.cloud.discovery.client.simple.local.instance-id |  | 
-|spring.cloud.discovery.client.simple.local.metadata |  | 
-|spring.cloud.discovery.client.simple.local.port | `+++0+++` | 
-|spring.cloud.discovery.client.simple.local.secure | `+++false+++` | 
-|spring.cloud.discovery.client.simple.local.service-id |  | 
-|spring.cloud.discovery.client.simple.local.uri |  | 
-|spring.cloud.discovery.client.simple.order |  | 
-|spring.cloud.discovery.enabled | `+++true+++` | Enables discovery client health indicators.
-|spring.cloud.features.enabled | `+++true+++` | Enables the features endpoint.
-|spring.cloud.httpclientfactories.apache.enabled | `+++true+++` | Enables creation of Apache Http Client factory beans.
-|spring.cloud.httpclientfactories.ok.enabled | `+++true+++` | Enables creation of OK Http Client factory beans.
-|spring.cloud.hypermedia.refresh.fixed-delay | `+++5000+++` | 
-|spring.cloud.hypermedia.refresh.initial-delay | `+++10000+++` | 
-|spring.cloud.inetutils.default-hostname | `+++localhost+++` | The default hostname. Used in case of errors.
-|spring.cloud.inetutils.default-ip-address | `+++127.0.0.1+++` | The default IP address. Used in case of errors.
-|spring.cloud.inetutils.ignored-interfaces |  | List of Java regular expressions for network interfaces that will be ignored.
-|spring.cloud.inetutils.preferred-networks |  | List of Java regular expressions for network addresses that will be preferred.
-|spring.cloud.inetutils.timeout-seconds | `+++1+++` | Timeout, in seconds, for calculating hostname.
-|spring.cloud.inetutils.use-only-site-local-interfaces | `+++false+++` | Whether to use only interfaces with site local addresses. See {@link InetAddress#isSiteLocalAddress()} for more details.
-|spring.cloud.loadbalancer.call-get-with-request-on-delegates | `+++true+++` | If this flag is set to {@code true}, {@code ServiceInstanceListSupplier#get(Request request)} method will be implemented to call {@code delegate.get(request)} in classes assignable from {@code DelegatingServiceInstanceListSupplier} that don't already implement that method, with the exclusion of {@code CachingServiceInstanceListSupplier} and {@code HealthCheckServiceInstanceListSupplier}, which should be placed in the instance supplier hierarchy directly after the supplier performing instance retrieval over the network, before any request-based filtering is done, {@code true} by default.
-|spring.cloud.loadbalancer.clients |  | 
-|spring.cloud.loadbalancer.eager-load.clients |  | 
-|spring.cloud.loadbalancer.health-check.initial-delay | `+++0+++` | Initial delay value for the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.interval  | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.path |  | Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.
-|spring.cloud.loadbalancer.health-check.port |  | Path at which the health-check request should be made. If none is set, the port under which the requested service is available at the service instance.
-|spring.cloud.loadbalancer.health-check.refetch-instances | `+++false+++` | Indicates whether the instances should be refetched by the `HealthCheckServiceInstanceListSupplier`. This can be used if the instances can be updated and the underlying delegate does not provide an ongoing flux.
-|spring.cloud.loadbalancer.health-check.refetch-instances-interval | `+++25s+++` | Interval for refetching available service instances.
-|spring.cloud.loadbalancer.health-check.repeat-health-check | `+++true+++` | Indicates whether health checks should keep repeating. It might be useful to set it to `false` if periodically refetching the instances, as every refetch will also trigger a healthcheck.
-|spring.cloud.loadbalancer.health-check.update-results-list | `+++true+++` | Indicates whether the {@code healthCheckFlux} should emit on each alive {@link ServiceInstance} that has been retrieved. If set to {@code false}, the entire alive instances sequence is first collected into a list and only then emitted.
-|spring.cloud.loadbalancer.hint |  | Allows setting the value of <code>hint</code> that is passed on to the LoadBalancer request and can subsequently be used in {@link ReactiveLoadBalancer} implementations.
-|spring.cloud.loadbalancer.hint-header-name | `+++X-SC-LB-Hint+++` | Allows setting the name of the header used for passing the hint for hint-based service instance filtering.
-|spring.cloud.loadbalancer.retry.backoff.enabled | `+++false+++` | Indicates whether Reactor Retry backoffs should be applied.
-|spring.cloud.loadbalancer.retry.backoff.jitter | `+++0.5+++` | Used to set `RetryBackoffSpec.jitter`.
-|spring.cloud.loadbalancer.retry.backoff.max-backoff | `+++Long.MAX ms+++` | Used to set `RetryBackoffSpec.maxBackoff`.
-|spring.cloud.loadbalancer.retry.backoff.min-backoff | `+++5 ms+++` | Used to set `RetryBackoffSpec#minBackoff`.
-|spring.cloud.loadbalancer.retry.enabled | `+++true+++` | Enables LoadBalancer retries.
-|spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | `+++1+++` | Number of retries to be executed on the next `ServiceInstance`. A `ServiceInstance` is chosen before each retry call.
-|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | Number of retries to be executed on the same `ServiceInstance`.
-|spring.cloud.loadbalancer.retry.retry-on-all-exceptions | `+++false+++` | Indicates retries should be attempted for all exceptions, not only those specified in `retryableExceptions`.
-|spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`.
-|spring.cloud.loadbalancer.retry.retryable-exceptions | `+++{}+++` | A `Set` of `Throwable` classes that should trigger a retry.
-|spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry.
-|spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie | `+++false+++` | Indicates whether a cookie with the newly selected instance should be added by LoadBalancer.
-|spring.cloud.loadbalancer.sticky-session.instance-id-cookie-name | `+++sc-lb-instance-id+++` | The name of the cookie holding the preferred instance id.
-|spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers.
-|spring.cloud.openfeign.autoconfiguration.jackson.enabled | `+++true+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
-|spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.
-|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.http2client.enabled | `+++false+++` | Enables the use of the Java11 HTTP 2 Client by Feign.
-|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.connection-request-timeout | `+++3+++` | Default value for connection request timeout.
-|spring.cloud.openfeign.httpclient.hc5.connection-request-timeout-unit |  | Default value for connection request timeout unit.
-|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.http2.version | `+++HTTP_2+++` | Configure the protocols used by this client to communicate with remote servers. Uses {@link String} value of {@link HttpClient.Version}.
-|spring.cloud.openfeign.httpclient.max-connections | `+++200+++` | 
-|spring.cloud.openfeign.httpclient.max-connections-per-route | `+++50+++` | 
-|spring.cloud.openfeign.httpclient.ok-http.protocols |  | Configure the protocols used by this client to communicate with remote servers. Uses {@link String} values of {@link Protocol}.
-|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.lazy-attributes-resolution | `+++false+++` | Switches @FeignClient attributes resolution mode to lazy.
-|spring.cloud.openfeign.micrometer.enabled | `+++true+++` | Enables Micrometer capabilities for Feign.
-|spring.cloud.openfeign.oauth2.clientRegistrationId |  | Provides a clientId to be used with OAuth2.
-|spring.cloud.openfeign.oauth2.enabled | `+++false+++` | Enables feign interceptor for managing oauth2 access token.
-|spring.cloud.openfeign.okhttp.enabled | `+++false+++` | Enables the use of the OK HTTP Client by Feign.
-|spring.cloud.refresh.additional-property-sources-to-retain |  | Additional property sources to retain during a refresh. Typically only system property sources are retained. This property allows property sources, such as property sources created by EnvironmentPostProcessors to be retained as well.
-|spring.cloud.refresh.enabled | `+++true+++` | Enables autoconfiguration for the refresh scope and associated features.
-|spring.cloud.refresh.extra-refreshable | `+++true+++` | Additional class names for beans to post process into refresh scope.
-|spring.cloud.refresh.never-refreshable | `+++true+++` | Comma separated list of class names for beans to never be refreshed or rebound.
-|spring.cloud.refresh.on-restart.enabled | `+++true+++` | Enable refreshing context on start.
-|spring.cloud.service-registry.auto-registration.enabled | `+++true+++` | Whether service auto-registration is enabled. Defaults to true.
-|spring.cloud.service-registry.auto-registration.fail-fast | `+++false+++` | Whether startup fails if there is no AutoServiceRegistration. Defaults to false.
-|spring.cloud.service-registry.auto-registration.register-management | `+++true+++` | Whether to register the management as a service. Defaults to true.
-|spring.cloud.util.enabled | `+++true+++` | Enables creation of Spring Cloud utility beans.
-
-|===

docs/modules/ROOT/partials/_conventions.adoc

@@ -1,6 +0,0 @@
-[[observability-conventions]]
-=== Observability - Conventions
-
-Below you can find a list of all `GlobalObservationConvention` and `ObservationConvention` declared by this project.
-
-

docs/modules/ROOT/partials/_metrics.adoc

@@ -1,6 +0,0 @@
-[[observability-metrics]]
-=== Observability - Metrics
-
-Below you can find a list of all metrics declared by this project.
-
-

docs/modules/ROOT/partials/_spans.adoc

@@ -1,6 +0,0 @@
-[[observability-spans]]
-=== Observability - Spans
-
-Below you can find a list of all spans declared by this project.
-
-

docs/pom.xml

@@ -3,32 +3,20 @@
 		 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>
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.2.11.BUILD-SNAPSHOT</version>
 	</parent>
-	<scm>
-		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
-	</scm>
-	<packaging>jar</packaging>
+	<artifactId>spring-cloud-openfeign-docs</artifactId>
+	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign Docs</name>
-	<description>Spring Cloud OpenFeign Docs</description>
+	<description>Spring Cloud Docs</description>
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<configprops.inclusionPattern>spring.cloud.*</configprops.inclusionPattern>
-		<!-- Don't upload docs jar to central / repo.spring.io -->
-		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
-
-		<!-- Observability -->
-		<micrometer-docs-generator.version>1.0.2</micrometer-docs-generator.version>
-		<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/</micrometer-docs-generator.inputPath>
-		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
-		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>
+		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -36,69 +24,30 @@
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<sourceDirectory>src/main/asciidoc</sourceDirectory>
-	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
 			<build>
-				<resources>
-					<resource>
-						<directory>src/main/antora/resources/antora-resources</directory>
-						<filtering>true</filtering>
-					</resource>
-				</resources>
 				<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.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<!-- TODO: Remove this execution if you have no observability -->
-						<executions>
-							<execution>
-								<id>generate-observability-docs</id>
-								<phase>${generate-docs.phase}</phase>
-								<goals>
-									<goal>java</goal>
-								</goals>
-								<configuration>
-									<mainClass>io.micrometer.docs.DocsGeneratorCommand</mainClass>
-									<includePluginDependencies>true</includePluginDependencies>
-									<arguments>
-										<argument>${micrometer-docs-generator.inputPath}</argument>
-										<argument>${micrometer-docs-generator.inclusionPattern}</argument>
-										<argument>${micrometer-docs-generator.outputPath}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>io.micrometer</groupId>
-								<artifactId>micrometer-docs-generator</artifactId>
-								<version>${micrometer-docs-generator.version}</version>
-								<type>jar</type>
-							</dependency>
-						</dependencies>
+						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-component-version-maven-plugin</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-maven-plugin</artifactId>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>

docs/src/main/antora/resources/antora-resources/antora.yml

@@ -1,20 +0,0 @@
-version: @antora-component.version@
-prerelease: @antora-component.prerelease@
-
-asciidoc:
-  attributes:
-    attribute-missing: 'warn'
-    chomp: 'all'
-    project-root: @maven.multiModuleProjectDirectory@
-    github-repo: @docs.main@
-    github-raw: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    github-code: https://github.com/spring-cloud/@docs.main@/tree/@github-tag@
-    github-issues: https://github.com/spring-cloud/@docs.main@/issues/
-    github-wiki: https://github.com/spring-cloud/@docs.main@/wiki
-    spring-cloud-version: @project.version@
-    github-tag: @github-tag@
-    version-type: @version-type@
-    docs-url: https://docs.spring.io/@docs.main@/docs/@project.version@
-    raw-docs-url: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    project-version: @project.version@
-    project-name: @docs.main@

docs/src/main/asciidoc/README.adoc

@@ -1,24 +1,25 @@
-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://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
 
-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/main"]
+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]]
 == Features
 
 * Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 
-[[building]]
 == Building
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/building.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[]
 
-[[contributing]]
 == Contributing
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/contributing-docs.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]
 
-[[license]]
 == License
 
 The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/main/LICENSE.txt[here].

docs/src/main/asciidoc/_attributes.adoc

@@ -1,6 +1,8 @@
 :doctype: book
 :idprefix:
 :idseparator: -
+:toc: left
+:toclevels: 4
 :tabsize: 4
 :numbered:
 :sectanchors:

docs/src/main/asciidoc/_configprops.adoc

@@ -0,0 +1,33 @@
+|===
+|Name | Default | Description
+
+|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
+|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
+|feign.client.config |  | 
+|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
+|feign.client.default-config | `default` | 
+|feign.client.default-to-properties | `true` | 
+|feign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed.
+|feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
+|feign.compression.request.min-request-size | `2048` | The minimum threshold content size.
+|feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
+|feign.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used.
+|feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
+|feign.httpclient.connection-timeout | `2000` | 
+|feign.httpclient.connection-timer-repeat | `3000` | 
+|feign.httpclient.disable-ssl-validation | `false` | 
+|feign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign.
+|feign.httpclient.follow-redirects | `true` | 
+|feign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
+|feign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
+|feign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
+|feign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
+|feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
+|feign.httpclient.max-connections | `200` | 
+|feign.httpclient.max-connections-per-route | `50` | 
+|feign.httpclient.time-to-live | `900` | 
+|feign.httpclient.time-to-live-unit |  | 
+|feign.hystrix.enabled | `false` | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
+|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
+
+|===

docs/src/main/asciidoc/appendix.adoc

@@ -1,13 +1,14 @@
 :numbered!:
 [appendix]
 [[common-application-properties]]
-= Common application properties
-:page-section-summary-toc: 1
+== 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 Spring Cloud OpenFeign properties and references to the underlying classes that consume them.
+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[]

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+spring-cloud-openfeign.adoc

docs/src/main/asciidoc/intro.adoc

@@ -1,6 +1,3 @@
-[[introduction]]
-= Spring Cloud OpenFeign
-
 This project provides OpenFeign integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms.
 

docs/src/main/asciidoc/spring-cloud-openfeign.adoc

@@ -0,0 +1,720 @@
+= Spring Cloud OpenFeign
+include::_attributes.adoc[]
+
+*{spring-cloud-version}*
+
+include::intro.adoc[]
+
+
+[[spring-cloud-feign]]
+== Declarative REST Client: Feign
+
+https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
+It makes writing web service clients easier.
+To use Feign create an interface and annotate it.
+It has pluggable annotation support including Feign annotations and JAX-RS annotations.
+Feign also supports pluggable encoders and decoders.
+Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
+Spring Cloud integrates Ribbon and 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 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
+
+[source,java,indent=0]
+----
+@SpringBootApplication
+@EnableFeignClients
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
+----
+
+.StoreClient.java
+[source,java,indent=0]
+----
+@FeignClient("stores")
+public interface StoreClient {
+    @RequestMapping(method = RequestMethod.GET, value = "/stores")
+    List<Store> getStores();
+
+    @RequestMapping(method = RequestMethod.GET, value = "/stores")
+    Page<Store> getStores(Pageable pageable);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
+    Store update(@PathVariable("storeId") Long storeId, Store store);
+}
+----
+
+In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create either a https://github.com/Netflix/ribbon[Ribbon] load-balancer (see <<spring-cloud-ribbon,below for details of Ribbon support>> and <<spring-cloud-circuitbreaker,below for details of Spring Cloud CircuitBreaker support>>) or https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java[Spring Cloud LoadBalancer].
+You can also specify a URL using the `url` attribute
+(absolute value or just a hostname). The name of the bean in the
+application context is the fully qualified name of the interface.
+To specify your own alias value you can use the `qualifiers` value
+of the `@FeignClient` annotation.
+
+The load-balancer client above will want to discover the physical addresses
+for the "stores" service. If your application is a Eureka client then
+it will resolve the service in the Eureka service registry. If you
+don't want to use Eureka, you can simply configure a list of servers
+in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
+
+WARNING: In order to maintain backward compatibility, is used as the default load-balancer implementation.
+However, Spring Cloud Netflix Ribbon is now in maintenance mode, so we recommend using Spring Cloud LoadBalancer instead.
+To do this, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false`.
+
+[[spring-cloud-feign-overriding-defaults]]
+=== Overriding Feign Defaults
+
+A central concept in Spring Cloud's Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
+`ApplicationContext` on demand for each named client using `FeignClientsConfiguration`. This contains (amongst other things) an `feign.Decoder`, a `feign.Encoder`, and a `feign.Contract`.
+It is possible to override the name of that ensemble by using the `contextId`
+attribute of the `@FeignClient` annotation.
+
+Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:
+
+[source,java,indent=0]
+----
+@FeignClient(name = "stores", configuration = FooConfiguration.class)
+public interface StoreClient {
+    //..
+}
+----
+
+In this case the client is composed from the components already in `FeignClientsConfiguration` together with any in `FooConfiguration` (where the latter will override the former).
+
+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.
+
+Placeholders are supported in the `name` and `url` attributes.
+
+[source,java,indent=0]
+----
+@FeignClient(name = "${feign.name}", url = "${feign.url}")
+public interface StoreClient {
+    //..
+}
+----
+
+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`
+* `Contract` feignContract: `SpringMvcContract`
+* `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
+* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
+* `Client` feignClient: if Ribbon is in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
+If none of them is in the classpath, the default feign client is used.
+
+NOTE: `spring-cloud-starter-openfeign` supports both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`. However, as they are optional dependencies, you need to make sure the one you want to use has been added to your project.
+
+The OkHttpClient and ApacheHttpClient and ApacheHC5 feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` or `feign.httpclient.hc5.enabled` to `true`, respectively, and having them on the classpath.
+You can customize the HTTP client used by providing a bean of either `org.apache.http.impl.client.CloseableHttpClient` when using Apache or `okhttp3.OkHttpClient` when using OK HTTP or `org.apache.hc.client5.http.impl.classic.CloseableHttpClient` when using Apache HC5.
+
+Spring Cloud OpenFeign _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:
+
+* `Logger.Level`
+* `Retryer`
+* `ErrorDecoder`
+* `Request.Options`
+* `Collection<RequestInterceptor>`
+* `SetterFactory`
+* `QueryMapEncoder`
+
+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:
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+    @Bean
+    public Contract feignContract() {
+        return new feign.Contract.Default();
+    }
+
+    @Bean
+    public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new BasicAuthRequestInterceptor("user", "password");
+    }
+}
+----
+
+This replaces the `SpringMvcContract` with `feign.Contract.Default` and adds a `RequestInterceptor` to the collection of `RequestInterceptor`.
+
+`@FeignClient` also can be configured using configuration properties.
+
+application.yml
+[source,yaml]
+----
+feign:
+  client:
+    config:
+      feignName:
+        connectTimeout: 5000
+        readTimeout: 5000
+        loggerLevel: full
+        errorDecoder: com.example.SimpleErrorDecoder
+        retryer: com.example.SimpleRetryer
+       defaultQueryParameters:
+          query: queryValue
+        defaultRequestHeaders:
+          header: headerValue
+        requestInterceptors:
+          - com.example.FooRequestInterceptor
+          - com.example.BarRequestInterceptor
+        decode404: false
+        encoder: com.example.SimpleEncoder
+        decoder: com.example.SimpleDecoder
+        contract: com.example.SimpleContract
+----
+
+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.
+
+You can use `feign.client.config.feignName.defaultQueryParameters` and `feign.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:
+  client:
+    config:
+      default:
+        connectTimeout: 5000
+        readTimeout: 5000
+        loggerLevel: basic
+----
+
+If we create both `@Configuration` bean and configuration properties, configuration properties will win.
+It will override `@Configuration` values. But if you want to change the priority to `@Configuration`,
+you can change `feign.client.default-to-properties` to `false`.
+
+NOTE: If you need to use `ThreadLocal` bound variables in your `RequestInterceptor`s you will need to either set the
+thread isolation strategy for Hystrix to `SEMAPHORE` or disable Hystrix in Feign.
+
+application.yml
+[source,yaml]
+----
+# To disable Hystrix in Feign
+feign:
+  hystrix:
+    enabled: false
+
+# To set thread isolation to SEMAPHORE
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+----
+
+If we want to create multiple feign clients with the same name or url
+so that they would point to the same server but each with a different custom configuration then
+we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
+collision of these configuration beans.
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
+public interface FooClient {
+    //..
+}
+----
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
+public interface BarClient {
+    //..
+}
+----
+
+It is also possible to configure FeignClient not to inherit beans from the parent context.
+You can do this by overriding the `inheritParentConfiguration()` in a  `FeignClientConfigurer`
+bean to return `false`:
+
+[source,java,indent=0]
+----
+@Configuration
+public class CustomConfiguration{
+
+@Bean
+public FeignClientConfigurer feignClientConfigurer() {
+			return new FeignClientConfigurer() {
+
+				@Override
+				public boolean inheritParentConfiguration() {
+					return false;
+				}
+			};
+
+		}
+}
+----
+
+TIP: By default, Feign clients do not encode slash `/` characters. You can change this behaviour, by setting the value of `feign.client.decodeSlash` to `false`.
+
+==== `SpringEncoder` configuration
+
+In the `SpringEncoder` that we provide, we set `null` charset for binary content types and `UTF-8` for all the other ones.
+
+You can modify this behaviour to derive the charset from the `Content-Type` header charset instead by setting the value of `feign.encoder.charset-from-content-type` to `true`.
+
+[[timeout-handling]]
+=== Timeout Handling
+
+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.
+
+When Hystrix <<spring-cloud-openfeign#spring-cloud-feign-hystrix,is enabled>>, its timeout configuration link:https://github.com/Netflix/Hystrix/wiki/Configuration#execution.isolation.thread.timeoutInMilliseconds[defaults] to 1000 milliseconds. Hence, it might occur before the client timeout that we configured earlier. Increasing this timeout prevents it from happening.
+
+[source,yaml]
+----
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 5000
+        readTimeout: 5000
+  hystrix:
+    enabled: true
+
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+----
+
+NOTE: When the Hystrix timeout is enabled and its timeout is set longer than that of a feign client, `HystrixTimeoutException` wraps a feign exception. Otherwise, the only difference is the cause of the exception. The purpose of `HystrixTimeoutException` is to wrap any runtime exception that occurs first and throw an instance of itself.
+
+=== Creating Feign Clients Manually
+
+In some cases it might be necessary to customize your Feign Clients in a way that is not
+possible using the methods above.  In this case you can create Clients using the
+https://github.com/OpenFeign/feign/#basics[Feign Builder API]. Below is an example
+which creates two Feign Clients with the same interface but configures each one with
+a separate request interceptor.
+
+[source,java,indent=0]
+----
+@Import(FeignClientsConfiguration.class)
+class FooController {
+
+	private FooClient fooClient;
+
+	private FooClient adminClient;
+
+    	@Autowired
+	public FooController(Decoder decoder, Encoder encoder, Client client, Contract contract) {
+		this.fooClient = Feign.builder().client(client)
+				.encoder(encoder)
+				.decoder(decoder)
+				.contract(contract)
+				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
+				.target(FooClient.class, "https://PROD-SVC");
+
+		this.adminClient = Feign.builder().client(client)
+				.encoder(encoder)
+				.decoder(decoder)
+				.contract(contract)
+				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
+				.target(FooClient.class, "https://PROD-SVC");
+    }
+}
+----
+
+NOTE: In the above example `FeignClientsConfiguration.class` is the default configuration
+provided by Spring Cloud OpenFeign.
+
+NOTE: `PROD-SVC` is the name of the service the Clients will be making requests to.
+
+NOTE: The Feign `Contract` object defines what annotations and values are valid on interfaces. The
+autowired `Contract` bean provides supports for SpringMVC annotations, instead of
+the default Feign native annotations.
+
+You can also use the `Builder`to configure FeignClient not to inherit beans from the parent context.
+You can do this by overriding calling `inheritParentContext(false)` on the `Builder`.
+
+[[spring-cloud-feign-hystrix]]
+=== Feign Hystrix Support
+
+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()`).
+
+To disable Hystrix support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+    	@Bean
+	@Scope("prototype")
+	public Feign.Builder feignBuilder() {
+		return Feign.builder();
+	}
+}
+----
+
+WARNING:  Prior to the Spring Cloud Dalston release, if Hystrix was on the classpath Feign would have wrapped
+all methods in a circuit breaker by default.  This default behavior was changed in Spring Cloud Dalston in
+favor for an opt-in approach.
+
+[[spring-cloud-feign-hystrix-fallback]]
+=== Feign Hystrix Fallbacks
+
+Hystrix supports the notion of a fallback: a default code path that is executed when the circuit is open or there is an error. To enable fallbacks for a given `@FeignClient` set the `fallback` attribute to the class name that implements the fallback. You also need to declare your implementation as a Spring bean.
+
+[source,java,indent=0]
+----
+@FeignClient(name = "hello", fallback = HystrixClientFallback.class)
+protected interface HystrixClient {
+    @RequestMapping(method = RequestMethod.GET, value = "/hello")
+    Hello iFailSometimes();
+}
+
+static class HystrixClientFallback implements HystrixClient {
+    @Override
+    public Hello iFailSometimes() {
+        return new Hello("fallback");
+    }
+}
+----
+
+If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.
+
+[source,java,indent=0]
+----
+@FeignClient(name = "hello", fallbackFactory = HystrixClientFallbackFactory.class)
+protected interface HystrixClient {
+	@RequestMapping(method = RequestMethod.GET, value = "/hello")
+	Hello iFailSometimes();
+}
+
+@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`.
+
+[[spring-cloud-feign-circuitbreaker]]
+=== Feign Spring Cloud CircuitBreaker Support
+
+If Spring Cloud CircuitBreaker is on the classpath and `feign.circuitbreaker.enabled=true`, Feign will wrap all methods with a circuit breaker.
+
+To disable Spring Cloud CircuitBreaker support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+    	@Bean
+	@Scope("prototype")
+	public Feign.Builder feignBuilder() {
+		return Feign.builder();
+	}
+}
+----
+
+The circuit breaker name follows this pattern `<feignClientName>#<calledMethod>`. When calling a `@FeignClient` with name `foo` and the called interface method is `bar` then the circuit breaker name will be `foo_bar`.
+
+[[spring-cloud-feign-circuitbreaker-fallback]]
+=== Feign Spring Cloud CircuitBreaker Fallbacks
+
+Spring Cloud CircuitBreaker supports the notion of a fallback: a default code path that is executed when the circuit is open or there is an error. To enable fallbacks for a given `@FeignClient` set the `fallback` attribute to the class name that implements the fallback. You also need to declare your implementation as a Spring bean.
+
+[source,java,indent=0]
+----
+include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback, indent=0]
+----
+
+If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.
+
+[source,java,indent=0]
+----
+include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback_factory, indent=0]
+----
+
+=== Feign and `@Primary`
+
+When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
+
+[source,java,indent=0]
+----
+@FeignClient(name = "hello", primary = false)
+public interface HelloClient {
+	// methods here
+}
+----
+
+[[spring-cloud-feign-inheritance]]
+=== Feign Inheritance Support
+
+Feign supports boilerplate apis via single-inheritance interfaces.
+This allows grouping common operations into convenient base interfaces.
+
+.UserService.java
+[source,java,indent=0]
+----
+public interface UserService {
+
+    @RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
+    User getUser(@PathVariable("id") long id);
+}
+----
+
+.UserResource.java
+[source,java,indent=0]
+----
+@RestController
+public class UserResource implements UserService {
+
+}
+----
+
+.UserClient.java
+[source,java,indent=0]
+----
+package project.user;
+
+@FeignClient("users")
+public interface UserClient extends UserService {
+
+}
+----
+
+WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
+
+=== Feign request/response compression
+
+You may consider enabling the request or response GZIP compression for your
+Feign requests. You can do this by enabling one of the properties:
+
+[source,java]
+----
+feign.compression.request.enabled=true
+feign.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
+feign.compression.request.mime-types=text/xml,application/xml,application/json
+feign.compression.request.min-request-size=2048
+----
+
+These properties allow you to be selective about the compressed media types and minimum request threshold length.
+
+For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
+
+[source,java]
+----
+feign.compression.response.enabled=true
+feign.compression.response.useGzipDecoder=true
+----
+
+=== Feign logging
+
+A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
+
+.application.yml
+
+[source,yaml]
+----
+logging.level.project.user.UserClient: DEBUG
+----
+
+The `Logger.Level` object that you may configure per client, tells Feign how much to log. Choices are:
+
+* `NONE`, No logging (*DEFAULT*).
+* `BASIC`, Log only the request method and URL and the response status code and execution time.
+* `HEADERS`, Log the basic information along with request and response headers.
+* `FULL`, Log the headers, body, and metadata for both requests and responses.
+
+For example, the following would set the `Logger.Level` to `FULL`:
+
+[source,java,indent=0]
+----
+@Configuration
+public class FooConfiguration {
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+}
+----
+
+=== Feign @QueryMap support
+
+The OpenFeign `@QueryMap` annotation provides support for POJOs to be used as
+GET parameter maps. Unfortunately, the default OpenFeign QueryMap annotation is
+incompatible with Spring because it lacks a `value` property.
+
+Spring Cloud OpenFeign provides an equivalent `@SpringQueryMap` annotation, which
+is used to annotate a POJO or Map parameter as a query parameter map.
+
+For example, the `Params` class defines parameters `param1` and `param2`:
+
+[source,java,indent=0]
+----
+// Params.java
+public class Params {
+    private String param1;
+    private String param2;
+
+    // [Getters and setters omitted for brevity]
+}
+----
+
+The following feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
+
+[source,java,indent=0]
+----
+@FeignClient("demo")
+public interface DemoTemplate {
+
+    @GetMapping(path = "/demo")
+    String demoEndpoint(@SpringQueryMap Params params);
+}
+----
+
+If you need more control over the generated query parameter map, you can implement a custom `QueryMapEncoder` bean.
+
+=== HATEOAS support
+
+Spring provides some APIs to create REST representations that follow the https://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle, https://spring.io/projects/spring-hateoas[Spring Hateoas] and https://spring.io/projects/spring-data-rest[Spring Data REST].
+
+If your project use the `org.springframework.boot:spring-boot-starter-hateoas` starter
+or the `org.springframework.boot:spring-boot-starter-data-rest` starter, Feign HATEOAS support is enabled by default.
+
+When HATEOAS support is enabled, Feign clients are allowed to serialize
+and deserialize HATEOAS representation models: https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/EntityModel.html[EntityModel], https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/CollectionModel.html[CollectionModel] and https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/PagedModel.html[PagedModel].
+
+[source,java,indent=0]
+----
+@FeignClient("demo")
+public interface DemoTemplate {
+
+    @GetMapping(path = "/stores")
+    CollectionModel<Store> getStores();
+}
+----
+
+=== Spring @MatrixVariable Support
+
+Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.
+
+If a map is passed as the method argument, the `@MatrixVariable` path segment is created by joining key-value pairs from the map with a `=`.
+
+If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is
+joined with the provided method argument using `=`.
+
+IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, 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 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<TestFeginClient> testFeginClient;
+----
+
+=== Spring Data Support
+You may consider enabling Jackson Modules for the support `org.springframework.data.domain.Page` and `org.springframework.data.domain.Sort` decoding.
+
+[source,java]
+----
+feign.autoconfiguration.jackson.enabled=true
+----
+
+== Configuration properties
+
+To see the list of all Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].

mvnw

@@ -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
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
+# Maven2 Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -27,6 +27,7 @@
 #
 # Optional ENV vars
 # -----------------
+#   M2_HOME - location of maven2's installed home dir
 #   MAVEN_OPTS - parameters passed to the Java VM when running Maven
 #     e.g. to debug Maven itself, use
 #       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -35,10 +36,6 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -53,56 +50,109 @@ fi
 cygwin=false;
 darwin=false;
 mingw=false
-case "$(uname)" in
+case "`uname`" in
   CYGWIN*) cygwin=true ;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
-      else
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
-      fi
-    fi
-    ;;
+           #
+           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+           # for the new JDKs provided by Oracle.
+           #
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
+             #
+             # Oracle JDKs
+             #
+             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=`/usr/libexec/java_home`
+           fi
+           ;;
 esac
 
 if [ -z "$JAVA_HOME" ] ; then
   if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=$(java-config --jre-home)
+    JAVA_HOME=`java-config --jre-home`
   fi
 fi
 
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-# For Mingw, ensure paths are in UNIX format before anything is touched
+# For Migwn, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
-  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
-    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
 fi
 
 if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
     # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
       if $darwin ; then
-        javaHome="$(dirname "\"$javaExecutable\"")"
-        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
       else
-        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
       fi
-      javaHome="$(dirname "\"$javaExecutable\"")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
       JAVA_HOME="$javaHome"
       export JAVA_HOME
     fi
@@ -118,7 +168,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
+    JAVACMD="`which java`"
   fi
 fi
 
@@ -132,177 +182,72 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+fi
+
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
+  local basedir=$(pwd)
+  local wdir=$(pwd)
   while [ "$wdir" != '/' ] ; do
     if [ -d "$wdir"/.mvn ] ; then
       basedir=$wdir
       break
     fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=$(cd "$wdir/.." || exit 1; pwd)
-    fi
-    # end of workaround
+    wdir=$(cd "$wdir/.."; pwd)
   done
-  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+  echo "${basedir}"
 }
 
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-    # Remove \r in case we run on Windows within Git Bash
-    # and check out the repository with auto CRLF management
-    # enabled. Otherwise, we may read lines that are delimited with
-    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
-    # splitting rules.
-    tr -s '\r\n' ' ' < "$1"
+    echo "$(tr -s '\n' ' ' < "$1")"
   fi
 }
 
-log() {
-  if [ "$MVNW_VERBOSE" = true ]; then
-    printf '%s\n' "$1"
-  fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-log "$MAVEN_PROJECTBASEDIR"
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-if [ -r "$wrapperJarPath" ]; then
-    log "Found $wrapperJarPath"
-else
-    log "Couldn't find $wrapperJarPath, downloading it ..."
-
-    if [ -n "$MVNW_REPOURL" ]; then
-      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    else
-      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    fi
-    while IFS="=" read -r key value; do
-      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
-      safeValue=$(echo "$value" | tr -d '\r')
-      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
-      esac
-    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-    log "Downloading from: $wrapperUrl"
-
-    if $cygwin; then
-      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-    fi
-
-    if command -v wget > /dev/null; then
-        log "Found wget ... using wget"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        else
-            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        log "Found curl ... using curl"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        else
-            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        fi
-    else
-        log "Falling back to using Java to download"
-        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaSource=$(cygpath --path --windows "$javaSource")
-          javaClass=$(cygpath --path --windows "$javaClass")
-        fi
-        if [ -e "$javaSource" ]; then
-            if [ ! -e "$javaClass" ]; then
-                log " - Compiling MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/javac" "$javaSource")
-            fi
-            if [ -e "$javaClass" ]; then
-                log " - Running MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-wrapperSha256Sum=""
-while IFS="=" read -r key value; do
-  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
-  esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-if [ -n "$wrapperSha256Sum" ]; then
-  wrapperSha256Result=false
-  if command -v sha256sum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  elif command -v shasum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
-    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
-    exit 1
-  fi
-  if [ $wrapperSha256Result = false ]; then
-    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
-    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
-    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
-fi
-
 # Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-# shellcheck disable=SC2086 # safe args
+echo "Running version check"
+VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
+echo "The found version is [${VERSION}]"
+
+if echo $VERSION | egrep -q 'M|RC'; then
+    echo Activating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
+else
+    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
+fi
+
+if echo $VERSION | egrep -q 'RELEASE'; then
+    echo Activating \"central\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
+else
+    echo Deactivating \"central\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//')
+fi
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"

mvnw.cmd

@@ -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
@@ -18,14 +18,15 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
+@REM Maven2 Start Up Batch script
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
 @REM
 @REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
 @REM     e.g. to debug Maven itself, use
 @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -34,9 +35,7 @@
 
 @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
 @echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
 @REM set %HOME% to equivalent of $HOME
@@ -45,8 +44,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
 :skipRcPre
 
 @setlocal
@@ -81,6 +80,8 @@ goto error
 
 :init
 
+set MAVEN_CMD_LINE_ARGS=%*
+
 @REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
 @REM Fallback to current working directory if not found.
 
@@ -116,72 +117,11 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 :endReadAdditionalConfig
 
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %WRAPPER_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-SET WRAPPER_SHA_256_SUM=""
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
-)
-IF NOT %WRAPPER_SHA_256_SUM%=="" (
-    powershell -Command "&{"^
-       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
-       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
-       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
-       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
-       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
-       "  exit 1;"^
-       "}"^
-       "}"
-    if ERRORLEVEL 1 goto error
-)
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
+set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -191,15 +131,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-cmd /C exit /B %ERROR_CODE%
+exit /B %ERROR_CODE%

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>2.2.11.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -25,8 +25,9 @@
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
-		<jackson.version>2.15.2</jackson.version>
-		<spring-cloud-commons.version>4.1.0-SNAPSHOT</spring-cloud-commons.version>
+		<jackson.version>2.11.3</jackson.version>
+		<spring-cloud-commons.version>2.2.9.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.9.RELEASE</spring-cloud-netflix.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -64,6 +65,13 @@
 					</additionalConfig>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -72,15 +80,6 @@
 				<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>
-					<ignoredResourcePatterns>
-						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-					</ignoredResourcePatterns>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -95,6 +94,13 @@
 
 	<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>
@@ -135,7 +141,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/snapshot</url>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -146,7 +152,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/milestone</url>
+					<url>https://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -164,7 +170,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/snapshot</url>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -175,7 +181,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/milestone</url>
+					<url>https://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -183,7 +189,7 @@
 				<pluginRepository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
+					<url>https://repo.spring.io/libs-release-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -228,7 +234,7 @@
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<!-- Sets the VM argument line used when unit tests are run. -->
-							<argLine>${surefireArgLine} --add-opens=java.base/java.net=ALL-UNNAMED</argLine>
+							<argLine>${surefireArgLine}</argLine>
 						</configuration>
 					</plugin>
 				</plugins>

spring-cloud-openfeign-core/pom.xml

@@ -6,12 +6,9 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>2.2.11.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
-	<scm>
-		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
-	</scm>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Cloud OpenFeign Core</name>
@@ -24,6 +21,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-ribbon</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -64,16 +65,15 @@
 			<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>
@@ -89,6 +89,11 @@
 			<artifactId>spring-cloud-context</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-core</artifactId>
@@ -97,35 +102,25 @@
 		<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>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-slf4j</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-slf4j</artifactId>
+			<artifactId>feign-hc5</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-micrometer</artifactId>
+			<artifactId>feign-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-hc5</artifactId>
+			<artifactId>feign-hystrix</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -134,8 +129,38 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-java11</artifactId>
+			<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>
@@ -173,6 +198,16 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -187,13 +222,13 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.19.6</version>
+			<version>3.14.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.vavr</groupId>
 			<artifactId>vavr</artifactId>
-			<version>0.10.4</version>
+			<version>0.10.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -201,27 +236,6 @@
 			<artifactId>spring-cloud-loadbalancer</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.13.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-launcher</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-oauth2-client</artifactId>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/AnnotatedParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@ public interface AnnotatedParameterProcessor {
 	 * @param method the method that contains the annotation
 	 * @return whether the parameter is http
 	 */
-	boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method);
+	boolean processArgument(AnnotatedParameterContext context, Annotation annotation,
+			Method method);
 
 	/**
 	 * Specifies the parameter context.

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CachingCapability.java

@@ -1,42 +0,0 @@
-/*
- * 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);
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CollectionFormat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,9 @@ 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 })
+@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CollectionFormat {
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/DefaultFeignLoggerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,10 @@ import feign.slf4j.Slf4jLogger;
 
 /**
  * @author Venil Noronha
- * @author Olga Maciaszek-Sharma
  */
 public class DefaultFeignLoggerFactory implements FeignLoggerFactory {
 
-	private final Logger logger;
+	private Logger logger;
 
 	public DefaultFeignLoggerFactory(Logger logger) {
 		this.logger = logger;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/DefaultTargeter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import feign.Target;
 class DefaultTargeter implements Targeter {
 
 	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignClientFactory context,
-			Target.HardCodedTarget<T> target) {
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target) {
 		return feign.target(target);
 	}
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/EnableFeignClients.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FallbackFactory.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,56 +16,46 @@
 
 package org.springframework.cloud.openfeign;
 
-import java.lang.reflect.Method;
-import java.net.http.HttpClient;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.time.Duration;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
+import javax.annotation.PreDestroy;
 
 import com.fasterxml.jackson.databind.Module;
-import feign.Capability;
 import feign.Client;
 import feign.Feign;
-import feign.Target;
 import feign.hc5.ApacheHttp5Client;
-import feign.http2client.Http2Client;
+import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
-import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
-import okhttp3.Protocol;
 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.aot.hint.MemberCategory;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.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.openfeign.aot.FeignChildContextInitializer;
-import org.springframework.cloud.openfeign.aot.FeignClientBeanFactoryInitializationAotProcessor;
-import org.springframework.cloud.openfeign.security.OAuth2AccessTokenInterceptor;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
@@ -74,14 +64,8 @@ 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.context.support.GenericApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
-import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.util.ClassUtils;
 
 /**
  * @author Spencer Gibb
@@ -91,17 +75,12 @@ import org.springframework.util.ClassUtils;
  * @author Tim Peeters
  * @author Olga Maciaszek-Sharma
  * @author Nguyen Ky Thanh
- * @author Andrii Bohutskyi
- * @author Kwangyong Kim
- * @author Sam Kruglov
- * @author Wojciech Mąka
- * @author Dangzhicairang(小水牛)
- * @author changjin wei(魏昌进)
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Feign.class)
-@EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class,
-		FeignEncoderProperties.class })
+@EnableConfigurationProperties({ FeignClientProperties.class,
+		FeignHttpClientProperties.class, FeignEncoderProperties.class })
+@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {
 
 	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);
@@ -115,35 +94,16 @@ public class FeignAutoConfiguration {
 	}
 
 	@Bean
-	public FeignClientFactory feignContext() {
-		FeignClientFactory context = new FeignClientFactory();
+	public FeignContext feignContext() {
+		FeignContext context = new FeignContext();
 		context.setConfigurations(this.configurations);
 		return context;
 	}
 
-	@Bean
-	static FeignChildContextInitializer feignChildContextInitializer(GenericApplicationContext parentContext,
-			FeignClientFactory feignClientFactory) {
-		return new FeignChildContextInitializer(parentContext, feignClientFactory);
-	}
-
-	@Bean
-	static FeignClientBeanFactoryInitializationAotProcessor feignClientBeanFactoryInitializationCodeGenerator(
-			GenericApplicationContext applicationContext, FeignClientFactory feignClientFactory) {
-		return new FeignClientBeanFactoryInitializationAotProcessor(applicationContext, feignClientFactory);
-	}
-
-	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.cache.enabled", matchIfMissing = true)
-	@ConditionalOnBean(CacheInterceptor.class)
-	public Capability cachingCapability(CacheInterceptor cacheInterceptor) {
-		return new CachingCapability(cacheInterceptor);
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.autoconfiguration.jackson.enabled", havingValue = "true",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.autoconfiguration.jackson.enabled",
+			havingValue = "true")
 	protected static class FeignJacksonConfiguration {
 
 		@Bean
@@ -161,7 +121,7 @@ public class FeignAutoConfiguration {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Conditional(FeignCircuitBreakerDisabledConditions.class)
+	@Conditional(DefaultFeignTargeterConditions.class)
 	protected static class DefaultFeignTargeterConfiguration {
 
 		@Bean
@@ -173,124 +133,147 @@ public class FeignAutoConfiguration {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "true")
-	protected static class CircuitBreakerPresentFeignTargeterConfiguration {
+	@Conditional(FeignCircuitBreakerDisabledConditions.class)
+	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
+	@ConditionalOnProperty(value = "feign.hystrix.enabled", havingValue = "true",
+			matchIfMissing = true)
+	protected static class HystrixFeignTargeterConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(CircuitBreakerFactory.class)
-		public Targeter defaultFeignTargeter() {
-			return new DefaultTargeter();
+		@ConditionalOnMissingBean
+		public Targeter feignTargeter() {
+			return new HystrixTargeter();
 		}
 
-		@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();
-		}
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(CircuitBreaker.class)
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "true")
+	protected static class CircuitBreakerPresentFeignTargeterConfiguration {
 
-		@SuppressWarnings("rawtypes")
 		@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);
+		public Targeter circuitBreakerFeignTargeter(
+				CircuitBreakerFactory circuitBreakerFactory) {
+			return new FeignCircuitBreakerTargeter(circuitBreakerFactory);
 		}
 
-		static class DefaultCircuitBreakerNameResolver implements CircuitBreakerNameResolver {
+	}
 
-			@Override
-			public String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method) {
-				return Feign.configKey(target.type(), method);
-			}
+	// the following configuration is for alternate feign clients if
+	// ribbon is not on the class path.
+	// see corresponding configurations in FeignRibbonClientAutoConfiguration
+	// for load balanced ribbon clients.
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(ApacheHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
+	@ConditionalOnMissingBean(CloseableHttpClient.class)
+	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+	@Conditional(HttpClient5DisabledConditions.class)
+	protected static class HttpClientFeignConfiguration {
+
+		private final Timer connectionManagerTimer = new Timer(
+				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
+
+		@Autowired(required = false)
+		private RegistryBuilder registryBuilder;
 
+		private CloseableHttpClient httpClient;
+
+		@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;
 		}
 
-		static class AlphanumericCircuitBreakerNameResolver extends DefaultCircuitBreakerNameResolver {
+		@Bean
+		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
+				HttpClientConnectionManager httpClientConnectionManager,
+				FeignHttpClientProperties httpClientProperties) {
+			RequestConfig defaultRequestConfig = RequestConfig.custom()
+					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
+					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
+					.build();
+			this.httpClient = httpClientFactory.createBuilder()
+					.setConnectionManager(httpClientConnectionManager)
+					.setDefaultRequestConfig(defaultRequestConfig).build();
+			return this.httpClient;
+		}
 
-			@Override
-			public String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method) {
-				return super.resolveCircuitBreakerName(feignClientName, target, method).replaceAll("[^a-zA-Z0-9]", "");
-			}
+		@Bean
+		@ConditionalOnMissingBean(Client.class)
+		public Client feignClient(HttpClient httpClient) {
+			return new ApacheHttpClient(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.");
+					}
+				}
+			}
 		}
 
 	}
 
-	// the following configuration is for alternate feign clients if
-	// SC loadbalancer is not on the class path.
-	// see corresponding configurations in FeignLoadBalancerAutoConfiguration
-	// for load-balanced clients.
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.okhttp.enabled")
+	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {
 
 		private okhttp3.OkHttpClient okHttpClient;
 
-		@Bean
-		@ConditionalOnMissingBean
-		public okhttp3.OkHttpClient.Builder okHttpClientBuilder() {
-			return new okhttp3.OkHttpClient.Builder();
-		}
-
 		@Bean
 		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties) {
-			int maxTotalConnections = httpClientProperties.getMaxConnections();
-			long timeToLive = httpClientProperties.getTimeToLive();
+		public ConnectionPool httpClientConnectionPool(
+				FeignHttpClientProperties httpClientProperties,
+				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+			Long timeToLive = httpClientProperties.getTimeToLive();
 			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
-			return new ConnectionPool(maxTotalConnections, timeToLive, ttlUnit);
+			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 		}
 
 		@Bean
-		public okhttp3.OkHttpClient okHttpClient(okhttp3.OkHttpClient.Builder builder, ConnectionPool connectionPool,
+		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
+				ConnectionPool connectionPool,
 				FeignHttpClientProperties httpClientProperties) {
-			boolean followRedirects = httpClientProperties.isFollowRedirects();
-			int connectTimeout = httpClientProperties.getConnectionTimeout();
-			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
-			List<Protocol> protocols = httpClientProperties.getOkHttp().getProtocols().stream().map(Protocol::valueOf)
-					.collect(Collectors.toList());
-			if (disableSslValidation) {
-				disableSsl(builder);
-			}
-			this.okHttpClient = builder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-					.followRedirects(followRedirects).readTimeout(readTimeout).connectionPool(connectionPool)
-					.protocols(protocols).build();
+			Boolean followRedirects = httpClientProperties.isFollowRedirects();
+			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+			Boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
+			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
+					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+					.followRedirects(followRedirects).connectionPool(connectionPool)
+					.build();
 			return this.okHttpClient;
 		}
 
-		private void disableSsl(okhttp3.OkHttpClient.Builder builder) {
-			try {
-				X509TrustManager disabledTrustManager = new DisableValidationTrustManager();
-				TrustManager[] trustManagers = new TrustManager[1];
-				trustManagers[0] = disabledTrustManager;
-				SSLContext sslContext = SSLContext.getInstance("SSL");
-				sslContext.init(null, trustManagers, new java.security.SecureRandom());
-				SSLSocketFactory disabledSSLSocketFactory = sslContext.getSocketFactory();
-				builder.sslSocketFactory(disabledSSLSocketFactory, disabledTrustManager);
-				builder.hostnameVerifier(new TrustAllHostnames());
-			}
-			catch (NoSuchAlgorithmException | KeyManagementException e) {
-				LOG.warn("Error setting SSLSocketFactory in OKHttpClient", e);
-			}
-		}
-
 		@PreDestroy
 		public void destroy() {
 			if (this.okHttpClient != null) {
@@ -305,117 +288,41 @@ public class FeignAutoConfiguration {
 			return new OkHttpClient(client);
 		}
 
-		/**
-		 * A {@link X509TrustManager} that does not validate SSL certificates.
-		 */
-		class DisableValidationTrustManager implements X509TrustManager {
-
-			@Override
-			public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
-			}
-
-			@Override
-			public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
-			}
-
-			@Override
-			public X509Certificate[] getAcceptedIssuers() {
-				return new X509Certificate[0];
-			}
-
-		}
-
-		/**
-		 * A {@link HostnameVerifier} that does not validate any hostnames.
-		 */
-		class TrustAllHostnames implements HostnameVerifier {
-
-			@Override
-			public boolean verify(String s, SSLSession sslSession) {
-				return true;
-			}
-
-		}
-
 	}
 
-	// the following configuration is for alternate feign clients if
-	// SC loadbalancer is not on the class path.
-	// see corresponding configurations in FeignLoadBalancerAutoConfiguration
-	// for load-balanced clients.
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttp5Client.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(org.apache.hc.client5.http.impl.classic.CloseableHttpClient.class)
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
 	@Import(org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration.class)
 	protected static class HttpClient5FeignConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient(org.apache.hc.client5.http.impl.classic.CloseableHttpClient httpClient5) {
+		public Client feignClient(
+				org.apache.hc.client5.http.impl.classic.CloseableHttpClient httpClient5) {
 			return new ApacheHttp5Client(httpClient5);
 		}
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(OAuth2AuthorizedClientManager.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.oauth2.enabled")
-	protected static class Oauth2FeignConfiguration {
-
-		@Bean
-		@ConditionalOnBean({ OAuth2AuthorizedClientService.class, ClientRegistrationRepository.class })
-		@ConditionalOnMissingBean
-		OAuth2AuthorizedClientManager feignOAuth2AuthorizedClientManager(
-				ClientRegistrationRepository clientRegistrationRepository,
-				OAuth2AuthorizedClientService oAuth2AuthorizedClientService) {
-			return new AuthorizedClientServiceOAuth2AuthorizedClientManager(clientRegistrationRepository,
-					oAuth2AuthorizedClientService);
+	static class DefaultFeignTargeterConditions extends AllNestedConditions {
 
+		DefaultFeignTargeterConditions() {
+			super(ConfigurationPhase.PARSE_CONFIGURATION);
 		}
 
-		@Bean
-		@ConditionalOnBean(OAuth2AuthorizedClientManager.class)
-		public OAuth2AccessTokenInterceptor defaultOAuth2AccessTokenInterceptor(
-				@Value("${spring.cloud.openfeign.oauth2.clientRegistrationId:}") String clientRegistrationId,
-				OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager) {
-			return new OAuth2AccessTokenInterceptor(clientRegistrationId, oAuth2AuthorizedClientManager);
-		}
-
-	}
-
-	// the following configuration is for alternate feign clients if
-	// SC loadbalancer is not on the class path.
-	// see corresponding configurations in FeignLoadBalancerAutoConfiguration
-	// for load-balanced clients.
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass({ Http2Client.class, HttpClient.class })
-	@ConditionalOnMissingBean(HttpClient.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.http2client.enabled")
-	@Import(org.springframework.cloud.openfeign.clientconfig.Http2ClientFeignConfiguration.class)
-	protected static class Http2ClientFeignConfiguration {
+		@Conditional(FeignCircuitBreakerDisabledConditions.class)
+		static class FeignCircuitBreakerDisabled {
 
-		@Bean
-		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient(HttpClient httpClient) {
-			return new Http2Client(httpClient);
 		}
 
-	}
-
-}
+		@Conditional(HystrixDisabledConditions.class)
+		static class HystrixDisabled {
 
-class FeignHints implements RuntimeHintsRegistrar {
-
-	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		if (!ClassUtils.isPresent("feign.Feign", classLoader)) {
-			return;
 		}
-		hints.reflection().registerType(TypeReference.of(FeignClientFactoryBean.class),
-				hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
-						MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
+
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignBuilderCustomizer.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCachingInvocationHandlerFactory.java

@@ -1,82 +0,0 @@
-/*
- * 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;
-				}
-			});
-		};
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@ 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 {
@@ -52,10 +50,6 @@ public final class FeignCircuitBreaker {
 
 		private String feignClientName;
 
-		private boolean circuitBreakerGroupEnabled;
-
-		private CircuitBreakerNameResolver circuitBreakerNameResolver;
-
 		Builder circuitBreakerFactory(CircuitBreakerFactory circuitBreakerFactory) {
 			this.circuitBreakerFactory = circuitBreakerFactory;
 			return this;
@@ -66,21 +60,14 @@ public final class FeignCircuitBreaker {
 			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<>(fallback) : null).newInstance(target);
+			return build(
+					fallback != null ? new FallbackFactory.Default<T>(fallback) : null)
+							.newInstance(target);
 		}
 
-		public <T> T target(Target<T> target, FallbackFactory<? extends T> fallbackFactory) {
+		public <T> T target(Target<T> target,
+				FallbackFactory<? extends T> fallbackFactory) {
 			return build(fallbackFactory).newInstance(target);
 		}
 
@@ -90,9 +77,10 @@ public final class FeignCircuitBreaker {
 		}
 
 		public Feign build(final FallbackFactory<?> nullableFallbackFactory) {
-			super.invocationHandlerFactory((target, dispatch) -> new FeignCircuitBreakerInvocationHandler(
-					circuitBreakerFactory, feignClientName, target, dispatch, nullableFallbackFactory,
-					circuitBreakerGroupEnabled, circuitBreakerNameResolver));
+			super.invocationHandlerFactory(
+					(target, dispatch) -> new FeignCircuitBreakerInvocationHandler(
+							circuitBreakerFactory, target, dispatch,
+							nullableFallbackFactory));
 			return super.build();
 		}
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerDisabledConditions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class FeignCircuitBreakerDisabledConditions extends AnyNestedCondition {
 
 	}
 
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "false",
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "false",
 			matchIfMissing = true)
 	static class CircuitBreakerDisabled {
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 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;
@@ -25,31 +24,19 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import feign.Feign;
 import feign.InvocationHandlerFactory;
 import feign.Target;
 
 import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import 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;
 
-/**
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @author Niang
- * @author Bohutskyi
- * @author kim
- * @author Vicasong
- */
 class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 
 	private final CircuitBreakerFactory factory;
 
-	private final String feignClientName;
-
 	private final Target<?> target;
 
 	private final Map<Method, InvocationHandlerFactory.MethodHandler> dispatch;
@@ -58,30 +45,25 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 
 	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) {
+	FeignCircuitBreakerInvocationHandler(CircuitBreakerFactory factory, Target<?> target,
+			Map<Method, InvocationHandlerFactory.MethodHandler> dispatch,
+			FallbackFactory<?> nullableFallbackFactory) {
 		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) {
+	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;
+				Object otherHandler = args.length > 0 && args[0] != null
+						? Proxy.getInvocationHandler(args[0]) : null;
 				return equals(otherHandler);
 			}
 			catch (IllegalArgumentException e) {
@@ -94,10 +76,8 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 		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);
+		String circuitName = Feign.configKey(target.type(), method);
+		CircuitBreaker circuitBreaker = this.factory.create(circuitName);
 		Supplier<Object> supplier = asSupplier(method, args);
 		if (this.nullableFallbackFactory != null) {
 			Function<Throwable, Object> fallbackFunction = throwable -> {
@@ -105,39 +85,19 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 				try {
 					return this.fallbackMethodMap.get(method).invoke(fallback, args);
 				}
-				catch (Exception exception) {
-					unwrapAndRethrow(exception);
+				catch (Exception e) {
+					throw new IllegalStateException(e);
 				}
-				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();
-		final Thread caller = Thread.currentThread();
 		return () -> {
-			boolean isAsync = caller != Thread.currentThread();
 			try {
-				if (isAsync) {
-					RequestContextHolder.setRequestAttributes(requestAttributes);
-				}
-				return dispatch.get(method).invoke(args);
+				return this.dispatch.get(method).invoke(args);
 			}
 			catch (RuntimeException throwable) {
 				throw throwable;
@@ -145,25 +105,21 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 			catch (Throwable throwable) {
 				throw new RuntimeException(throwable);
 			}
-			finally {
-				if (isAsync) {
-					RequestContextHolder.resetRequestAttributes();
-				}
-			}
 		};
 	}
 
 	/**
-	 * If the method param of {@link InvocationHandler#invoke(Object, Method, Object[])}
-	 * 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.
+	 * 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<>();
+	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);
@@ -173,7 +129,8 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof FeignCircuitBreakerInvocationHandler other) {
+		if (obj instanceof FeignCircuitBreakerInvocationHandler) {
+			FeignCircuitBreakerInvocationHandler other = (FeignCircuitBreakerInvocationHandler) obj;
 			return this.target.equals(other.target);
 		}
 		return false;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,98 +19,79 @@ package org.springframework.cloud.openfeign;
 import feign.Feign;
 import feign.Target;
 
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.util.StringUtils;
 
-/**
- * @author 黄学敏（huangxuemin)
- */
 @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) {
+	FeignCircuitBreakerTargeter(CircuitBreakerFactory circuitBreakerFactory) {
 		this.circuitBreakerFactory = circuitBreakerFactory;
-		this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled;
-		this.circuitBreakerNameResolver = circuitBreakerNameResolver;
 	}
 
 	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignClientFactory context,
-			Target.HardCodedTarget<T> target) {
-		if (!(feign instanceof FeignCircuitBreaker.Builder builder)) {
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target) {
+		if (!(feign instanceof FeignCircuitBreaker.Builder)) {
 			return feign.target(target);
 		}
-		String name = !StringUtils.hasText(factory.getContextId()) ? factory.getName() : factory.getContextId();
+		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 targetWithFallbackFactory(name, context, target, builder,
+					fallbackFactory);
 		}
 		return builder(name, builder).target(target);
 	}
 
-	private <T> T targetWithFallbackFactory(String feignClientName, FeignClientFactory context,
-			Target.HardCodedTarget<T> target, FeignCircuitBreaker.Builder builder, Class<?> fallbackFactoryClass) {
-		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext("fallbackFactory",
-				feignClientName, context, fallbackFactoryClass, FallbackFactory.class);
+	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, FeignClientFactory context,
-			Target.HardCodedTarget<T> target, FeignCircuitBreaker.Builder builder, Class<?> fallback) {
-		T fallbackInstance = getFromContext("fallback", feignClientName, context, fallback, target.type());
+	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, FeignClientFactory context,
-			Class<?> beanType, Class<T> targetType) {
+	private <T> T getFromContext(String fallbackMechanism, String feignClientName,
+			FeignContext context, Class<?> beanType, Class<T> targetType) {
 		Object fallbackInstance = context.getInstance(feignClientName, beanType);
 		if (fallbackInstance == null) {
-			throw new IllegalStateException(
-					String.format("No " + fallbackMechanism + " instance of type %s found for feign client %s",
-							beanType, feignClientName));
+			throw new IllegalStateException(String.format(
+					"No " + fallbackMechanism
+							+ " instance of type %s found for feign client %s",
+					beanType, feignClientName));
 		}
 
-		if (fallbackInstance instanceof FactoryBean<?> factoryBean) {
-			try {
-				fallbackInstance = factoryBean.getObject();
-			}
-			catch (Exception e) {
-				throw new IllegalStateException(fallbackMechanism + " create fail", e);
-			}
-
-			if (!targetType.isAssignableFrom(fallbackInstance.getClass())) {
-				throw new IllegalStateException(String.format("Incompatible " + fallbackMechanism
-						+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
-						fallbackInstance.getClass(), targetType, feignClientName));
-			}
-
-		}
-		else {
-			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));
-			}
+		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);
+	private FeignCircuitBreaker.Builder builder(String feignClientName,
+			FeignCircuitBreaker.Builder builder) {
+		return builder.circuitBreakerFactory(this.circuitBreakerFactory)
+				.feignClientName(feignClientName);
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ import org.springframework.core.annotation.AliasFor;
 
 /**
  * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If SC LoadBalancer is available
- * it will be used to load balance the backend requests, and the load balancer can be
- * configured using the same name (i.e. value) as the feign client.
+ * created (e.g. for autowiring into another component). If ribbon is available it will be
+ * used to load balance the backend requests, and the load balancer can be configured
+ * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
  *
  * @author Spencer Gibb
  * @author Venil Noronha
@@ -50,6 +50,14 @@ public @interface FeignClient {
 	@AliasFor("name")
 	String value() default "";
 
+	/**
+	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
+	 * @deprecated use {@link #name() name} instead
+	 * @return the service id with optional protocol prefix
+	 */
+	@Deprecated
+	String serviceId() default "";
+
 	/**
 	 * This will be used as the bean name instead of name if present, but will not be used
 	 * as a service id.
@@ -64,8 +72,27 @@ public @interface FeignClient {
 	@AliasFor("value")
 	String name() default "";
 
+	/**
+	 * @return the <code>@Qualifier</code> value for the feign client.
+	 * @deprecated in favour of {@link #qualifiers()}.
+	 *
+	 * If both {@link #qualifier()} and {@link #qualifiers()} are present, we will use the
+	 * latter, unless the array returned by {@link #qualifiers()} is empty or only
+	 * contains <code>null</code> or whitespace values, in which case we'll fall back
+	 * first to {@link #qualifier()} and, if that's also not present, to the default =
+	 * <code>contextId + "FeignClient"</code>.
+	 */
+	@Deprecated
+	String qualifier() default "";
+
 	/**
 	 * @return the <code>@Qualifiers</code> value for the feign client.
+	 *
+	 * If both {@link #qualifier()} and {@link #qualifiers()} are present, we will use the
+	 * latter, unless the array returned by {@link #qualifiers()} is empty or only
+	 * contains <code>null</code> or whitespace values, in which case we'll fall back
+	 * first to {@link #qualifier()} and, if that's also not present, to the default =
+	 * <code>contextId + "FeignClient"</code>.
 	 */
 	String[] qualifiers() default {};
 
@@ -77,7 +104,7 @@ public @interface FeignClient {
 	/**
 	 * @return whether 404s should be decoded instead of throwing FeignExceptions
 	 */
-	boolean dismiss404() default false;
+	boolean decode404() default false;
 
 	/**
 	 * A custom configuration class for the feign client. Can contain override
@@ -101,13 +128,15 @@ public @interface FeignClient {
 	 * factory must produce instances of fallback classes that implement the interface
 	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring bean.
 	 *
+	 * @see feign.hystrix.FallbackFactory for details.
 	 * @see FallbackFactory for details.
 	 * @return fallback factory for the specified Feign client interface
 	 */
 	Class<?> fallbackFactory() default void.class;
 
 	/**
-	 * @return path prefix to be used by all method-level mappings.
+	 * @return path prefix to be used by all method-level mappings. Can be used with or
+	 * without <code>@RibbonClient</code>.
 	 */
 	String path() default "";
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.cloud.openfeign;
 
 import feign.Feign;
+import feign.hystrix.FallbackFactory;
 
 import org.springframework.context.ApplicationContext;
 
@@ -29,7 +30,6 @@ import org.springframework.context.ApplicationContext;
  * @author Sven Döring
  * @author Matt King
  * @author Sam Kruglov
- * @author Olga Maciaszek-Sharma
  */
 public class FeignClientBuilder {
 
@@ -43,11 +43,6 @@ public class FeignClientBuilder {
 		return new Builder<>(this.applicationContext, type, name);
 	}
 
-	public <T> Builder<T> forType(final Class<T> type, final FeignClientFactoryBean clientFactoryBean,
-			final String name) {
-		return new Builder<>(this.applicationContext, clientFactoryBean, type, name);
-	}
-
 	/**
 	 * Builder of feign targets.
 	 *
@@ -55,15 +50,11 @@ public class FeignClientBuilder {
 	 */
 	public static final class Builder<T> {
 
-		private final FeignClientFactoryBean feignClientFactoryBean;
-
-		private Builder(final ApplicationContext applicationContext, final Class<T> type, final String name) {
-			this(applicationContext, new FeignClientFactoryBean(), type, name);
-		}
+		private FeignClientFactoryBean feignClientFactoryBean;
 
-		private Builder(final ApplicationContext applicationContext, final FeignClientFactoryBean clientFactoryBean,
-				final Class<T> type, final String name) {
-			this.feignClientFactoryBean = clientFactoryBean;
+		private Builder(final ApplicationContext applicationContext, final Class<T> type,
+				final String name) {
+			this.feignClientFactoryBean = new FeignClientFactoryBean();
 
 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
@@ -72,7 +63,7 @@ public class FeignClientBuilder {
 			this.feignClientFactoryBean.setInheritParentContext(true);
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
-			this.url("").path("").dismiss404(false);
+			this.url("").path("").decode404(false);
 		}
 
 		public Builder<T> url(final String url) {
@@ -102,8 +93,8 @@ public class FeignClientBuilder {
 			return this;
 		}
 
-		public Builder<T> dismiss404(final boolean dismiss404) {
-			this.feignClientFactoryBean.setDismiss404(dismiss404);
+		public Builder<T> decode404(final boolean decode404) {
+			this.feignClientFactoryBean.setDecode404(decode404);
 			return this;
 		}
 
@@ -118,6 +109,13 @@ public class FeignClientBuilder {
 			return this;
 		}
 
+		public Builder<T> fallbackFactory(
+				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
+			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
+			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
+			return this;
+		}
+
 		/**
 		 * @return the created Feign client
 		 */

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,11 @@
 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 feign.Capability;
 import feign.Client;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
@@ -32,7 +30,6 @@ import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
-import feign.ResponseInterceptor;
 import feign.Retryer;
 import feign.Target.HardCodedTarget;
 import feign.codec.Decoder;
@@ -51,6 +48,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 import org.springframework.cloud.openfeign.loadbalancer.RetryableFeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -66,22 +64,17 @@ import org.springframework.util.StringUtils;
  * @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
- * @author Dominique Villard
  */
-public class FeignClientFactoryBean
-		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {
+public class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
+		ApplicationContextAware, BeanFactoryAware {
 
 	/***********************************
 	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
 	 * lifecycle race condition.
 	 ***********************************/
 
-	private static final Log LOG = LogFactory.getLog(FeignClientFactoryBean.class);
+	private static Log LOG = LogFactory.getLog(FeignClientFactoryBean.class);
 
 	private Class<?> type;
 
@@ -93,7 +86,7 @@ public class FeignClientFactoryBean
 
 	private String path;
 
-	private boolean dismiss404;
+	private boolean decode404;
 
 	private boolean inheritParentContext = true;
 
@@ -111,18 +104,7 @@ public class FeignClientFactoryBean
 
 	private boolean followRedirects = new Request.Options().isFollowRedirects();
 
-	private boolean refreshableClient = false;
-
-	private final List<FeignBuilderCustomizer> additionalCustomizers = new ArrayList<>();
-
-	private String[] qualifiers = new String[] {};
-
-	// For AOT testing
-	public FeignClientFactoryBean() {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("Creating a FeignClientFactoryBean.");
-		}
-	}
+	private List<FeignBuilderCustomizer> additionalCustomizers = new ArrayList<>();
 
 	@Override
 	public void afterPropertiesSet() {
@@ -130,7 +112,7 @@ public class FeignClientFactoryBean
 		Assert.hasText(name, "Name must be set");
 	}
 
-	protected Feign.Builder feign(FeignClientFactory context) {
+	protected Feign.Builder feign(FeignContext context) {
 		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
 		Logger logger = loggerFactory.create(type);
 
@@ -144,36 +126,45 @@ public class FeignClientFactoryBean
 		// @formatter:on
 
 		configureFeign(context, builder);
+		applyBuildCustomizers(context, builder);
 
 		return builder;
 	}
 
-	private void applyBuildCustomizers(FeignClientFactory context, Feign.Builder builder) {
-		Map<String, FeignBuilderCustomizer> customizerMap = context.getInstances(contextId,
-				FeignBuilderCustomizer.class);
+	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));
+			customizerMap.values().stream()
+					.sorted(AnnotationAwareOrderComparator.INSTANCE)
+					.forEach(feignBuilderCustomizer -> feignBuilderCustomizer
+							.customize(builder));
 		}
 		additionalCustomizers.forEach(customizer -> customizer.customize(builder));
 	}
 
-	protected void configureFeign(FeignClientFactory context, Feign.Builder builder) {
-		FeignClientProperties properties = beanFactory != null ? beanFactory.getBean(FeignClientProperties.class)
+	protected void configureFeign(FeignContext context, Feign.Builder builder) {
+		FeignClientProperties properties = beanFactory != null
+				? beanFactory.getBean(FeignClientProperties.class)
 				: applicationContext.getBean(FeignClientProperties.class);
 
-		FeignClientConfigurer feignClientConfigurer = getOptional(context, FeignClientConfigurer.class);
+		FeignClientConfigurer feignClientConfigurer = getOptional(context,
+				FeignClientConfigurer.class);
 		setInheritParentContext(feignClientConfigurer.inheritParentConfiguration());
 
 		if (properties != null && inheritParentContext) {
 			if (properties.isDefaultToProperties()) {
 				configureUsingConfiguration(context, builder);
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
+				configureUsingProperties(
+						properties.getConfig().get(properties.getDefaultConfig()),
+						builder);
 				configureUsingProperties(properties.getConfig().get(contextId), builder);
 			}
 			else {
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
+				configureUsingProperties(
+						properties.getConfig().get(properties.getDefaultConfig()),
+						builder);
 				configureUsingProperties(properties.getConfig().get(contextId), builder);
 				configureUsingConfiguration(context, builder);
 			}
@@ -183,7 +174,8 @@ public class FeignClientFactoryBean
 		}
 	}
 
-	protected void configureUsingConfiguration(FeignClientFactory context, Feign.Builder builder) {
+	protected void configureUsingConfiguration(FeignContext context,
+			Feign.Builder builder) {
 		Logger.Level level = getInheritedAwareOptional(context, Logger.Level.class);
 		if (level != null) {
 			builder.logLevel(level);
@@ -192,60 +184,52 @@ public class FeignClientFactoryBean
 		if (retryer != null) {
 			builder.retryer(retryer);
 		}
-		ErrorDecoder errorDecoder = getInheritedAwareOptional(context, ErrorDecoder.class);
+		ErrorDecoder errorDecoder = getInheritedAwareOptional(context,
+				ErrorDecoder.class);
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
 		else {
-			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context, FeignErrorDecoderFactory.class);
+			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
+					FeignErrorDecoderFactory.class);
 			if (errorDecoderFactory != null) {
 				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(type);
 				builder.errorDecoder(factoryErrorDecoder);
 			}
 		}
-		Request.Options options = getInheritedAwareOptional(context, Request.Options.class);
-		if (options == null) {
-			options = getOptionsByName(context, contextId);
-		}
-
+		Request.Options options = getInheritedAwareOptional(context,
+				Request.Options.class);
 		if (options != null) {
 			builder.options(options);
 			readTimeoutMillis = options.readTimeoutMillis();
 			connectTimeoutMillis = options.connectTimeoutMillis();
 			followRedirects = options.isFollowRedirects();
 		}
-		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(context,
-				RequestInterceptor.class);
+		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(
+				context, RequestInterceptor.class);
 		if (requestInterceptors != null) {
-			List<RequestInterceptor> interceptors = new ArrayList<>(requestInterceptors.values());
+			List<RequestInterceptor> interceptors = new ArrayList<>(
+					requestInterceptors.values());
 			AnnotationAwareOrderComparator.sort(interceptors);
 			builder.requestInterceptors(interceptors);
 		}
-		ResponseInterceptor responseInterceptor = getInheritedAwareOptional(context, ResponseInterceptor.class);
-		if (responseInterceptor != null) {
-			builder.responseInterceptor(responseInterceptor);
-		}
-		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context, QueryMapEncoder.class);
+		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context,
+				QueryMapEncoder.class);
 		if (queryMapEncoder != null) {
 			builder.queryMapEncoder(queryMapEncoder);
 		}
-		if (dismiss404) {
-			builder.dismiss404();
+		if (decode404) {
+			builder.decode404();
 		}
-		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(context,
-				ExceptionPropagationPolicy.class);
+		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,
+	protected void configureUsingProperties(
+			FeignClientProperties.FeignClientConfiguration config,
 			Feign.Builder builder) {
 		if (config == null) {
 			return;
@@ -255,15 +239,15 @@ public class FeignClientFactoryBean
 			builder.logLevel(config.getLoggerLevel());
 		}
 
-		if (!refreshableClient) {
-			connectTimeoutMillis = config.getConnectTimeout() != null ? config.getConnectTimeout()
-					: connectTimeoutMillis;
-			readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout() : readTimeoutMillis;
-			followRedirects = config.isFollowRedirects() != null ? config.isFollowRedirects() : followRedirects;
+		connectTimeoutMillis = config.getConnectTimeout() != null
+				? config.getConnectTimeout() : connectTimeoutMillis;
+		readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout()
+				: readTimeoutMillis;
+		followRedirects = config.isFollowRedirects() != null ? config.isFollowRedirects()
+				: followRedirects;
 
-			builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS, readTimeoutMillis,
-					TimeUnit.MILLISECONDS, followRedirects));
-		}
+		builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS,
+				readTimeoutMillis, TimeUnit.MILLISECONDS, followRedirects));
 
 		if (config.getRetryer() != null) {
 			Retryer retryer = getOrInstantiate(config.getRetryer());
@@ -275,7 +259,8 @@ public class FeignClientFactoryBean
 			builder.errorDecoder(errorDecoder);
 		}
 
-		if (config.getRequestInterceptors() != null && !config.getRequestInterceptors().isEmpty()) {
+		if (config.getRequestInterceptors() != null
+				&& !config.getRequestInterceptors().isEmpty()) {
 			// this will add request interceptor to builder, not replace existing
 			for (Class<RequestInterceptor> bean : config.getRequestInterceptors()) {
 				RequestInterceptor interceptor = getOrInstantiate(bean);
@@ -283,13 +268,9 @@ public class FeignClientFactoryBean
 			}
 		}
 
-		if (config.getResponseInterceptor() != null) {
-			builder.responseInterceptor(getOrInstantiate(config.getResponseInterceptor()));
-		}
-
-		if (config.getDismiss404() != null) {
-			if (config.getDismiss404()) {
-				builder.dismiss404();
+		if (config.getDecode404() != null) {
+			if (config.getDecode404()) {
+				builder.decode404();
 			}
 		}
 
@@ -297,8 +278,15 @@ public class FeignClientFactoryBean
 			builder.encoder(getOrInstantiate(config.getEncoder()));
 		}
 
-		addDefaultRequestHeaders(config, builder);
-		addDefaultQueryParams(config, builder);
+		if (Objects.nonNull(config.getDefaultRequestHeaders())) {
+			builder.requestInterceptor(requestTemplate -> requestTemplate
+					.headers(config.getDefaultRequestHeaders()));
+		}
+
+		if (Objects.nonNull(config.getDefaultQueryParameters())) {
+			builder.requestInterceptor(requestTemplate -> requestTemplate
+					.queries(config.getDefaultQueryParameters()));
+		}
 
 		if (Objects.nonNull(config.getDecoder())) {
 			builder.decoder(getOrInstantiate(config.getDecoder()));
@@ -311,67 +299,32 @@ public class FeignClientFactoryBean
 		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 beanFactory != null ? beanFactory.getBean(tClass) : applicationContext.getBean(tClass);
+			return beanFactory != null ? beanFactory.getBean(tClass)
+					: applicationContext.getBean(tClass);
 		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
 		}
 	}
 
-	protected <T> T get(FeignClientFactory context, Class<T> type) {
+	protected <T> T get(FeignContext context, Class<T> type) {
 		T instance = context.getInstance(contextId, type);
 		if (instance == null) {
-			throw new IllegalStateException("No bean found of type " + type + " for " + contextId);
+			throw new IllegalStateException(
+					"No bean found of type " + type + " for " + contextId);
 		}
 		return instance;
 	}
 
-	protected <T> T getOptional(FeignClientFactory context, Class<T> type) {
+	protected <T> T getOptional(FeignContext context, Class<T> type) {
 		return context.getInstance(contextId, type);
 	}
 
-	protected <T> T getInheritedAwareOptional(FeignClientFactory context, Class<T> type) {
+	protected <T> T getInheritedAwareOptional(FeignContext context, Class<T> type) {
 		if (inheritParentContext) {
 			return getOptional(context, type);
 		}
@@ -380,7 +333,8 @@ public class FeignClientFactoryBean
 		}
 	}
 
-	protected <T> Map<String, T> getInheritedAwareInstances(FeignClientFactory context, Class<T> type) {
+	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context,
+			Class<T> type) {
 		if (inheritParentContext) {
 			return context.getInstances(contextId, type);
 		}
@@ -389,31 +343,17 @@ public class FeignClientFactoryBean
 		}
 	}
 
-	protected <T> T loadBalance(Feign.Builder builder, FeignClientFactory context, HardCodedTarget<T> target) {
+	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
+			HardCodedTarget<T> target) {
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
 			builder.client(client);
-			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-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(FeignClientFactory context, String contextId) {
-		if (refreshableClient) {
-			return context.getInstance(contextId, Request.Options.class.getCanonicalName() + "-" + contextId,
-					Request.Options.class);
-		}
-		return null;
+				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon or spring-cloud-starter-loadbalancer?");
 	}
 
 	@Override
@@ -426,15 +366,17 @@ public class FeignClientFactoryBean
 	 * @return a {@link Feign} client created with the specified data and the context
 	 * information
 	 */
-	@SuppressWarnings("unchecked")
 	<T> T getTarget() {
-		FeignClientFactory feignClientFactory = beanFactory != null ? beanFactory.getBean(FeignClientFactory.class)
-				: applicationContext.getBean(FeignClientFactory.class);
-		Feign.Builder builder = feign(feignClientFactory);
-		if (!StringUtils.hasText(url) && !isUrlAvailableInConfig(contextId)) {
+		FeignContext context = beanFactory != null
+				? beanFactory.getBean(FeignContext.class)
+				: applicationContext.getBean(FeignContext.class);
+		Feign.Builder builder = feign(context);
+
+		if (!StringUtils.hasText(url)) {
 
 			if (LOG.isInfoEnabled()) {
-				LOG.info("For '" + name + "' URL not provided. Will try picking an instance via load-balancing.");
+				LOG.info("For '" + name
+						+ "' URL not provided. Will try picking an instance via load-balancing.");
 			}
 			if (!name.startsWith("http")) {
 				url = "http://" + name;
@@ -443,14 +385,20 @@ public class FeignClientFactoryBean
 				url = name;
 			}
 			url += cleanPath();
-			return (T) loadBalance(builder, feignClientFactory, new HardCodedTarget<>(type, name, url));
+			return (T) loadBalance(builder, context,
+					new HardCodedTarget<>(type, name, url));
 		}
 		if (StringUtils.hasText(url) && !url.startsWith("http")) {
 			url = "http://" + url;
 		}
 		String url = this.url + cleanPath();
-		Client client = getOptional(feignClientFactory, Client.class);
+		Client client = getOptional(context, Client.class);
 		if (client != null) {
+			if (client instanceof LoadBalancerFeignClient) {
+				// not load balancing because we have a url,
+				// but ribbon is on the classpath, so unwrap
+				client = ((LoadBalancerFeignClient) client).getDelegate();
+			}
 			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
@@ -459,21 +407,17 @@ public class FeignClientFactoryBean
 			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();
+				client = ((RetryableFeignBlockingLoadBalancerClient) client)
+						.getDelegate();
 			}
 			builder.client(client);
 		}
-
-		applyBuildCustomizers(feignClientFactory, builder);
-
-		Targeter targeter = get(feignClientFactory, Targeter.class);
-		return targeter.target(this, builder, feignClientFactory, resolveTarget(feignClientFactory, contextId, url));
+		Targeter targeter = get(context, Targeter.class);
+		return (T) targeter.target(this, builder, context,
+				new HardCodedTarget<>(type, name, url));
 	}
 
 	private String cleanPath() {
-		if (path == null) {
-			return "";
-		}
 		String path = this.path.trim();
 		if (StringUtils.hasLength(path)) {
 			if (!path.startsWith("/")) {
@@ -486,39 +430,6 @@ public class FeignClientFactoryBean
 		return path;
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private <T> HardCodedTarget<T> resolveTarget(FeignClientFactory context, String contextId, String url) {
-		if (StringUtils.hasText(url)) {
-			return new HardCodedTarget(type, name, url);
-		}
-
-		if (refreshableClient) {
-			RefreshableUrl refreshableUrl = context.getInstance(contextId,
-					RefreshableUrl.class.getCanonicalName() + "-" + contextId, RefreshableUrl.class);
-			if (Objects.nonNull(refreshableUrl) && StringUtils.hasText(refreshableUrl.getUrl())) {
-				return new RefreshableHardCodedTarget<>(type, name, refreshableUrl);
-			}
-		}
-		FeignClientProperties.FeignClientConfiguration config = findConfigByKey(contextId);
-		if (Objects.isNull(config) || !StringUtils.hasText(config.getUrl())) {
-			throw new IllegalStateException(
-					"Provide Feign client URL either in @FeignClient() or in config properties.");
-		}
-
-		return new PropertyBasedTarget(type, name, config);
-	}
-
-	private boolean isUrlAvailableInConfig(String contextId) {
-		FeignClientProperties.FeignClientConfiguration config = findConfigByKey(contextId);
-		return Objects.nonNull(config) && StringUtils.hasText(config.getUrl());
-	}
-
-	private FeignClientProperties.FeignClientConfiguration findConfigByKey(String configKey) {
-		FeignClientProperties properties = beanFactory != null ? beanFactory.getBean(FeignClientProperties.class)
-				: applicationContext.getBean(FeignClientProperties.class);
-		return properties.getConfig().get(configKey);
-	}
-
 	@Override
 	public Class<?> getObjectType() {
 		return type;
@@ -569,12 +480,12 @@ public class FeignClientFactoryBean
 		this.path = path;
 	}
 
-	public boolean isDismiss404() {
-		return dismiss404;
+	public boolean isDecode404() {
+		return decode404;
 	}
 
-	public void setDismiss404(boolean dismiss404) {
-		this.dismiss404 = dismiss404;
+	public void setDecode404(boolean decode404) {
+		this.decode404 = decode404;
 	}
 
 	public boolean isInheritParentContext() {
@@ -615,18 +526,6 @@ public class FeignClientFactoryBean
 		this.fallbackFactory = fallbackFactory;
 	}
 
-	public void setRefreshableClient(boolean refreshableClient) {
-		this.refreshableClient = refreshableClient;
-	}
-
-	public String[] getQualifiers() {
-		return qualifiers;
-	}
-
-	public void setQualifiers(String[] qualifiers) {
-		this.qualifiers = qualifiers;
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -637,34 +536,40 @@ public class FeignClientFactoryBean
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
 		return Objects.equals(applicationContext, that.applicationContext)
-				&& Objects.equals(beanFactory, that.beanFactory) && dismiss404 == that.dismiss404
-				&& inheritParentContext == that.inheritParentContext && Objects.equals(fallback, that.fallback)
-				&& Objects.equals(fallbackFactory, that.fallbackFactory) && Objects.equals(name, that.name)
-				&& Objects.equals(path, that.path) && Objects.equals(type, that.type) && Objects.equals(url, that.url)
+				&& Objects.equals(beanFactory, that.beanFactory)
+				&& decode404 == that.decode404
+				&& inheritParentContext == that.inheritParentContext
+				&& Objects.equals(fallback, that.fallback)
+				&& Objects.equals(fallbackFactory, that.fallbackFactory)
+				&& Objects.equals(name, that.name) && Objects.equals(path, that.path)
+				&& Objects.equals(type, that.type) && Objects.equals(url, that.url)
 				&& Objects.equals(connectTimeoutMillis, that.connectTimeoutMillis)
 				&& Objects.equals(readTimeoutMillis, that.readTimeoutMillis)
-				&& Objects.equals(followRedirects, that.followRedirects)
-				&& Objects.equals(refreshableClient, that.refreshableClient);
+				&& Objects.equals(followRedirects, that.followRedirects);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(applicationContext, beanFactory, dismiss404, inheritParentContext, fallback,
-				fallbackFactory, name, path, type, url, readTimeoutMillis, connectTimeoutMillis, followRedirects,
-				refreshableClient);
+		return Objects.hash(applicationContext, beanFactory, decode404,
+				inheritParentContext, fallback, fallbackFactory, name, path, type, url,
+				readTimeoutMillis, connectTimeoutMillis, followRedirects);
 	}
 
 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type).append(", ").append("name='")
-				.append(name).append("', ").append("url='").append(url).append("', ").append("path='").append(path)
-				.append("', ").append("dismiss404=").append(dismiss404).append(", ").append("inheritParentContext=")
-				.append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext)
-				.append(", ").append("beanFactory=").append(beanFactory).append(", ").append("fallback=")
-				.append(fallback).append(", ").append("fallbackFactory=").append(fallbackFactory).append("}")
-				.append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}").append("readTimeoutMillis=")
-				.append(readTimeoutMillis).append("}").append("followRedirects=").append(followRedirects)
-				.append("refreshableClient=").append(refreshableClient).append("}").toString();
+		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type)
+				.append(", ").append("name='").append(name).append("', ").append("url='")
+				.append(url).append("', ").append("path='").append(path).append("', ")
+				.append("decode404=").append(decode404).append(", ")
+				.append("inheritParentContext=").append(inheritParentContext).append(", ")
+				.append("applicationContext=").append(applicationContext).append(", ")
+				.append("beanFactory=").append(beanFactory).append(", ")
+				.append("fallback=").append(fallback).append(", ")
+				.append("fallbackFactory=").append(fallbackFactory).append("}")
+				.append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}")
+				.append("readTimeoutMillis=").append(readTimeoutMillis).append("}")
+				.append("followRedirects=").append(followRedirects).append("}")
+				.toString();
 	}
 
 	@Override

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientMicrometerEnabledCondition.java

@@ -1,52 +0,0 @@
-/*
- * 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 FeignClientMicrometerEnabledCondition 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.MicrometerProperties micrometer = feignClientConfig.getMicrometer();
-					if (micrometer != null && micrometer.getEnabled() != null) {
-						return micrometer.getEnabled();
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,10 @@ 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.ResponseInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
@@ -40,13 +37,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Eko Kurniawan Khannedy
  * @author Ilia Ilinykh
  * @author Ram Anaswara
- * @author Jonatan Ivanov
  * @author Olga Maciaszek-Sharma
- * @author Hyeonmin Park
- * @author Jasbir Singh
- * @author Dominique Villard
  */
-@ConfigurationProperties("spring.cloud.openfeign.client")
+@ConfigurationProperties("feign.client")
 public class FeignClientProperties {
 
 	private boolean defaultToProperties = true;
@@ -102,8 +95,10 @@ public class FeignClientProperties {
 			return false;
 		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties && Objects.equals(defaultConfig, that.defaultConfig)
-				&& Objects.equals(config, that.config) && Objects.equals(decodeSlash, that.decodeSlash);
+		return defaultToProperties == that.defaultToProperties
+				&& Objects.equals(defaultConfig, that.defaultConfig)
+				&& Objects.equals(config, that.config)
+				&& Objects.equals(decodeSlash, that.decodeSlash);
 	}
 
 	@Override
@@ -128,13 +123,11 @@ public class FeignClientProperties {
 
 		private List<Class<RequestInterceptor>> requestInterceptors;
 
-		private Class<ResponseInterceptor> responseInterceptor;
-
 		private Map<String, Collection<String>> defaultRequestHeaders;
 
 		private Map<String, Collection<String>> defaultQueryParameters;
 
-		private Boolean dismiss404;
+		private Boolean decode404;
 
 		private Class<Decoder> decoder;
 
@@ -144,20 +137,8 @@ public class FeignClientProperties {
 
 		private ExceptionPropagationPolicy exceptionPropagationPolicy;
 
-		private List<Class<Capability>> capabilities;
-
-		private Class<QueryMapEncoder> queryMapEncoder;
-
-		private MicrometerProperties micrometer;
-
 		private Boolean followRedirects;
 
-		/**
-		 * Allows setting Feign client host URL. This value will only be taken into
-		 * account if the url is not set in the @FeignClient annotation.
-		 */
-		private String url;
-
 		public Logger.Level getLoggerLevel() {
 			return loggerLevel;
 		}
@@ -202,23 +183,17 @@ public class FeignClientProperties {
 			return requestInterceptors;
 		}
 
-		public void setRequestInterceptors(List<Class<RequestInterceptor>> requestInterceptors) {
+		public void setRequestInterceptors(
+				List<Class<RequestInterceptor>> requestInterceptors) {
 			this.requestInterceptors = requestInterceptors;
 		}
 
-		public Class<ResponseInterceptor> getResponseInterceptor() {
-			return responseInterceptor;
-		}
-
-		public void setResponseInterceptor(Class<ResponseInterceptor> responseInterceptor) {
-			this.responseInterceptor = responseInterceptor;
-		}
-
 		public Map<String, Collection<String>> getDefaultRequestHeaders() {
 			return defaultRequestHeaders;
 		}
 
-		public void setDefaultRequestHeaders(Map<String, Collection<String>> defaultRequestHeaders) {
+		public void setDefaultRequestHeaders(
+				Map<String, Collection<String>> defaultRequestHeaders) {
 			this.defaultRequestHeaders = defaultRequestHeaders;
 		}
 
@@ -226,16 +201,17 @@ public class FeignClientProperties {
 			return defaultQueryParameters;
 		}
 
-		public void setDefaultQueryParameters(Map<String, Collection<String>> defaultQueryParameters) {
+		public void setDefaultQueryParameters(
+				Map<String, Collection<String>> defaultQueryParameters) {
 			this.defaultQueryParameters = defaultQueryParameters;
 		}
 
-		public Boolean getDismiss404() {
-			return dismiss404;
+		public Boolean getDecode404() {
+			return decode404;
 		}
 
-		public void setDismiss404(Boolean dismiss404) {
-			this.dismiss404 = dismiss404;
+		public void setDecode404(Boolean decode404) {
+			this.decode404 = decode404;
 		}
 
 		public Class<Decoder> getDecoder() {
@@ -266,34 +242,11 @@ public class FeignClientProperties {
 			return exceptionPropagationPolicy;
 		}
 
-		public void setExceptionPropagationPolicy(ExceptionPropagationPolicy 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 MicrometerProperties getMicrometer() {
-			return micrometer;
-		}
-
-		public void setMicrometer(MicrometerProperties micrometer) {
-			this.micrometer = micrometer;
-		}
-
 		public Boolean isFollowRedirects() {
 			return followRedirects;
 		}
@@ -302,14 +255,6 @@ public class FeignClientProperties {
 			this.followRedirects = followRedirects;
 		}
 
-		public String getUrl() {
-			return url;
-		}
-
-		public void setUrl(String url) {
-			this.url = url;
-		}
-
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -319,63 +264,29 @@ public class FeignClientProperties {
 				return false;
 			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel && Objects.equals(connectTimeout, that.connectTimeout)
-					&& Objects.equals(readTimeout, that.readTimeout) && Objects.equals(retryer, that.retryer)
+			return loggerLevel == that.loggerLevel
+					&& Objects.equals(connectTimeout, that.connectTimeout)
+					&& Objects.equals(readTimeout, that.readTimeout)
+					&& Objects.equals(retryer, that.retryer)
 					&& Objects.equals(errorDecoder, that.errorDecoder)
 					&& Objects.equals(requestInterceptors, that.requestInterceptors)
-					&& Objects.equals(responseInterceptor, that.responseInterceptor)
-					&& Objects.equals(dismiss404, that.dismiss404) && Objects.equals(encoder, that.encoder)
-					&& Objects.equals(decoder, that.decoder) && Objects.equals(contract, that.contract)
-					&& Objects.equals(exceptionPropagationPolicy, that.exceptionPropagationPolicy)
+					&& Objects.equals(decode404, that.decode404)
+					&& Objects.equals(encoder, that.encoder)
+					&& Objects.equals(decoder, that.decoder)
+					&& Objects.equals(contract, that.contract)
+					&& Objects.equals(exceptionPropagationPolicy,
+							that.exceptionPropagationPolicy)
 					&& Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders)
 					&& Objects.equals(defaultQueryParameters, that.defaultQueryParameters)
-					&& Objects.equals(capabilities, that.capabilities)
-					&& Objects.equals(queryMapEncoder, that.queryMapEncoder)
-					&& Objects.equals(micrometer, that.micrometer)
-					&& Objects.equals(followRedirects, that.followRedirects) && Objects.equals(url, that.url);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer, errorDecoder, requestInterceptors,
-					responseInterceptor, dismiss404, encoder, decoder, contract, exceptionPropagationPolicy,
-					defaultQueryParameters, defaultRequestHeaders, capabilities, queryMapEncoder, micrometer,
-					followRedirects, url);
-		}
-
-	}
-
-	/**
-	 * Micrometer configuration for Feign Client.
-	 */
-	public static class MicrometerProperties {
-
-		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;
-			}
-
-			MicrometerProperties that = (MicrometerProperties) o;
-			return Objects.equals(enabled, that.enabled);
+					&& Objects.equals(followRedirects, that.followRedirects);
 		}
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(enabled);
+			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer,
+					errorDecoder, requestInterceptors, decode404, encoder, decoder,
+					contract, exceptionPropagationPolicy, defaultQueryParameters,
+					defaultRequestHeaders, followRedirects);
 		}
 
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientSpecification.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,22 +24,18 @@ import org.springframework.cloud.context.named.NamedContextFactory;
 /**
  * @author Dave Syer
  * @author Gregor Zurowski
- * @author Olga Maciaszek-Sharma
  */
-public class FeignClientSpecification implements NamedContextFactory.Specification {
+class FeignClientSpecification implements NamedContextFactory.Specification {
 
 	private String name;
 
-	private String className;
-
 	private Class<?>[] configuration;
 
-	public FeignClientSpecification() {
+	FeignClientSpecification() {
 	}
 
-	public FeignClientSpecification(String name, String className, Class<?>[] configuration) {
+	FeignClientSpecification(String name, Class<?>[] configuration) {
 		this.name = name;
-		this.className = className;
 		this.configuration = configuration;
 	}
 
@@ -51,14 +47,6 @@ public class FeignClientSpecification implements NamedContextFactory.Specificati
 		this.name = name;
 	}
 
-	public String getClassName() {
-		return className;
-	}
-
-	public void setClassName(String className) {
-		this.className = className;
-	}
-
 	public Class<?>[] getConfiguration() {
 		return this.configuration;
 	}
@@ -72,24 +60,24 @@ public class FeignClientSpecification implements NamedContextFactory.Specificati
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof FeignClientSpecification that)) {
+		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-		return Objects.equals(name, that.name) && Objects.equals(className, that.className)
-				&& Arrays.equals(configuration, that.configuration);
+		FeignClientSpecification that = (FeignClientSpecification) o;
+		return Objects.equals(this.name, that.name)
+				&& Arrays.equals(this.configuration, that.configuration);
 	}
 
 	@Override
 	public int hashCode() {
-		int result = Objects.hash(name, className);
-		result = 31 * result + Arrays.hashCode(configuration);
-		return result;
+		return Objects.hash(this.name, this.configuration);
 	}
 
 	@Override
 	public String toString() {
-		return "FeignClientSpecification{" + "name='" + name + "', " + "className='" + className + "', "
-				+ "configuration=" + Arrays.toString(configuration) + "}";
+		return new StringBuilder("FeignClientSpecification{").append("name='")
+				.append(this.name).append("', ").append("configuration=")
+				.append(Arrays.toString(this.configuration)).append("}").toString();
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.netflix.hystrix.HystrixCommand;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
@@ -28,11 +29,8 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.form.MultipartFormContentProcessor;
 import feign.form.spring.SpringFormEncoder;
-import feign.micrometer.MicrometerCapability;
-import feign.micrometer.MicrometerObservationCapability;
+import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.observation.ObservationRegistry;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.ObjectProvider;
@@ -49,7 +47,6 @@ 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;
@@ -57,7 +54,6 @@ 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;
@@ -70,10 +66,8 @@ import static feign.form.ContentType.MULTIPART;
  * @author Dave Syer
  * @author Venil Noronha
  * @author Darren Foong
- * @author Jonatan Ivanov
  * @author Olga Maciaszek-Sharma
  * @author Hyeonmin Park
- * @author Yanming Zhou
  */
 @Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
@@ -101,30 +95,33 @@ public class FeignClientsConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Decoder feignDecoder(ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(messageConverters, customizers)));
+	public Decoder feignDecoder() {
+		return new OptionalDecoder(
+				new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
-	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return springEncoder(formWriterProvider, encoderProperties, customizers);
+	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		return springEncoder(formWriterProvider, encoderProperties);
 	}
 
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
-	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+	public Encoder feignEncoderPageable(
+			ObjectProvider<AbstractFormWriter> formWriterProvider) {
 		PageableSpringEncoder encoder = new PageableSpringEncoder(
-				springEncoder(formWriterProvider, encoderProperties, customizers));
+				springEncoder(formWriterProvider, encoderProperties));
 
 		if (springDataWebProperties != null) {
-			encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
-			encoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter());
-			encoder.setSortParameter(springDataWebProperties.getSort().getSortParameter());
+			encoder.setPageParameter(
+					springDataWebProperties.getPageable().getPageParameter());
+			encoder.setSizeParameter(
+					springDataWebProperties.getPageable().getSizeParameter());
+			encoder.setSortParameter(
+					springDataWebProperties.getSort().getSortParameter());
 		}
 		return encoder;
 	}
@@ -133,26 +130,22 @@ public class FeignClientsConfiguration {
 	@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;
+		return new PageableSpringQueryMapEncoder();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
-		boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash();
-		return new SpringMvcContract(parameterProcessors, feignConversionService, decodeSlash);
+		boolean decodeSlash = feignClientProperties == null
+				|| feignClientProperties.isDecodeSlash();
+		return new SpringMvcContract(this.parameterProcessors, feignConversionService,
+				decodeSlash);
 	}
 
 	@Bean
 	public FormattingConversionService feignConversionService() {
 		FormattingConversionService conversionService = new DefaultFormattingConversionService();
-		for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) {
+		for (FeignFormatterRegistrar feignFormatterRegistrar : this.feignFormatterRegistrars) {
 			feignFormatterRegistrar.registerFormatters(conversionService);
 		}
 		return conversionService;
@@ -164,10 +157,17 @@ public class FeignClientsConfiguration {
 		return Retryer.NEVER_RETRY;
 	}
 
+	@Bean
+	@Scope("prototype")
+	@ConditionalOnMissingBean
+	public Feign.Builder feignBuilder(Retryer retryer) {
+		return Feign.builder().retryer(retryer);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
-		return new DefaultFeignLoggerFactory(logger);
+		return new DefaultFeignLoggerFactory(this.logger);
 	}
 
 	@Bean
@@ -178,45 +178,48 @@ public class FeignClientsConfiguration {
 	}
 
 	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+			FeignEncoderProperties encoderProperties) {
 		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
 
 		if (formWriter != null) {
-			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties,
-					customizers);
+			return new SpringEncoder(new SpringPojoFormEncoder(formWriter),
+					this.messageConverters, encoderProperties);
 		}
 		else {
-			return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers);
+			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters,
+					encoderProperties);
 		}
 	}
 
-	private class SpringPojoFormEncoder extends SpringFormEncoder {
-
-		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
-			super();
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
+	protected static class HystrixFeignConfiguration {
 
-			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(MULTIPART);
-			processor.addFirstWriter(formWriter);
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean
+		@ConditionalOnProperty(name = "feign.hystrix.enabled")
+		public Feign.Builder feignHystrixBuilder() {
+			return HystrixFeign.builder();
 		}
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@Conditional(FeignCircuitBreakerDisabledConditions.class)
-	protected static class DefaultFeignBuilderConfiguration {
+	private class SpringPojoFormEncoder extends SpringFormEncoder {
 
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		public Feign.Builder feignBuilder(Retryer retryer) {
-			return Feign.builder().retryer(retryer);
+		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
+			super();
+
+			MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(
+					MULTIPART);
+			processor.addFirstWriter(formWriter);
 		}
 
 	}
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.circuitbreaker.enabled")
+	@ConditionalOnProperty("feign.circuitbreaker.enabled")
 	protected static class CircuitBreakerPresentFeignBuilderConfiguration {
 
 		@Bean
@@ -236,26 +239,4 @@ public class FeignClientsConfiguration {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(name = "spring.cloud.openfeign.micrometer.enabled", matchIfMissing = true)
-	@ConditionalOnClass({ MicrometerObservationCapability.class, MicrometerCapability.class, MeterRegistry.class })
-	@Conditional(FeignClientMicrometerEnabledCondition.class)
-	protected static class MicrometerConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean
-		@ConditionalOnBean(type = "io.micrometer.observation.ObservationRegistry")
-		public MicrometerObservationCapability micrometerObservationCapability(ObservationRegistry registry) {
-			return new MicrometerObservationCapability(registry);
-		}
-
-		@Bean
-		@ConditionalOnBean(type = "io.micrometer.core.instrument.MeterRegistry")
-		@ConditionalOnMissingBean({ MicrometerCapability.class, MicrometerObservationCapability.class })
-		public MicrometerCapability micrometerCapability(MeterRegistry registry) {
-			return new MicrometerCapability(registry);
-		}
-
-	}
-
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,7 @@ 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;
@@ -65,12 +63,12 @@ import org.springframework.util.StringUtils;
  * @author Michal Domagala
  * @author Marcin Grzejszczak
  * @author Olga Maciaszek-Sharma
- * @author Jasbir Singh
  */
-class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {
+class FeignClientsRegistrar
+		implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {
 
 	// patterned after Spring Integration IntegrationComponentScanRegistrar
-	// and RibbonClientsConfigurationRegistrar
+	// and RibbonClientsConfigurationRegistgrar
 
 	private ResourceLoader resourceLoader;
 
@@ -80,7 +78,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	}
 
 	static void validateFallback(final Class clazz) {
-		Assert.isTrue(!clazz.isInterface(), "Fallback class must implement the interface annotated by @FeignClient");
+		Assert.isTrue(!clazz.isInterface(),
+				"Fallback class must implement the interface annotated by @FeignClient");
 	}
 
 	static void validateFallbackFactory(final Class clazz) {
@@ -105,7 +104,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			host = new URI(url).getHost();
 
 		}
-		catch (URISyntaxException ignored) {
+		catch (URISyntaxException e) {
 		}
 		Assert.state(host != null, "Service id not legal hostname (" + name + ")");
 		return name;
@@ -145,13 +144,16 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	}
 
 	@Override
-	public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
+	public void registerBeanDefinitions(AnnotationMetadata metadata,
+			BeanDefinitionRegistry registry) {
 		registerDefaultConfiguration(metadata, registry);
 		registerFeignClients(metadata, registry);
 	}
 
-	private void registerDefaultConfiguration(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
-		Map<String, Object> defaultAttrs = metadata.getAnnotationAttributes(EnableFeignClients.class.getName(), true);
+	private void registerDefaultConfiguration(AnnotationMetadata metadata,
+			BeanDefinitionRegistry registry) {
+		Map<String, Object> defaultAttrs = metadata
+				.getAnnotationAttributes(EnableFeignClients.class.getName(), true);
 
 		if (defaultAttrs != null && defaultAttrs.containsKey("defaultConfiguration")) {
 			String name;
@@ -161,14 +163,19 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			else {
 				name = "default." + metadata.getClassName();
 			}
-			registerClientConfiguration(registry, name, "default", defaultAttrs.get("defaultConfiguration"));
+			registerClientConfiguration(registry, name,
+					defaultAttrs.get("defaultConfiguration"));
 		}
 	}
 
-	public void registerFeignClients(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
+	public void registerFeignClients(AnnotationMetadata metadata,
+			BeanDefinitionRegistry registry) {
+
 		LinkedHashSet<BeanDefinition> candidateComponents = new LinkedHashSet<>();
-		Map<String, Object> attrs = metadata.getAnnotationAttributes(EnableFeignClients.class.getName());
-		final Class<?>[] clients = attrs == null ? null : (Class<?>[]) attrs.get("clients");
+		Map<String, Object> attrs = metadata
+				.getAnnotationAttributes(EnableFeignClients.class.getName());
+		final Class<?>[] clients = attrs == null ? null
+				: (Class<?>[]) attrs.get("clients");
 		if (clients == null || clients.length == 0) {
 			ClassPathScanningCandidateComponentProvider scanner = getScanner();
 			scanner.setResourceLoader(this.resourceLoader);
@@ -185,82 +192,31 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		}
 
 		for (BeanDefinition candidateComponent : candidateComponents) {
-			if (candidateComponent instanceof AnnotatedBeanDefinition beanDefinition) {
+			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");
+				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);
-				String className = annotationMetadata.getClassName();
-				registerClientConfiguration(registry, name, className, attributes.get("configuration"));
+				registerClientConfiguration(registry, name,
+						attributes.get("configuration"));
 
 				registerFeignClient(registry, annotationMetadata, attributes);
 			}
 		}
 	}
 
-	private void registerFeignClient(BeanDefinitionRegistry registry, AnnotationMetadata annotationMetadata,
-			Map<String, Object> attributes) {
+	private void registerFeignClient(BeanDefinitionRegistry registry,
+			AnnotationMetadata annotationMetadata, Map<String, Object> attributes) {
 		String className = annotationMetadata.getClassName();
-		if (String.valueOf(false).equals(
-				environment.getProperty("spring.cloud.openfeign.lazy-attributes-resolution", String.valueOf(false)))) {
-			eagerlyRegisterFeignClientBeanDefinition(className, attributes, registry);
-		}
-		else {
-			lazilyRegisterFeignClientBeanDefinition(className, attributes, registry);
-		}
-	}
-
-	private void eagerlyRegisterFeignClientBeanDefinition(String className, Map<String, Object> attributes,
-			BeanDefinitionRegistry registry) {
-		validate(attributes);
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(FeignClientFactoryBean.class);
-		definition.addPropertyValue("url", getUrl(null, attributes));
-		definition.addPropertyValue("path", getPath(null, attributes));
-		String name = getName(attributes);
-		definition.addPropertyValue("name", name);
-		String contextId = getContextId(null, attributes);
-		definition.addPropertyValue("contextId", contextId);
-		definition.addPropertyValue("type", className);
-		definition.addPropertyValue("dismiss404", Boolean.parseBoolean(String.valueOf(attributes.get("dismiss404"))));
-		Object fallback = attributes.get("fallback");
-		if (fallback != null) {
-			definition.addPropertyValue("fallback",
-					(fallback instanceof Class ? fallback : ClassUtils.resolveClassName(fallback.toString(), null)));
-		}
-		Object fallbackFactory = attributes.get("fallbackFactory");
-		if (fallbackFactory != null) {
-			definition.addPropertyValue("fallbackFactory", fallbackFactory instanceof Class ? fallbackFactory
-					: ClassUtils.resolveClassName(fallbackFactory.toString(), null));
-		}
-		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
-		definition.addPropertyValue("refreshableClient", isClientRefreshEnabled());
-		String[] qualifiers = getQualifiers(attributes);
-		if (ObjectUtils.isEmpty(qualifiers)) {
-			qualifiers = new String[] { contextId + "FeignClient" };
-		}
-		// This is done so that there's a way to retrieve qualifiers while generating AOT
-		// code
-		definition.addPropertyValue("qualifiers", qualifiers);
-		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();
-		// has a default, won't be null
-		boolean primary = (Boolean) attributes.get("primary");
-		beanDefinition.setPrimary(primary);
-		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers);
-		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
-		registerRefreshableBeanDefinition(registry, contextId, Request.Options.class, OptionsFactoryBean.class);
-		registerRefreshableBeanDefinition(registry, contextId, RefreshableUrl.class, RefreshableUrlFactoryBean.class);
-	}
-
-	private void lazilyRegisterFeignClientBeanDefinition(String className, Map<String, Object> attributes,
-			BeanDefinitionRegistry registry) {
+		Class clazz = ClassUtils.resolveClassName(className, null);
 		ConfigurableBeanFactory beanFactory = registry instanceof ConfigurableBeanFactory
 				? (ConfigurableBeanFactory) registry : null;
-		Class clazz = ClassUtils.resolveClassName(className, null);
 		String contextId = getContextId(beanFactory, attributes);
 		String name = getName(attributes);
 		FeignClientFactoryBean factoryBean = new FeignClientFactoryBean();
@@ -268,28 +224,33 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		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.setDismiss404(Boolean.parseBoolean(String.valueOf(attributes.get("dismiss404"))));
-			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();
-		});
+		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
@@ -302,11 +263,9 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			qualifiers = new String[] { contextId + "FeignClient" };
 		}
 
-		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className, qualifiers);
+		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className,
+				qualifiers);
 		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
-
-		registerRefreshableBeanDefinition(registry, contextId, Request.Options.class, OptionsFactoryBean.class);
-		registerRefreshableBeanDefinition(registry, contextId, RefreshableUrl.class, RefreshableUrlFactoryBean.class);
 	}
 
 	private void validate(Map<String, Object> attributes) {
@@ -333,7 +292,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		return getName(name);
 	}
 
-	private String getContextId(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
+	private String getContextId(ConfigurableBeanFactory beanFactory,
+			Map<String, Object> attributes) {
 		String contextId = (String) attributes.get("contextId");
 		if (!StringUtils.hasText(contextId)) {
 			return getName(attributes);
@@ -353,21 +313,20 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			if (resolver == null) {
 				return resolved;
 			}
-			Object evaluateValue = resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null));
-			if (evaluateValue != null) {
-				return String.valueOf(evaluateValue);
-			}
-			return null;
+			return String.valueOf(resolver.evaluate(resolved,
+					new BeanExpressionContext(beanFactory, null)));
 		}
 		return value;
 	}
 
-	private String getUrl(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
+	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) {
+	private String getPath(ConfigurableBeanFactory beanFactory,
+			Map<String, Object> attributes) {
 		String path = resolve(beanFactory, (String) attributes.get("path"));
 		return getPath(path);
 	}
@@ -375,7 +334,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	protected ClassPathScanningCandidateComponentProvider getScanner() {
 		return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
 			@Override
-			protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
+			protected boolean isCandidateComponent(
+					AnnotatedBeanDefinition beanDefinition) {
 				boolean isCandidate = false;
 				if (beanDefinition.getMetadata().isIndependent()) {
 					if (!beanDefinition.getMetadata().isAnnotation()) {
@@ -407,7 +367,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		}
 
 		if (basePackages.isEmpty()) {
-			basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
+			basePackages.add(
+					ClassUtils.getPackageName(importingClassMetadata.getClassName()));
 		}
 		return basePackages;
 	}
@@ -427,7 +388,8 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		if (client == null) {
 			return null;
 		}
-		List<String> qualifierList = new ArrayList<>(Arrays.asList((String[]) client.get("qualifiers")));
+		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));
@@ -453,17 +415,18 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			return value;
 		}
 
-		throw new IllegalStateException(
-				"Either 'name' or 'value' must be provided in @" + FeignClient.class.getSimpleName());
+		throw new IllegalStateException("Either 'name' or 'value' must be provided in @"
+				+ FeignClient.class.getSimpleName());
 	}
 
-	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, Object className,
+	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name,
 			Object configuration) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FeignClientSpecification.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(FeignClientSpecification.class);
 		builder.addConstructorArgValue(name);
-		builder.addConstructorArgValue(className);
 		builder.addConstructorArgValue(configuration);
-		registry.registerBeanDefinition(name + "." + FeignClientSpecification.class.getSimpleName(),
+		registry.registerBeanDefinition(
+				name + "." + FeignClientSpecification.class.getSimpleName(),
 				builder.getBeanDefinition());
 	}
 
@@ -472,29 +435,4 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		this.environment = environment;
 	}
 
-	/**
-	 * This method registers beans definition with refreshScope.
-	 * @param registry spring bean definition registry
-	 * @param contextId name of feign client
-	 * @param beanType type of bean
-	 * @param factoryBeanType points to a relevant bean factory
-	 */
-	private void registerRefreshableBeanDefinition(BeanDefinitionRegistry registry, String contextId, Class<?> beanType,
-			Class<?> factoryBeanType) {
-		if (isClientRefreshEnabled()) {
-			String beanName = beanType.getCanonicalName() + "-" + contextId;
-			BeanDefinitionBuilder definitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(factoryBeanType);
-			definitionBuilder.setScope("refresh");
-			definitionBuilder.addPropertyValue("contextId", contextId);
-			BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(definitionBuilder.getBeanDefinition(),
-					beanName);
-			definitionHolder = ScopedProxyUtils.createScopedProxy(definitionHolder, registry, true);
-			BeanDefinitionReaderUtils.registerBeanDefinition(definitionHolder, registry);
-		}
-	}
-
-	private boolean isClientRefreshEnabled() {
-		return environment.getProperty("spring.cloud.openfeign.client.refresh-enabled", Boolean.class, false);
-	}
-
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,11 @@
 
 package org.springframework.cloud.openfeign;
 
-import java.util.HashMap;
 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.context.ApplicationContextInitializer;
-import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.lang.Nullable;
 
 /**
@@ -33,19 +30,11 @@ import org.springframework.lang.Nullable;
  * @author Spencer Gibb
  * @author Dave Syer
  * @author Matt King
- * @author Jasbir Singh
- * @author Olga Maciaszek-Sharma
  */
-public class FeignClientFactory extends NamedContextFactory<FeignClientSpecification> {
+public class FeignContext extends NamedContextFactory<FeignClientSpecification> {
 
-	public FeignClientFactory() {
-		this(new HashMap<>());
-	}
-
-	public FeignClientFactory(
-			Map<String, ApplicationContextInitializer<GenericApplicationContext>> applicationContextInitializers) {
-		super(FeignClientsConfiguration.class, "spring.cloud.openfeign", "spring.cloud.openfeign.client.name",
-				applicationContextInitializers);
+	public FeignContext() {
+		super(FeignClientsConfiguration.class, "feign", "feign.client.name");
 	}
 
 	@Nullable
@@ -63,18 +52,4 @@ public class FeignClientFactory extends NamedContextFactory<FeignClientSpecifica
 		return getContext(name).getBeansOfType(type);
 	}
 
-	public <T> T getInstance(String contextName, String beanName, Class<T> type) {
-		return getContext(contextName).getBean(beanName, type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public FeignClientFactory withApplicationContextInitializers(Map<String, Object> applicationContextInitializers) {
-		Map<String, ApplicationContextInitializer<GenericApplicationContext>> convertedInitializers = new HashMap<>();
-		applicationContextInitializers.keySet()
-				.forEach(contextId -> convertedInitializers.put(contextId,
-						(ApplicationContextInitializer<GenericApplicationContext>) applicationContextInitializers
-								.get(contextId)));
-		return new FeignClientFactory(convertedInitializers);
-	}
-
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignErrorDecoderFactory.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignFormatterRegistrar.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignLoggerFactory.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/HttpClient5DisabledConditions.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * @author Nguyen Ky Thanh
+ */
+public class HttpClient5DisabledConditions extends AnyNestedCondition {
+
+	public HttpClient5DisabledConditions() {
+		super(ConfigurationPhase.PARSE_CONFIGURATION);
+	}
+
+	@ConditionalOnMissingClass("feign.hc5.ApacheHttp5Client")
+	static class ApacheHttp5ClientClassMissing {
+
+	}
+
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "false",
+			matchIfMissing = true)
+	static class HttpClient5Disabled {
+
+	}
+
+}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/HystrixDisabledConditions.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * @author Tim Peeters
+ */
+class HystrixDisabledConditions extends AnyNestedCondition {
+
+	HystrixDisabledConditions() {
+		super(ConfigurationPhase.PARSE_CONFIGURATION);
+	}
+
+	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
+	static class HystrixFeignClassMissing {
+
+	}
+
+	@ConditionalOnProperty(value = "feign.hystrix.enabled", havingValue = "false")
+	static class HystrixFeignDisabled {
+
+	}
+
+}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/HystrixTargeter.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import feign.Feign;
+import feign.Target;
+import feign.hystrix.FallbackFactory;
+import feign.hystrix.HystrixFeign;
+import feign.hystrix.SetterFactory;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Spencer Gibb
+ * @author Erik Kringen
+ */
+@SuppressWarnings("unchecked")
+class HystrixTargeter implements Targeter {
+
+	@Override
+	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target) {
+		if (!(feign instanceof feign.hystrix.HystrixFeign.Builder)) {
+			return feign.target(target);
+		}
+		feign.hystrix.HystrixFeign.Builder builder = (feign.hystrix.HystrixFeign.Builder) feign;
+		String name = StringUtils.isEmpty(factory.getContextId()) ? factory.getName()
+				: factory.getContextId();
+		SetterFactory setterFactory = getOptional(name, context, SetterFactory.class);
+		if (setterFactory != null) {
+			builder.setterFactory(setterFactory);
+		}
+		Class<?> fallback = factory.getFallback();
+		if (fallback != void.class) {
+			return targetWithFallback(name, context, target, builder, fallback);
+		}
+		Class<?> fallbackFactory = factory.getFallbackFactory();
+		if (fallbackFactory != void.class) {
+			return targetWithFallbackFactory(name, context, target, builder,
+					fallbackFactory);
+		}
+
+		return feign.target(target);
+	}
+
+	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
+			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
+			Class<?> fallbackFactoryClass) {
+		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext(
+				"fallbackFactory", feignClientName, context, fallbackFactoryClass,
+				FallbackFactory.class);
+		return builder.target(target, fallbackFactory);
+	}
+
+	private <T> T targetWithFallback(String feignClientName, FeignContext context,
+			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
+			Class<?> fallback) {
+		T fallbackInstance = getFromContext("fallback", feignClientName, context,
+				fallback, target.type());
+		return builder.target(target, fallbackInstance);
+	}
+
+	private <T> T getFromContext(String fallbackMechanism, String feignClientName,
+			FeignContext context, Class<?> beanType, Class<T> targetType) {
+		Object fallbackInstance = context.getInstance(feignClientName, beanType);
+		if (fallbackInstance == null) {
+			throw new IllegalStateException(String.format(
+					"No " + fallbackMechanism
+							+ " instance of type %s found for feign client %s",
+					beanType, feignClientName));
+		}
+
+		if (!targetType.isAssignableFrom(beanType)) {
+			throw new IllegalStateException(String.format("Incompatible "
+					+ fallbackMechanism
+					+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
+					beanType, targetType, feignClientName));
+		}
+		return (T) fallbackInstance;
+	}
+
+	private <T> T getOptional(String feignClientName, FeignContext context,
+			Class<T> beanType) {
+		return context.getInstance(feignClientName, beanType);
+	}
+
+}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/OptionsFactoryBean.java

@@ -1,86 +0,0 @@
-/*
- * 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() {
-		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);
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2023 the original author 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.Target;
-
-/**
- * A {@link HardCodedTarget} implementation that resolves url from properties when the
- * initial call is made. Using it allows specifying the url at runtime in an AOT-packaged
- * application or a native image by setting the value of the
- * `spring.cloud.openfeign.client.config.[clientId].url`.
- *
- * @author Olga Maciaszek-Sharma
- * @see FeignClientProperties.FeignClientConfiguration#getUrl()
- */
-public class PropertyBasedTarget<T> extends Target.HardCodedTarget<T> {
-
-	private String url;
-
-	private final FeignClientProperties.FeignClientConfiguration config;
-
-	public PropertyBasedTarget(Class<T> type, String name, FeignClientProperties.FeignClientConfiguration config) {
-		super(type, name, config.getUrl());
-		this.config = config;
-	}
-
-	@Override
-	public String url() {
-		if (url == null) {
-			url = config.getUrl();
-		}
-		return url;
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/RefreshableHardCodedTarget.java

@@ -1,42 +0,0 @@
-/*
- * 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.Target;
-
-/**
- * This target provides url wrapped under {@link Target}.
- *
- * @author Jasbir Singh
- * @since 4.0.0
- */
-public class RefreshableHardCodedTarget<T> extends Target.HardCodedTarget<T> {
-
-	private final RefreshableUrl refreshableUrl;
-
-	@SuppressWarnings("unchecked")
-	public RefreshableHardCodedTarget(Class type, String name, RefreshableUrl refreshableUrl) {
-		super(type, name, refreshableUrl.getUrl());
-		this.refreshableUrl = refreshableUrl;
-	}
-
-	@Override
-	public String url() {
-		return refreshableUrl.getUrl();
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/RefreshableUrlFactoryBean.java

@@ -1,75 +0,0 @@
-/*
- * 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 org.springframework.beans.BeansException;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.StringUtils;
-
-/**
- * This factory bean creates {@link RefreshableUrl} instance as per the applicable
- * configurations.
- *
- * @author Jasbir Singh
- * @since 4.0.0
- */
-public class RefreshableUrlFactoryBean implements FactoryBean<RefreshableUrl>, ApplicationContextAware {
-
-	private ApplicationContext applicationContext;
-
-	private String contextId;
-
-	private RefreshableUrl refreshableUrl;
-
-	@Override
-	public Class<?> getObjectType() {
-		return RefreshableUrl.class;
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-	}
-
-	@Override
-	public RefreshableUrl getObject() {
-		if (refreshableUrl != null) {
-			return refreshableUrl;
-		}
-
-		FeignClientProperties properties = applicationContext.getBean(FeignClientProperties.class);
-		if (Objects.isNull(properties.getConfig())) {
-			return new RefreshableUrl(null);
-		}
-		FeignClientProperties.FeignClientConfiguration configuration = properties.getConfig().get(contextId);
-		if (Objects.isNull(configuration) || !StringUtils.hasText(configuration.getUrl())) {
-			return new RefreshableUrl(null);
-		}
-
-		refreshableUrl = new RefreshableUrl(FeignClientsRegistrar.getUrl(configuration.getUrl()));
-		return refreshableUrl;
-	}
-
-	public void setContextId(String contextId) {
-		this.contextId = contextId;
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/SpringQueryMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,10 @@ 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.
  *
@@ -32,4 +36,18 @@ import java.lang.annotation.Target;
 @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;
+
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/Targeter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import feign.Target;
 /**
  * @author Spencer Gibb
  */
-public interface Targeter {
+interface Targeter {
 
-	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignClientFactory context,
-			Target.HardCodedTarget<T> target);
+	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
+			FeignContext context, Target.HardCodedTarget<T> target);
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java

@@ -1,69 +0,0 @@
-/*
- * 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.Collections;
-
-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
- * @author Olga Maciaszek-Sharma
- *
- */
-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, Collections.singletonList("")).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;
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,13 +48,15 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();
 		String name = ANNOTATION.cast(annotation).value();
 
-		checkState(emptyToNull(name) != null, "MatrixVariable annotation was empty on param %s.",
+		checkState(emptyToNull(name) != null,
+				"MatrixVariable annotation was empty on param %s.",
 				context.getParameterIndex());
 
 		context.setParameterName(name);
@@ -63,18 +65,19 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 			data.indexToExpander().put(parameterIndex, this::expandMap);
 		}
 		else {
-			data.indexToExpander().put(parameterIndex, object -> ";" + name + "=" + object.toString());
+			data.indexToExpander().put(parameterIndex,
+					object -> ";" + name + "=" + object.toString());
 		}
 
 		return true;
 	}
 
-	@SuppressWarnings("unchecked")
 	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());
+				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
+				.collect(Collectors.joining());
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/PathVariableParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import static feign.Util.emptyToNull;
  *
  * @author Jakub Narloch
  * @author Abhijit Sarkar
- * @author Yanming Zhou
  * @see AnnotatedParameterProcessor
  */
 public class PathVariableParameterProcessor implements AnnotatedParameterProcessor {
@@ -47,23 +46,25 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null, "PathVariable annotation was empty on param %s.",
+		checkState(emptyToNull(name) != null,
+				"PathVariable annotation was empty on param %s.",
 				context.getParameterIndex());
 		context.setParameterName(name);
 
 		MethodMetadata data = context.getMethodMetadata();
 		String varName = '{' + name + '}';
-		String varNameRegex = ".*\\{" + name + "(:[^}]+)?\\}.*";
-		if (!data.template().url().matches(varNameRegex) && !containsMapValues(data.template().queries(), varName)
-				&& !containsMapValues(data.template().headers(), varName)) {
+		if (!data.template().url().contains(varName)
+				&& !searchMapValues(data.template().queries(), varName)
+				&& !searchMapValues(data.template().headers(), varName)) {
 			data.formParams().add(name);
 		}
 		return true;
 	}
 
-	private <K, V> boolean containsMapValues(Map<K, Collection<V>> map, V search) {
+	private <K, V> boolean searchMapValues(Map<K, Collection<V>> map, V search) {
 		Collection<Collection<V>> values = map.values();
 		if (values == null) {
 			return false;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/QueryMapParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
  * {@link SpringQueryMap} parameter processor.
  *
  * @author Aram Peres
- * @author Olga Maciaszek-Sharma
  * @see AnnotatedParameterProcessor
  */
 public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
@@ -41,11 +40,13 @@ public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int paramIndex = context.getParameterIndex();
 		MethodMetadata metadata = context.getMethodMetadata();
 		if (metadata.queryMapIndex() == null) {
 			metadata.queryMapIndex(paramIndex);
+			metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
 		}
 		return true;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/RequestHeaderParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,23 +46,27 @@ public class RequestHeaderParameterProcessor implements AnnotatedParameterProces
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();
 
 		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.headerMapIndex() == null, "Header map can only be present once.");
+			checkState(data.headerMapIndex() == null,
+					"Header map can only be present once.");
 			data.headerMapIndex(parameterIndex);
 
 			return true;
 		}
 
 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null, "RequestHeader.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null,
+				"RequestHeader.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 
-		Collection<String> header = context.setTemplateParameter(name, data.template().headers().get(name));
+		Collection<String> header = context.setTemplateParameter(name,
+				data.template().headers().get(name));
 		data.template().header(name, header);
 		return true;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/RequestParamParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,13 +46,15 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
 		MethodMetadata data = context.getMethodMetadata();
 
 		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.queryMapIndex() == null, "Query map can only be present once.");
+			checkState(data.queryMapIndex() == null,
+					"Query map can only be present once.");
 			data.queryMapIndex(parameterIndex);
 
 			return true;
@@ -60,10 +62,12 @@ public class RequestParamParameterProcessor implements AnnotatedParameterProcess
 
 		RequestParam requestParam = ANNOTATION.cast(annotation);
 		String name = requestParam.value();
-		checkState(emptyToNull(name) != null, "RequestParam.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null,
+				"RequestParam.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 
-		Collection<String> query = context.setTemplateParameter(name, data.template().queries().get(name));
+		Collection<String> query = context.setTemplateParameter(name,
+				data.template().queries().get(name));
 		data.template().query(name, query);
 		return true;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/RequestPartParameterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,16 +44,19 @@ public class RequestPartParameterProcessor implements AnnotatedParameterProcesso
 	}
 
 	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
 		int parameterIndex = context.getParameterIndex();
 		MethodMetadata data = context.getMethodMetadata();
 
 		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null, "RequestPart.value() was empty on parameter %s", parameterIndex);
+		checkState(emptyToNull(name) != null,
+				"RequestPart.value() was empty on parameter %s", parameterIndex);
 		context.setParameterName(name);
 
 		data.formParams().add(name);
-		Collection<String> names = context.setTemplateParameter(name, data.indexToName().get(parameterIndex));
+		Collection<String> names = context.setTemplateParameter(name,
+				data.indexToName().get(parameterIndex));
 		data.indexToName().put(parameterIndex, names);
 		return true;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/aot/FeignChildContextInitializer.java

@@ -1,126 +0,0 @@
-/*
- * Copyright 2022-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.aot;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.lang.model.element.Modifier;
-
-import org.springframework.aot.generate.GeneratedMethod;
-import org.springframework.aot.generate.GenerationContext;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
-import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
-import org.springframework.beans.factory.aot.BeanRegistrationCode;
-import org.springframework.beans.factory.support.RegisteredBean;
-import org.springframework.cloud.openfeign.FeignClientFactory;
-import org.springframework.cloud.openfeign.FeignClientSpecification;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.aot.ApplicationContextAotGenerator;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.javapoet.ClassName;
-import org.springframework.util.Assert;
-
-/**
- * A {@link BeanRegistrationAotProcessor} that creates an
- * {@link BeanRegistrationAotContribution} for Feign child contexts.
- *
- * @author Olga Maciaszek-Sharma
- * @since 4.0.0
- */
-public class FeignChildContextInitializer implements BeanRegistrationAotProcessor {
-
-	private final ApplicationContext applicationContext;
-
-	private final FeignClientFactory feignClientFactory;
-
-	public FeignChildContextInitializer(ApplicationContext applicationContext, FeignClientFactory feignClientFactory) {
-		this.applicationContext = applicationContext;
-		this.feignClientFactory = feignClientFactory;
-	}
-
-	@Override
-	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
-		Assert.isInstanceOf(ConfigurableApplicationContext.class, applicationContext);
-		ConfigurableApplicationContext context = ((ConfigurableApplicationContext) applicationContext);
-		BeanFactory applicationBeanFactory = context.getBeanFactory();
-		if (!((registeredBean.getBeanClass().equals(FeignClientFactory.class))
-				&& registeredBean.getBeanFactory().equals(applicationBeanFactory))) {
-			return null;
-		}
-		Set<String> contextIds = new HashSet<>(getContextIdsFromConfig());
-		Map<String, GenericApplicationContext> childContextAotContributions = contextIds.stream()
-				.map(contextId -> Map.entry(contextId, buildChildContext(contextId)))
-				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-		return new AotContribution(childContextAotContributions);
-	}
-
-	private GenericApplicationContext buildChildContext(String contextId) {
-		GenericApplicationContext childContext = feignClientFactory.buildContext(contextId);
-		feignClientFactory.registerBeans(contextId, childContext);
-		return childContext;
-	}
-
-	private Collection<String> getContextIdsFromConfig() {
-		Map<String, FeignClientSpecification> configurations = feignClientFactory.getConfigurations();
-		return configurations.keySet().stream().filter(key -> !key.startsWith("default.")).collect(Collectors.toSet());
-	}
-
-	private static class AotContribution implements BeanRegistrationAotContribution {
-
-		private final Map<String, GenericApplicationContext> childContexts;
-
-		AotContribution(Map<String, GenericApplicationContext> childContexts) {
-			this.childContexts = childContexts.entrySet().stream().filter(entry -> entry.getValue() != null)
-					.map(entry -> Map.entry(entry.getKey(), entry.getValue()))
-					.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-		}
-
-		@Override
-		public void applyTo(GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode) {
-			Map<String, ClassName> generatedInitializerClassNames = childContexts.entrySet().stream().map(entry -> {
-				String name = entry.getValue().getDisplayName();
-				name = name.replaceAll("[-]", "_");
-				GenerationContext childGenerationContext = generationContext.withName(name);
-				ClassName initializerClassName = new ApplicationContextAotGenerator()
-						.processAheadOfTime(entry.getValue(), childGenerationContext);
-				return Map.entry(entry.getKey(), initializerClassName);
-			}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-			GeneratedMethod postProcessorMethod = beanRegistrationCode.getMethods()
-					.add("addFeignChildContextInitializer", method -> {
-						method.addJavadoc("Use AOT child context management initialization")
-								.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-								.addParameter(RegisteredBean.class, "registeredBean")
-								.addParameter(FeignClientFactory.class, "instance").returns(FeignClientFactory.class)
-								.addStatement("$T<String, Object> initializers = new $T<>()", Map.class, HashMap.class);
-						generatedInitializerClassNames.keySet()
-								.forEach(contextId -> method.addStatement("initializers.put($S, new $L())", contextId,
-										generatedInitializerClassNames.get(contextId)));
-						method.addStatement("return instance.withApplicationContextInitializers(initializers)");
-					});
-			beanRegistrationCode.addInstancePostProcessor(postProcessorMethod.toMethodReference());
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/aot/FeignClientBeanFactoryInitializationAotProcessor.java

@@ -1,215 +0,0 @@
-/*
- * Copyright 2022-2023 the original author 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.aot;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.lang.model.element.Modifier;
-
-import org.springframework.aot.generate.GenerationContext;
-import org.springframework.aot.generate.MethodReference;
-import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
-import org.springframework.aot.hint.ReflectionHints;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
-import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
-import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
-import org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.beans.factory.support.RegisteredBean;
-import org.springframework.cloud.openfeign.FeignClientFactory;
-import org.springframework.cloud.openfeign.FeignClientFactoryBean;
-import org.springframework.cloud.openfeign.FeignClientSpecification;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.MethodParameter;
-import org.springframework.javapoet.MethodSpec;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * A {@link BeanFactoryInitializationAotProcessor} that creates an
- * {@link BeanFactoryInitializationAotContribution} that registers bean definitions and
- * proxy and reflection hints for Feign client beans.
- *
- * @author Olga Maciaszek-Sharma
- * @since 4.0.0
- */
-public class FeignClientBeanFactoryInitializationAotProcessor
-		implements BeanRegistrationExcludeFilter, BeanFactoryInitializationAotProcessor {
-
-	private final GenericApplicationContext context;
-
-	private final Map<String, BeanDefinition> feignClientBeanDefinitions;
-
-	private final BindingReflectionHintsRegistrar bindingRegistrar = new BindingReflectionHintsRegistrar();
-
-	public FeignClientBeanFactoryInitializationAotProcessor(GenericApplicationContext context,
-			FeignClientFactory feignClientFactory) {
-		this.context = context;
-		this.feignClientBeanDefinitions = getFeignClientBeanDefinitions(feignClientFactory);
-	}
-
-	@Override
-	public boolean isExcludedFromAotProcessing(RegisteredBean registeredBean) {
-		return registeredBean.getBeanClass().equals(FeignClientFactoryBean.class)
-				|| feignClientBeanDefinitions.containsKey(registeredBean.getBeanClass().getName());
-	}
-
-	private Map<String, BeanDefinition> getFeignClientBeanDefinitions(FeignClientFactory feignClientFactory) {
-		Map<String, FeignClientSpecification> configurations = feignClientFactory.getConfigurations();
-		return configurations.values().stream().map(FeignClientSpecification::getClassName).filter(Objects::nonNull)
-				.filter(className -> !className.equals("default"))
-				.map(className -> Map.entry(className, context.getBeanDefinition(className)))
-				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-	}
-
-	@SuppressWarnings("NullableProblems")
-	@Override
-	public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
-		BeanFactory applicationBeanFactory = context.getBeanFactory();
-		if (feignClientBeanDefinitions.isEmpty() || !beanFactory.equals(applicationBeanFactory)) {
-			return null;
-		}
-		return new AotContribution(feignClientBeanDefinitions);
-	}
-
-	private void registerMethodHints(ReflectionHints hints, Class<?> clazz) {
-		for (Method method : clazz.getDeclaredMethods()) {
-			registerMethodHints(hints, method);
-		}
-	}
-
-	private void registerMethodHints(ReflectionHints hints, Method method) {
-		for (Parameter parameter : method.getParameters()) {
-			bindingRegistrar.registerReflectionHints(hints,
-					MethodParameter.forParameter(parameter).getGenericParameterType());
-		}
-		MethodParameter returnTypeParameter = MethodParameter.forExecutable(method, -1);
-		if (!void.class.equals(returnTypeParameter.getParameterType())) {
-			bindingRegistrar.registerReflectionHints(hints, returnTypeParameter.getGenericParameterType());
-		}
-
-	}
-
-	// Visible for tests
-	final class AotContribution implements BeanFactoryInitializationAotContribution {
-
-		private final Map<String, BeanDefinition> feignClientBeanDefinitions;
-
-		private AotContribution(Map<String, BeanDefinition> feignClientBeanDefinitions) {
-			this.feignClientBeanDefinitions = feignClientBeanDefinitions;
-		}
-
-		@Override
-		public void applyTo(GenerationContext generationContext,
-				BeanFactoryInitializationCode beanFactoryInitializationCode) {
-			RuntimeHints hints = generationContext.getRuntimeHints();
-			Set<String> feignClientRegistrationMethods = feignClientBeanDefinitions.values().stream()
-					.map(beanDefinition -> {
-						Assert.notNull(beanDefinition, "beanDefinition cannot be null");
-						Assert.isInstanceOf(GenericBeanDefinition.class, beanDefinition);
-						GenericBeanDefinition registeredBeanDefinition = (GenericBeanDefinition) beanDefinition;
-						MutablePropertyValues feignClientProperties = registeredBeanDefinition.getPropertyValues();
-						String className = (String) feignClientProperties.get("type");
-						Assert.notNull(className, "className cannot be null");
-						Class<?> clazz = ClassUtils.resolveClassName(className, null);
-						hints.proxies().registerJdkProxy(clazz);
-						registerMethodHints(hints.reflection(), clazz);
-						return beanFactoryInitializationCode.getMethods()
-								.add(buildMethodName(className), method -> generateFeignClientRegistrationMethod(method,
-										feignClientProperties, registeredBeanDefinition))
-								.getName();
-					}).collect(Collectors.toSet());
-			MethodReference initializerMethod = beanFactoryInitializationCode.getMethods()
-					.add("initialize", method -> generateInitializerMethod(method, feignClientRegistrationMethods))
-					.toMethodReference();
-			beanFactoryInitializationCode.addInitializer(initializerMethod);
-		}
-
-		private String buildMethodName(String clientName) {
-			return "register" + clientName + "FeignClient";
-		}
-
-		private void generateInitializerMethod(MethodSpec.Builder method, Set<String> feignClientRegistrationMethods) {
-			method.addModifiers(Modifier.PUBLIC);
-			method.addParameter(DefaultListableBeanFactory.class, "registry");
-			feignClientRegistrationMethods.forEach(feignClientRegistrationMethod -> method.addStatement("$N(registry)",
-					feignClientRegistrationMethod));
-		}
-
-		private void generateFeignClientRegistrationMethod(MethodSpec.Builder method,
-				MutablePropertyValues feignClientPropertyValues, GenericBeanDefinition registeredBeanDefinition) {
-			Object feignQualifiers = feignClientPropertyValues.get("qualifiers");
-			Assert.notNull(feignQualifiers, "Feign qualifiers cannot be null");
-			String qualifiers = "{\"" + String.join("\",\"", (String[]) feignQualifiers) + "\"}";
-			method.addJavadoc("register Feign Client: $L", feignClientPropertyValues.get("type"))
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.addParameter(BeanDefinitionRegistry.class, "registry")
-					.addStatement("Class clazz = $T.resolveClassName(\"$L\", null)", ClassUtils.class,
-							feignClientPropertyValues.get("type"))
-					.addStatement("$T definition = $T.genericBeanDefinition($T.class)", BeanDefinitionBuilder.class,
-							BeanDefinitionBuilder.class, FeignClientFactoryBean.class)
-					.addStatement("definition.addPropertyValue(\"name\",\"$L\")", feignClientPropertyValues.get("name"))
-					.addStatement("definition.addPropertyValue(\"contextId\", \"$L\")",
-							feignClientPropertyValues.get("contextId"))
-					.addStatement("definition.addPropertyValue(\"type\", clazz)")
-					.addStatement("definition.addPropertyValue(\"url\", \"$L\")", feignClientPropertyValues.get("url"))
-					.addStatement("definition.addPropertyValue(\"path\", \"$L\")",
-							feignClientPropertyValues.get("path"))
-					.addStatement("definition.addPropertyValue(\"dismiss404\", $L)",
-							feignClientPropertyValues.get("dismiss404"))
-					.addStatement("definition.addPropertyValue(\"fallback\", $T.class)",
-							feignClientPropertyValues.get("fallback"))
-					.addStatement("definition.addPropertyValue(\"fallbackFactory\", $T.class)",
-							feignClientPropertyValues.get("fallbackFactory"))
-					.addStatement("definition.setAutowireMode($L)", registeredBeanDefinition.getAutowireMode())
-					.addStatement("definition.setLazyInit($L)",
-							registeredBeanDefinition.getLazyInit() != null ? registeredBeanDefinition.getLazyInit()
-									: false)
-					.addStatement("$T beanDefinition = definition.getBeanDefinition()", AbstractBeanDefinition.class)
-					.addStatement("beanDefinition.setAttribute(\"$L\", clazz)", FactoryBean.OBJECT_TYPE_ATTRIBUTE)
-					.addStatement("beanDefinition.setPrimary($L)", registeredBeanDefinition.isPrimary())
-					.addStatement("$T holder = new $T(beanDefinition, \"$L\",  new String[]$L)",
-							BeanDefinitionHolder.class, BeanDefinitionHolder.class,
-							feignClientPropertyValues.get("type"), qualifiers)
-					.addStatement("$T.registerBeanDefinition(holder, registry) ", BeanDefinitionReaderUtils.class);
-		}
-
-		// Visible for tests
-		Map<String, BeanDefinition> getFeignClientBeanDefinitions() {
-			return feignClientBeanDefinitions;
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/FeignClientConfigurer.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/Http2ClientFeignConfiguration.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2013-2023 the original author 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.net.http.HttpClient;
-import java.time.Duration;
-
-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 HttpClient}.
- *
- * @author changjin wei(魏昌进)
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(HttpClient.class)
-public class Http2ClientFeignConfiguration {
-
-	@Bean
-	public HttpClient httpClient(FeignHttpClientProperties httpClientProperties) {
-		return HttpClient.newBuilder()
-				.followRedirects(httpClientProperties.isFollowRedirects() ? HttpClient.Redirect.ALWAYS
-						: HttpClient.Redirect.NEVER)
-				.version(HttpClient.Version.valueOf(httpClientProperties.getHttp2().getVersion()))
-				.connectTimeout(Duration.ofMillis(httpClientProperties.getConnectionTimeout())).build();
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,15 @@ package org.springframework.cloud.openfeign.clientconfig;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.PreDestroy;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -35,7 +36,6 @@ 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.NoopHostnameVerifier;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
 import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.ssl.TLS;
@@ -55,7 +55,6 @@ import org.springframework.context.annotation.Configuration;
  * Default configuration for {@link CloseableHttpClient}.
  *
  * @author Nguyen Ky Thanh
- * @author changjin wei(魏昌进)
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean(CloseableHttpClient.class)
@@ -67,19 +66,25 @@ public class HttpClient5FeignConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(HttpClientConnectionManager.class)
-	public HttpClientConnectionManager hc5ConnectionManager(FeignHttpClientProperties httpClientProperties) {
+	public HttpClientConnectionManager hc5ConnectionManager(
+			FeignHttpClientProperties httpClientProperties) {
 		return PoolingHttpClientConnectionManagerBuilder.create()
-				.setSSLSocketFactory(httpsSSLConnectionSocketFactory(httpClientProperties.isDisableSslValidation()))
+				.setSSLSocketFactory(httpsSSLConnectionSocketFactory(
+						httpClientProperties.isDisableSslValidation()))
 				.setMaxConnTotal(httpClientProperties.getMaxConnections())
 				.setMaxConnPerRoute(httpClientProperties.getMaxConnectionsPerRoute())
-				.setConnPoolPolicy(PoolReusePolicy.valueOf(httpClientProperties.getHc5().getPoolReusePolicy().name()))
-				.setPoolConcurrencyPolicy(
-						PoolConcurrencyPolicy.valueOf(httpClientProperties.getHc5().getPoolConcurrencyPolicy().name()))
+				.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())
+						TimeValue.of(httpClientProperties.getTimeToLive(),
+								httpClientProperties.getTimeToLiveUnit()))
+				.setDefaultSocketConfig(SocketConfig.custom()
+						.setSoTimeout(Timeout.of(
+								httpClientProperties.getHc5().getSocketTimeout(),
+								httpClientProperties.getHc5().getSocketTimeoutUnit()))
+						.build())
 				.build();
 	}
 
@@ -88,14 +93,14 @@ public class HttpClient5FeignConfiguration {
 			FeignHttpClientProperties httpClientProperties) {
 		httpClient5 = HttpClients.custom().disableCookieManagement().useSystemProperties()
 				.setConnectionManager(connectionManager).evictExpiredConnections()
-				.setDefaultRequestConfig(RequestConfig.custom()
-						.setConnectTimeout(
-								Timeout.of(httpClientProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS))
-						.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
-						.setConnectionRequestTimeout(
-								Timeout.of(httpClientProperties.getHc5().getConnectionRequestTimeout(),
-										httpClientProperties.getHc5().getConnectionRequestTimeoutUnit()))
-						.build())
+				.setDefaultRequestConfig(
+						RequestConfig.custom()
+								.setConnectTimeout(Timeout.of(
+										httpClientProperties.getConnectionTimeout(),
+										TimeUnit.MILLISECONDS))
+								.setRedirectsEnabled(
+										httpClientProperties.isFollowRedirects())
+								.build())
 				.build();
 		return httpClient5;
 	}
@@ -107,23 +112,29 @@ public class HttpClient5FeignConfiguration {
 		}
 	}
 
-	private LayeredConnectionSocketFactory httpsSSLConnectionSocketFactory(boolean isDisableSslValidation) {
+	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());
+				sslContext.init(null,
+						new TrustManager[] { new DisabledValidationTrustManager() },
+						new SecureRandom());
 				sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
-				sslConnectionSocketFactoryBuilder.setHostnameVerifier(NoopHostnameVerifier.INSTANCE);
 			}
-			catch (NoSuchAlgorithmException | KeyManagementException e) {
+			catch (NoSuchAlgorithmException e) {
+				LOG.warn("Error creating SSLContext", e);
+			}
+			catch (KeyManagementException e) {
 				LOG.warn("Error creating SSLContext", e);
 			}
 		}
 		else {
-			sslConnectionSocketFactoryBuilder.setSslContext(SSLContexts.createSystemDefault());
+			sslConnectionSocketFactoryBuilder
+					.setSslContext(SSLContexts.createSystemDefault());
 		}
 
 		return sslConnectionSocketFactoryBuilder.build();
@@ -134,10 +145,12 @@ public class HttpClient5FeignConfiguration {
 		DisabledValidationTrustManager() {
 		}
 
-		public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+		public void checkClientTrusted(X509Certificate[] x509Certificates, String s)
+				throws CertificateException {
 		}
 
-		public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+		public void checkServerTrusted(X509Certificate[] x509Certificates, String s)
+				throws CertificateException {
 		}
 
 		public X509Certificate[] getAcceptedIssuers() {

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.clientconfig;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.annotation.PreDestroy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+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 = "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() {
+		this.connectionManagerTimer.cancel();
+		if (this.httpClient != null) {
+			try {
+				this.httpClient.close();
+			}
+			catch (IOException e) {
+				if (LOG.isErrorEnabled()) {
+					LOG.error("Could not correctly close httpClient.");
+				}
+			}
+		}
+	}
+
+}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.clientconfig;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.PreDestroy;
+
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Defualt configuration for {@link OkHttpClient}.
+ *
+ * @author Ryan Baxter
+ * @author Marcin Grzejszczak
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
+public class OkHttpFeignConfiguration {
+
+	private okhttp3.OkHttpClient okHttpClient;
+
+	@Bean
+	@ConditionalOnMissingBean(ConnectionPool.class)
+	public ConnectionPool httpClientConnectionPool(
+			FeignHttpClientProperties httpClientProperties,
+			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+		Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+		Long timeToLive = httpClientProperties.getTimeToLive();
+		TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
+		return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
+	}
+
+	@Bean
+	public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
+			ConnectionPool connectionPool,
+			FeignHttpClientProperties httpClientProperties) {
+		Boolean followRedirects = httpClientProperties.isFollowRedirects();
+		Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+		this.okHttpClient = httpClientFactory
+				.createBuilder(httpClientProperties.isDisableSslValidation())
+				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+				.followRedirects(followRedirects).connectionPool(connectionPool).build();
+		return this.okHttpClient;
+	}
+
+	@PreDestroy
+	public void destroy() {
+		if (this.okHttpClient != null) {
+			this.okHttpClient.dispatcher().executorService().shutdown();
+			this.okHttpClient.connectionPool().evictAll();
+		}
+	}
+
+}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/BaseRequestInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,8 @@ public abstract class BaseRequestInterceptor implements RequestInterceptor {
 	 * @param name the header name
 	 * @param values the header values
 	 */
-	protected void addHeader(RequestTemplate requestTemplate, String name, String... values) {
+	protected void addHeader(RequestTemplate requestTemplate, String name,
+			String... values) {
 
 		if (!requestTemplate.headers().containsKey(name)) {
 			requestTemplate.header(name, values);

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,28 +22,28 @@ 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;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * Configures the Feign response compression.
  *
  * @author Jakub Narloch
- * @author Olga Maciaszek-Sharma
  * @see FeignAcceptGzipEncodingInterceptor
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FeignClientEncodingProperties.class)
 @ConditionalOnClass(Feign.class)
 @ConditionalOnBean(Client.class)
-@ConditionalOnProperty("spring.cloud.openfeign.compression.response.enabled")
+@ConditionalOnProperty(value = "feign.compression.response.enabled",
+		matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
-// If the accept-encoding header is present, it disables transparent compression.
-@Conditional(OkHttpFeignClientBeanMissingCondition.class)
+// If the accept-encoding header is present it disable transparent compression
+@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
 @AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignAcceptGzipEncodingAutoConfiguration {
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 	 * Creates new instance of {@link FeignAcceptGzipEncodingInterceptor}.
 	 * @param properties the encoding properties
 	 */
-	protected FeignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	protected FeignAcceptGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		super(properties);
 	}
 
@@ -43,8 +44,8 @@ public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
 	@Override
 	public void apply(RequestTemplate template) {
 
-		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-				HttpEncoding.DEFLATE_ENCODING);
+		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER,
+				HttpEncoding.GZIP_ENCODING, HttpEncoding.DEFLATE_ENCODING);
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignClientEncodingProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,14 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  *
  * @author Jakub Narloch
  */
-@ConfigurationProperties("spring.cloud.openfeign.compression.request")
+@ConfigurationProperties("feign.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 +41,7 @@ public class FeignClientEncodingProperties {
 	private int minRequestSize = 2048;
 
 	public String[] getMimeTypes() {
-		return mimeTypes;
+		return this.mimeTypes;
 	}
 
 	public void setMimeTypes(String[] mimeTypes) {
@@ -48,7 +49,7 @@ public class FeignClientEncodingProperties {
 	}
 
 	public int getMinRequestSize() {
-		return minRequestSize;
+		return this.minRequestSize;
 	}
 
 	public void setMinRequestSize(int minRequestSize) {
@@ -64,19 +65,21 @@ public class FeignClientEncodingProperties {
 			return false;
 		}
 		FeignClientEncodingProperties that = (FeignClientEncodingProperties) o;
-		return Arrays.equals(mimeTypes, that.mimeTypes) && Objects.equals(minRequestSize, that.minRequestSize);
+		return Arrays.equals(this.mimeTypes, that.mimeTypes)
+				&& Objects.equals(this.minRequestSize, that.minRequestSize);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(Arrays.hashCode(mimeTypes), minRequestSize);
+		return Objects.hash(this.mimeTypes, this.minRequestSize);
 	}
 
 	@Override
 	public String toString() {
 		return new StringBuilder("FeignClientEncodingProperties{").append("mimeTypes=")
-				.append(Arrays.toString(mimeTypes)).append(", ").append("minRequestSize=").append(minRequestSize)
-				.append("}").toString();
+				.append(Arrays.toString(this.mimeTypes)).append(", ")
+				.append("minRequestSize=").append(this.minRequestSize).append("}")
+				.toString();
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,27 +20,26 @@ import feign.Feign;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 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.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * Configures the Feign request compression.
  *
  * @author Jakub Narloch
- * @author Olga Maciaszek-Sharma
  * @see FeignContentGzipEncodingInterceptor
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FeignClientEncodingProperties.class)
 @ConditionalOnClass(Feign.class)
 // The OK HTTP client uses "transparent" compression.
-// If the content-encoding header is present, it disables transparent compression.
-@Conditional(OkHttpFeignClientBeanMissingCondition.class)
-@ConditionalOnProperty("spring.cloud.openfeign.compression.request.enabled")
+// If the content-encoding header is present it disable transparent compression
+@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
+@ConditionalOnProperty("feign.compression.request.enabled")
 @AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {
 

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	 * Creates new instance of {@link FeignContentGzipEncodingInterceptor}.
 	 * @param properties the encoding properties
 	 */
-	protected FeignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
+	protected FeignContentGzipEncodingInterceptor(
+			FeignClientEncodingProperties properties) {
 		super(properties);
 	}
 
@@ -44,8 +45,8 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	public void apply(RequestTemplate template) {
 
 		if (requiresCompression(template)) {
-			addHeader(template, HttpEncoding.CONTENT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-					HttpEncoding.DEFLATE_ENCODING);
+			addHeader(template, HttpEncoding.CONTENT_ENCODING_HEADER,
+					HttpEncoding.GZIP_ENCODING, HttpEncoding.DEFLATE_ENCODING);
 		}
 	}
 
@@ -83,7 +84,7 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	}
 
 	/**
-	 * Returns whether the content mime types matches the configured mime types.
+	 * Returns whether the content mime types matches the configures mime types.
 	 * @param contentTypes the content types
 	 * @return true if any specified content type matches the request content types
 	 */
@@ -92,7 +93,8 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			return false;
 		}
 
-		if (getProperties().getMimeTypes() == null || getProperties().getMimeTypes().length == 0) {
+		if (getProperties().getMimeTypes() == null
+				|| getProperties().getMimeTypes().length == 0) {
 			// no specific mime types has been set - matching everything
 			return true;
 		}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/HttpEncoding.java

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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/OkHttpFeignClientBeanMissingCondition.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2013-2023 the original author 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.encoding;
-
-import feign.Client;
-import feign.okhttp.OkHttpClient;
-
-import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Condition;
-
-/**
- * A {@link Condition} that verifies whether the conditions for creating Feign
- * {@link Client} beans that either are of type {@link OkHttpClient} or have a delegate of
- * type {@link OkHttpClient} are not met.
- *
- * @author Olga Maciaszek-Sharma
- * @since 4.0.2
- */
-public class OkHttpFeignClientBeanMissingCondition extends AnyNestedCondition {
-
-	public OkHttpFeignClientBeanMissingCondition() {
-		super(ConfigurationPhase.REGISTER_BEAN);
-	}
-
-	@ConditionalOnMissingClass("feign.okhttp.OkHttpClient")
-	static class FeignOkHttpClientPresent {
-
-	}
-
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.okhttp.enabled", havingValue = "false")
-	static class FeignOkHttpClientEnabled {
-
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,26 @@
 
 package org.springframework.cloud.openfeign.hateoas;
 
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.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;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
 
 /**
  * @author Hector Espert
@@ -35,15 +43,25 @@ import org.springframework.hateoas.config.WebConverters;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
-@ConditionalOnClass(WebConverters.class)
-@AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
-		RepositoryRestMvcAutoConfiguration.class, HateoasConfiguration.class })
+@ConditionalOnClass(RepresentationModel.class)
+@AutoConfigureAfter({ JacksonAutoConfiguration.class,
+		HttpMessageConvertersAutoConfiguration.class,
+		RepositoryRestMvcAutoConfiguration.class })
 public class FeignHalAutoConfiguration {
 
 	@Bean
-	@ConditionalOnBean(WebConverters.class)
-	HttpMessageConverterCustomizer webConvertersCustomizer(WebConverters webConverters) {
-		return new WebConvertersCustomizer(webConverters);
+	@ConditionalOnBean(HalMediaTypeConfiguration.class)
+	@ConditionalOnMissingBean
+	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
+			ObjectProvider<ObjectMapper> objectMapper,
+			HalMediaTypeConfiguration halConfiguration) {
+		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
+		halConfiguration.configureObjectMapper(mapper);
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
+				RepresentationModel.class);
+		converter.setSupportedMediaTypes(Collections.singletonList(HAL_JSON));
+		converter.setObjectMapper(mapper);
+		return converter;
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/WebConvertersCustomizer.java

@@ -1,41 +0,0 @@
-/*
- * 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);
-	}
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,48 +24,43 @@ 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link Client.Default} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-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);
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
+		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
+				loadBalancerClient);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
-			matchIfMissing = true)
-	public Client feignRetryClient(LoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
-		return new RetryableFeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
-				loadBalancedRetryFactory, loadBalancerClientFactory, transformers);
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
+			havingValue = "true", matchIfMissing = true)
+	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
+			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
+		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
+		return new RetryableFeignBlockingLoadBalancerClient(
+				new Client.Default(null, null), loadBalancerClient,
+				loadBalancedRetryFactories.get(0));
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@ 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;
@@ -30,124 +27,58 @@ 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.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 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.
+ * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} 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 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();
-	}
+	private final BlockingLoadBalancerClient loadBalancerClient;
 
-	/**
-	 * @deprecated in favour of
-	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
-	 */
-	@Deprecated
-	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
+	public FeignBlockingLoadBalancerClient(Client delegate,
+			BlockingLoadBalancerClient loadBalancerClient) {
 		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);
+		Assert.state(serviceId != null,
+				"Request URI does not contain a valid hostname: " + originalUri);
+		ServiceInstance instance = loadBalancerClient.choose(serviceId);
 		if (instance == null) {
-			String message = "Load balancer does not contain an instance for the service " + serviceId;
+			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())
+			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);
+		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
+				.toString();
+		Request newRequest = buildRequest(request, reconstructedUrl);
+		return delegate.execute(newRequest, options);
 	}
 
 	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;
+		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(),
+				request.body(), request.charset(), request.requestTemplate());
 	}
 
 	// Visible for Sleuth instrumentation
@@ -155,11 +86,4 @@ public class FeignBlockingLoadBalancerClient implements Client {
 		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;
-	}
-
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,45 +23,37 @@ 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.autoconfigure.condition.ConditionalOnMissingBean;
 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
- * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
- * of {@link Client}.
+ * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
+ * implementations of {@link Client}. In order to use this load-balancing mechanism, the
+ * Ribbon-based implementation has to be disabled by setting
+ * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
  *
  * @author Olga Maciaszek-Sharma
  * @author Nguyen Ky Thanh
- * @author changjin wei(魏昌进)
  * @since 2.2.0
  */
 @ConditionalOnClass(Feign.class)
-@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
 @AutoConfigureBefore(FeignAutoConfiguration.class)
-@AutoConfigureAfter({ BlockingLoadBalancerClientAutoConfiguration.class, LoadBalancerAutoConfiguration.class })
+@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class)
 @EnableConfigurationProperties(FeignHttpClientProperties.class)
 @Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
 // see
 // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ OkHttpFeignLoadBalancerConfiguration.class, HttpClient5FeignLoadBalancerConfiguration.class,
-		Http2ClientFeignLoadBalancerConfiguration.class, DefaultFeignLoadBalancerConfiguration.class })
+@Import({ HttpClientFeignLoadBalancerConfiguration.class,
+		OkHttpFeignLoadBalancerConfiguration.class,
+		HttpClient5FeignLoadBalancerConfiguration.class,
+		DefaultFeignLoadBalancerConfiguration.class })
 public class FeignLoadBalancerAutoConfiguration {
 
-	@Bean
-	@ConditionalOnBean(LoadBalancerClientFactory.class)
-	@ConditionalOnMissingBean(XForwardedHeadersTransformer.class)
-	public XForwardedHeadersTransformer xForwarderHeadersFeignTransformer(LoadBalancerClientFactory factory) {
-		return new XForwardedHeadersTransformer(factory);
-	}
-
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClient5FeignLoadBalancerConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,57 +26,50 @@ 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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link ApacheHttp5Client} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link ApacheHttp5Client} under the hood.
  *
  * @author Nguyen Ky Thanh
- * @author changjin wei(魏昌进)
- * @author Olga Maciaszek-Sharma
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(ApacheHttp5Client.class)
-@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
-@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true",
-		matchIfMissing = true)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnProperty(value = "feign.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) {
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient5) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
-				transformers);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
-			matchIfMissing = true)
-	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
+			havingValue = "true", matchIfMissing = true)
+	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient5,
+			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
+		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
 		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory, transformers);
+		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
+				loadBalancedRetryFactories.get(0));
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,61 +16,64 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.net.http.HttpClient;
 import java.util.List;
 
 import feign.Client;
-import feign.http2client.Http2Client;
+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.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+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;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link Http2Client} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link ApacheHttpClient} under the hood.
  *
- * @author changjin wei(魏昌进)
+ * @author Olga Maciaszek-Sharma
+ * @author Nguyen Ky Thanh
+ * @since 2.2.0
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass({ Http2Client.class, HttpClient.class })
-@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
-@ConditionalOnProperty("spring.cloud.openfeign.http2client.enabled")
-@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
-class Http2ClientFeignLoadBalancerConfiguration {
+@ConditionalOnClass(ApacheHttpClient.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Conditional(HttpClient5DisabledConditions.class)
+@Import(HttpClientFeignConfiguration.class)
+class HttpClientFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
-		Client delegate = new Http2Client(httpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
-				transformers);
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
-			matchIfMissing = true)
-	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
-		Client delegate = new Http2Client(httpClient);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory, transformers);
+	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
+			havingValue = "true", matchIfMissing = true)
+	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient,
+			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
+		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
+				loadBalancedRetryFactories.get(0));
 	}
 
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerFeignRequestTransformer.java

@@ -1,47 +0,0 @@
-/*
- * 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);
-
-}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerResponseStatusCodeException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,18 @@ import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeExceptio
  *
  * @author Ryan Baxter
  */
-public class LoadBalancerResponseStatusCodeException extends RetryableStatusCodeException {
+public class LoadBalancerResponseStatusCodeException
+		extends RetryableStatusCodeException {
 
 	private final Response response;
 
-	public LoadBalancerResponseStatusCodeException(String serviceId, Response response, byte[] body, URI uri) {
+	public LoadBalancerResponseStatusCodeException(String serviceId, Response response,
+			byte[] body, URI uri) {
 		super(serviceId, response.status(), response, uri);
-		this.response = Response.builder().body(new ByteArrayInputStream(body), body.length).headers(response.headers())
-				.reason(response.reason()).status(response.status()).request(response.request()).build();
+		this.response = Response.builder()
+				.body(new ByteArrayInputStream(body), body.length)
+				.headers(response.headers()).reason(response.reason())
+				.status(response.status()).request(response.request()).build();
 	}
 
 	@Override