Add test. Fix typo in docs. Update config properties documentation.

Allow configuring OkHttpClient readTimeout via properties.
2022-01-14 19:57:40 +01:00 · 2022-01-14 19:36:00 +01:00
93 changed files with 430 additions and 1103 deletions
@@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        java: ["17"]
+        java: ["8", "11", "16"]

    steps:
      - uses: actions/checkout@v2
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.1-tem
+java=8.0.292.hs-adpt
@@ -40,8 +40,7 @@ and binding to the Spring Environment and other Spring programming model idioms.

 == Building

-
-:jdkversion: 17
+:jdkversion: 1.8

 === Basic Compile and Test

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>
@@ -17,8 +17,6 @@
 		<main.basedir>${basedir}/..</main.basedir>
 		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
-		<!-- Don't upload docs jar to central / repo.spring.io -->
-		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -1,37 +1,37 @@
 |===
 |Name | Default | Description

-|spring.cloud.openfeign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
-|spring.cloud.openfeign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
-|spring.cloud.openfeign.circuitbreaker.group.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.
-|spring.cloud.openfeign.client.config |  | 
-|spring.cloud.openfeign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
-|spring.cloud.openfeign.client.default-config | `default` | 
-|spring.cloud.openfeign.client.default-to-properties | `true` | 
-|spring.cloud.openfeign.client.refresh-enabled | `false` | Enables options value refresh capability for Feign.
-|spring.cloud.openfeign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed.
-|spring.cloud.openfeign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
-|spring.cloud.openfeign.compression.request.min-request-size | `2048` | The minimum threshold content size.
-|spring.cloud.openfeign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
-|spring.cloud.openfeign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
-|spring.cloud.openfeign.httpclient.connection-timeout | `2000` | 
-|spring.cloud.openfeign.httpclient.connection-timer-repeat | `3000` | 
-|spring.cloud.openfeign.httpclient.disable-ssl-validation | `false` | 
-|spring.cloud.openfeign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign.
-|spring.cloud.openfeign.httpclient.follow-redirects | `true` | 
-|spring.cloud.openfeign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
-|spring.cloud.openfeign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
-|spring.cloud.openfeign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
-|spring.cloud.openfeign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
-|spring.cloud.openfeign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
-|spring.cloud.openfeign.httpclient.max-connections | `200` | 
-|spring.cloud.openfeign.httpclient.max-connections-per-route | `50` | 
-|spring.cloud.openfeign.httpclient.ok-http.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
-|spring.cloud.openfeign.httpclient.time-to-live | `900` | 
-|spring.cloud.openfeign.httpclient.time-to-live-unit |  | 
-|spring.cloud.openfeign.metrics.enabled | `true` | Enables metrics capability for Feign.
-|spring.cloud.openfeign.oauth2.enabled | `false` | Enables feign interceptor for managing oauth2 access token.
-|spring.cloud.openfeign.oauth2.load-balanced | `false` | Enables load balancing for oauth2 access token provider.
-|spring.cloud.openfeign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
+|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.circuitbreaker.group.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.
+|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.client.refresh-enabled | `false` | Enables options value refresh capability for Feign.
+|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.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.ok-http-client-properties.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
+|feign.httpclient.time-to-live | `900` | 
+|feign.httpclient.time-to-live-unit |  | 
+|feign.metrics.enabled | `true` | Enables metrics capability for Feign.
+|feign.oauth2.enabled | `false` | Enables feign interceptor for managing oauth2 access token.
+|feign.oauth2.load-balanced | `false` | Enables load balancing for oauth2 access token provider.
+|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.

-|===
+|===
@@ -122,7 +122,7 @@ Spring Cloud OpenFeign provides the following beans by default for feign (`BeanT
 * `Encoder` feignEncoder: `SpringEncoder`
 * `Logger` feignLogger: `Slf4jLogger`
 * `MicrometerCapability` micrometerCapability: If `feign-micrometer` is on the classpath and `MeterRegistry` is available
-* `CachingCapability` cachingCapability: If `@EnableCaching` annotation is used. Can be disabled via `spring.cloud.openfeign.cache.enabled`.
+* `CachingCapability` cachingCapability: If `@EnableCaching` annotation is used. Can be disabled via `feign.cache.enabled`.
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
 * `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
@@ -130,7 +130,7 @@ If none of them is on the classpath, the default feign client is used.

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

-The OkHttpClient and ApacheHttpClient and ApacheHC5 feign clients can be used by setting `spring.cloud.openfeign.okhttp.enabled` or `spring.cloud.openfeign.httpclient.enabled` or `spring.cloud.openfeign.httpclient.hc5.enabled` to `true`, respectively, and having them on the classpath.
+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:
@@ -173,58 +173,54 @@ This replaces the `SpringMvcContract` with `feign.Contract.Default` and adds a `
 application.yml
 [source,yaml]
 ----
-spring:
-	cloud:
-		openfeign:
-			client:
-				config:
-					feignName:
-						connectTimeout: 5000
-						readTimeout: 5000
-						loggerLevel: full
-						errorDecoder: com.example.SimpleErrorDecoder
-						retryer: com.example.SimpleRetryer
-						defaultQueryParameters:
-							query: queryValue
-						defaultRequestHeaders:
-							header: headerValue
-						requestInterceptors:
-							- com.example.FooRequestInterceptor
-							- com.example.BarRequestInterceptor
-						decode404: false
-						encoder: com.example.SimpleEncoder
-						decoder: com.example.SimpleDecoder
-						contract: com.example.SimpleContract
-						capabilities:
-							- com.example.FooCapability
-							- com.example.BarCapability
-						queryMapEncoder: com.example.SimpleQueryMapEncoder
-						metrics.enabled: false
+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
+				capabilities:
+					- com.example.FooCapability
+					- com.example.BarCapability
+				queryMapEncoder: com.example.SimpleQueryMapEncoder
+				metrics.enabled: false
 ----

 Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.

-If you prefer using configuration properties to configure all `@FeignClient`, you can create configuration properties with `default` feign name.
+If you prefer using configuration properties to configured 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`.
+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]
 ----
-spring:
-	cloud:
-		openfeign:
-			client:
-				config:
-					default:
-						connectTimeout: 5000
-						readTimeout: 5000
-						loggerLevel: basic
+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 `spring.cloud.openfeign.client.default-to-properties` to `false`.
+you can change `feign.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
@@ -270,13 +266,13 @@ public FeignClientConfigurer feignClientConfigurer() {
 }
 ----

-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`.
+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 `spring.cloud.openfeign.encoder.charset-from-content-type` to `true`.
+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
@@ -341,7 +337,7 @@ You can do this by overriding calling `inheritParentContext(false)` on the `Buil
 [[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.
+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.:

@@ -374,47 +370,8 @@ public class FooConfiguration {
 }
 ----

-To enable Spring Cloud CircuitBreaker group set the `spring.cloud.openfeign.circuitbreaker.group.enabled` property to `true` (by default `false`).
+To enable Spring Cloud CircuitBreaker group set the `feign.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]
----
-feign:
-  circuitbreaker:
-    enabled: true
-    alphanumeric-ids:
-      enabled: true
-resilience4j:
-  circuitbreaker:
-    instances:
-      DemoClientgetDemo:
-        minimumNumberOfCalls: 69
-  timelimiter:
-    instances:
-      DemoClientgetDemo:
-        timeoutDuration: 10s
----
-
-NOTE: If you want to switch back to the circuit breaker names used prior to Spring Cloud
-2022.0.0 you can set `spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled` to `false`.

 [[spring-cloud-feign-circuitbreaker-fallback]]
 === Feign Spring Cloud CircuitBreaker Fallbacks
@@ -548,17 +505,17 @@ 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.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]
 ----
-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
+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.
@@ -619,8 +576,8 @@ If all of the following conditions are true, a `MicrometerCapability` bean is cr
 * `feign-micrometer` is on the classpath
 * A `MeterRegistry` bean is available
 * feign metrics properties are set to `true` (by default)
-	- `spring.cloud.openfeign.metrics.enabled=true` (for all clients)
-	- `spring.cloud.openfeign.client.config.feignName.metrics.enabled=true` (for a single client)
+	- `feign.metrics.enabled=true` (for all clients)
+	- `feign.client.config.feignName.metrics.enabled=true` (for a single client)

 NOTE: If your application already uses Micrometer, enabling metrics is as simple as putting `feign-micrometer` onto your classpath.

@@ -628,11 +585,11 @@ You can also disable the feature by either:

 * excluding `feign-micrometer` from your classpath
 * setting one of the feign metrics properties to `false`
-	- `spring.cloud.openfeign.metrics.enabled=false`
-	- `spring.cloud.openfeign.client.config.feignName.metrics.enabled=false`
+	- `feign.metrics.enabled=false`
+	- `feign.client.config.feignName.metrics.enabled=false`

-NOTE: `spring.cloud.openfeign.metrics.enabled=false` disables metrics support for *all* Feign clients regardless of the value of the client-level flags: `spring.cloud.openfeign.client.config.feignName.metrics.enabled`.
-If you want to enable or disable merics per client, don't set `spring.cloud.openfeign.metrics.enabled` and use `spring.cloud.openfeign.client.config.feignName.metrics.enabled`.
+NOTE: `feign.metrics.enabled=false` disables metrics support for *all* Feign clients regardless of the value of the client-level flags: `feign.client.config.feignName.metrics.enabled`.
+If you want to enable or disable merics per client, don't set `feign.metrics.enabled` and use `feign.client.config.feignName.metrics.enabled`.

 You can also customize the `MicrometerCapability` by registering your own bean:

@@ -661,7 +618,7 @@ public interface DemoClient {
 }
 ----

-You can also disable the feature via property `spring.cloud.openfeign.cache.enabled=false`.
+You can also disable the feature via property `feign.cache.enabled=false`.

 === Feign @QueryMap support

@@ -791,7 +748,7 @@ You may consider enabling Jackson Modules for the support `org.springframework.d

 [source,java]
 ----
-spring.cloud.openfeign.autoconfiguration.jackson.enabled=true
+feign.autoconfiguration.jackson.enabled=true
 ----

 === Spring `@RefreshScope` Support
@@ -800,48 +757,21 @@ If Feign client refresh is enabled, each feign client is created with `feign.Req
 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
+feign.client.refresh-enabled=true
 ----
 TIP: DO NOT annotate the `@FeignClient` interface with the `@RefreshScope` annotation.

 === OAuth2 Support
 OAuth2 support can be enabled by setting following flag:
 ----
-spring.cloud.openfeign.oauth2.enabled=true
+feign.oauth2.enabled=true
 ----
 When the flag is set to true, and the oauth2 client context resource details are present, a bean of class `OAuth2FeignRequestInterceptor` is created. Before each request, the interceptor resolves the required access token and includes it as a header.
 Sometimes, when load balancing is enabled for Feign clients, you may want to use load balancing for fetching access tokens, too. To do so, you should ensure that the load balancer is on the classpath (spring-cloud-starter-loadbalancer) and explicitly enable load balancing for OAuth2FeignRequestInterceptor by setting the following flag:
 ----
-spring.cloud.openfeign.oauth2.load-balanced=true
+feign.oauth2.load-balanced=true
 ----

-=== Transform the load-balanced HTTP request
-
-You can use the selected `ServiceInstance` to transform the load-balanced HTTP Request.
-
-For `Request`, you need to implement and define `LoadBalancerFeignRequestTransformer`, as follows:
-
-[source,java,indent=0]
----
-	@Bean
-	public LoadBalancerFeignRequestTransformer transformer() {
-		return new LoadBalancerFeignRequestTransformer() {
-
-			@Override
-			public Request transformRequest(Request request, ServiceInstance instance) {
-				Map<String, Collection<String>> headers = new HashMap<>(request.headers());
-				headers.put("X-ServiceId", Collections.singletonList(instance.getServiceId()));
-				headers.put("X-InstanceId", Collections.singletonList(instance.getInstanceId()));
-				return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
-						request.requestTemplate());
-			}
-		};
-	}
----
-
-If multiple transformers are defined, they are applied in the order in which beans are defined.
-Alternatively, you can use `LoadBalancerFeignRequestTransformer.DEFAULT_ORDER` to specify the order.
-
 == Configuration properties

 To see the list of all Spring Cloud OpenFeign related configuration properties please check link:appendix.html[the Appendix page].
@@ -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.0.0-SNAPSHOT</version>
+	<version>3.1.1-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.0.0-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>

 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -64,6 +64,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>
@@ -135,7 +142,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 +153,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 +171,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 +182,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 +190,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>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -61,6 +61,11 @@
 			<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>
@@ -94,13 +99,6 @@
 		<dependency>
 			<groupId>io.github.openfeign.form</groupId>
 			<artifactId>feign-form-spring</artifactId>
-			<exclusions>
-<!--				Vulnerable in 3.8.0-->
-				<exclusion>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
@@ -127,6 +125,11 @@
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
@@ -145,10 +148,6 @@
 					<groupId>javax.activation</groupId>
 					<artifactId>javax.activation-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.activation</groupId>
-					<artifactId>jakarta.activation</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -209,12 +208,6 @@
 			<artifactId>spring-cloud-loadbalancer</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -25,6 +25,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;

+import javax.annotation.PreDestroy;
+
 import com.fasterxml.jackson.databind.Module;
 import feign.Capability;
 import feign.Client;
@@ -34,7 +36,6 @@ import feign.Target;
 import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
-import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -115,7 +116,7 @@ public class FeignAutoConfiguration {
 	}

 	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.cache.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.cache.enabled", matchIfMissing = true)
 	@ConditionalOnBean(CacheInterceptor.class)
 	public Capability cachingCapability(CacheInterceptor cacheInterceptor) {
 		return new CachingCapability(cacheInterceptor);
@@ -123,7 +124,7 @@ public class FeignAutoConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.autoconfiguration.jackson.enabled", havingValue = "true")
+	@ConditionalOnProperty(value = "feign.autoconfiguration.jackson.enabled", havingValue = "true")
 	protected static class FeignJacksonConfiguration {

 		@Bean
@@ -154,7 +155,7 @@ public class FeignAutoConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "true")
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "true")
 	protected static class CircuitBreakerPresentFeignTargeterConfiguration {

 		@Bean
@@ -165,25 +166,15 @@ public class FeignAutoConfiguration {

 		@Bean
 		@ConditionalOnMissingBean(CircuitBreakerNameResolver.class)
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
-				havingValue = "false")
 		public CircuitBreakerNameResolver circuitBreakerNameResolver() {
 			return new DefaultCircuitBreakerNameResolver();
 		}

-		@Bean
-		@ConditionalOnMissingBean(CircuitBreakerNameResolver.class)
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
-				havingValue = "true", matchIfMissing = true)
-		public CircuitBreakerNameResolver alphanumericCircuitBreakerNameResolver() {
-			return new AlphanumericCircuitBreakerNameResolver();
-		}
-
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnBean(CircuitBreakerFactory.class)
 		public Targeter circuitBreakerFeignTargeter(CircuitBreakerFactory circuitBreakerFactory,
-				@Value("${spring.cloud.openfeign.circuitbreaker.group.enabled:false}") boolean circuitBreakerGroupEnabled,
+				@Value("${feign.circuitbreaker.group.enabled:false}") boolean circuitBreakerGroupEnabled,
 				CircuitBreakerNameResolver circuitBreakerNameResolver) {
 			return new FeignCircuitBreakerTargeter(circuitBreakerFactory, circuitBreakerGroupEnabled,
 					circuitBreakerNameResolver);
@@ -198,15 +189,6 @@ public class FeignAutoConfiguration {

 		}

-		static class AlphanumericCircuitBreakerNameResolver extends DefaultCircuitBreakerNameResolver {
-
-			@Override
-			public String resolveCircuitBreakerName(String feignClientName, Target<?> target, Method method) {
-				return super.resolveCircuitBreakerName(feignClientName, target, method).replaceAll("[^a-zA-Z0-9]", "");
-			}
-
-		}
-
 	}

 	// the following configuration is for alternate feign clients if
@@ -216,7 +198,7 @@ public class FeignAutoConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 	@Conditional(HttpClient5DisabledConditions.class)
 	protected static class HttpClientFeignConfiguration {

@@ -284,7 +266,7 @@ public class FeignAutoConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.okhttp.enabled")
+	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {

 		private okhttp3.OkHttpClient okHttpClient;
@@ -305,7 +287,7 @@ public class FeignAutoConfiguration {
 			boolean followRedirects = httpClientProperties.isFollowRedirects();
 			int connectTimeout = httpClientProperties.getConnectionTimeout();
 			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+			Duration readTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
 			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
 					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 					.readTimeout(readTimeout).connectionPool(connectionPool).build();
@@ -331,7 +313,7 @@ public class FeignAutoConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttp5Client.class)
 	@ConditionalOnMissingBean(org.apache.hc.client5.http.impl.classic.CloseableHttpClient.class)
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true")
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
 	@Import(org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration.class)
 	protected static class HttpClient5FeignConfiguration {

@@ -345,13 +327,12 @@ public class FeignAutoConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OAuth2ClientContext.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.oauth2.enabled")
-	@Deprecated // spring-security-oauth2 reached EOL
+	@ConditionalOnProperty("feign.oauth2.enabled")
 	protected static class Oauth2FeignConfiguration {

 		@ConditionalOnBean({ RetryLoadBalancerInterceptor.class, OAuth2ClientContext.class,
 				OAuth2ProtectedResourceDetails.class })
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
+		@ConditionalOnProperty(value = "feign.oauth2.load-balanced", havingValue = "true")
 		@Bean
 		public OAuth2FeignRequestInterceptorConfigurer retryLoadBalancerInterceptorInjectingConfigurer(
 				final RetryLoadBalancerInterceptor loadBalancerInterceptor) {
@@ -360,7 +341,7 @@ public class FeignAutoConfiguration {

 		@ConditionalOnBean({ LoadBalancerInterceptor.class, OAuth2ClientContext.class,
 				OAuth2ProtectedResourceDetails.class })
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
+		@ConditionalOnProperty(value = "feign.oauth2.load-balanced", havingValue = "true")
 		@Bean
 		public OAuth2FeignRequestInterceptorConfigurer loadBalancerInterceptorInjectingConfigurer(
 				final LoadBalancerInterceptor loadBalancerInterceptor) {
@@ -31,8 +31,7 @@ class FeignCircuitBreakerDisabledConditions extends AnyNestedCondition {

 	}

-	@ConditionalOnProperty(value = "spring.cloud.openfeign.circuitbreaker.enabled", havingValue = "false",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.circuitbreaker.enabled", havingValue = "false", matchIfMissing = true)
 	static class CircuitBreakerDisabled {

 	}
@@ -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;
@@ -30,7 +29,6 @@ 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;

@@ -97,29 +95,15 @@ 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();
 		return () -> {
@@ -69,7 +69,6 @@ import org.springframework.util.StringUtils;
 * @author Sam Kruglov
 * @author Jasbir Singh
 * @author Hyeonmin Park
- * @author Felix Dittrich
 */
 public class FeignClientFactoryBean
 		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {
@@ -133,6 +132,7 @@ public class FeignClientFactoryBean
 		// @formatter:on

 		configureFeign(context, builder);
+		applyBuildCustomizers(context, builder);

 		return builder;
 	}
@@ -374,7 +374,6 @@ public class FeignClientFactoryBean
 		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);
 		}
@@ -444,17 +443,11 @@ public class FeignClientFactoryBean
 			}
 			builder.client(client);
 		}
-
-		applyBuildCustomizers(context, builder);
-
 		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("/")) {
@@ -36,7 +36,7 @@ class FeignClientMetricsEnabledCondition implements Condition {
 					.getConfig();
 			if (feignClientConfigMap != null) {
 				FeignClientProperties.FeignClientConfiguration feignClientConfig = feignClientConfigMap
-						.get(context.getEnvironment().getProperty("spring.cloud.openfeign.client.name"));
+						.get(context.getEnvironment().getProperty("feign.client.name"));
 				if (feignClientConfig != null) {
 					FeignClientProperties.MetricsProperties metrics = feignClientConfig.getMetrics();
 					if (metrics != null && metrics.getEnabled() != null) {
@@ -43,7 +43,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * @author Olga Maciaszek-Sharma
 * @author Hyeonmin Park
 */
-@ConfigurationProperties("spring.cloud.openfeign.client")
+@ConfigurationProperties("feign.client")
 public class FeignClientProperties {

 	private boolean defaultToProperties = true;
@@ -214,7 +214,7 @@ public class FeignClientsConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.circuitbreaker.enabled")
+	@ConditionalOnProperty("feign.circuitbreaker.enabled")
 	protected static class CircuitBreakerPresentFeignBuilderConfiguration {

 		@Bean
@@ -237,7 +237,7 @@ public class FeignClientsConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(type = "io.micrometer.core.instrument.MeterRegistry")
 	@ConditionalOnClass(name = "feign.micrometer.MicrometerCapability")
-	@ConditionalOnProperty(name = "spring.cloud.openfeign.metrics.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "feign.metrics.enabled", matchIfMissing = true)
 	@Conditional(FeignClientMetricsEnabledCondition.class)
 	protected static class MetricsConfiguration {

@@ -302,11 +302,7 @@ 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;
 	}
@@ -440,7 +436,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 	}

 	private boolean isClientRefreshEnabled() {
-		return environment.getProperty("spring.cloud.openfeign.client.refresh-enabled", Boolean.class, false);
+		return environment.getProperty("feign.client.refresh-enabled", Boolean.class, false);
 	}

 }
@@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
 public class FeignContext extends NamedContextFactory<FeignClientSpecification> {

 	public FeignContext() {
-		super(FeignClientsConfiguration.class, "spring.cloud.openfeign", "spring.cloud.openfeign.client.name");
+		super(FeignClientsConfiguration.class, "feign", "feign.client.name");
 	}

 	@Nullable
@@ -34,8 +34,7 @@ public class HttpClient5DisabledConditions extends AnyNestedCondition {

 	}

-	@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "false",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "false", matchIfMissing = true)
 	static class HttpClient5Disabled {

 	}
@@ -23,11 +23,11 @@ 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;
@@ -20,7 +20,8 @@ import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;

-import jakarta.annotation.PreDestroy;
+import javax.annotation.PreDestroy;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.config.RequestConfig;
@@ -79,7 +80,7 @@ public class HttpClientFeignConfiguration {
 	}

 	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", havingValue = "true")
+	@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
 	public CloseableHttpClient customHttpClient(HttpClientConnectionManager httpClientConnectionManager,
 			FeignHttpClientProperties httpClientProperties) {
 		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement().useSystemProperties();
@@ -88,8 +89,7 @@ public class HttpClientFeignConfiguration {
 	}

 	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", havingValue = "false",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
 	public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
 			HttpClientConnectionManager httpClientConnectionManager, FeignHttpClientProperties httpClientProperties) {
 		this.httpClient = createClient(httpClientFactory.createBuilder(), httpClientConnectionManager,
@@ -19,7 +19,8 @@ package org.springframework.cloud.openfeign.clientconfig;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;

-import jakarta.annotation.PreDestroy;
+import javax.annotation.PreDestroy;
+
 import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;

@@ -59,7 +60,7 @@ public class OkHttpFeignConfiguration {
 			FeignHttpClientProperties httpClientProperties) {
 		boolean followRedirects = httpClientProperties.isFollowRedirects();
 		int connectTimeout = httpClientProperties.getConnectionTimeout();
-		Duration reaTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+		Duration reaTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
 		this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation())
 				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 				.readTimeout(reaTimeout).connectionPool(connectionPool).build();
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "spring.cloud.openfeign.compression.response.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 *
 * @author Jakub Narloch
 */
-@ConfigurationProperties("spring.cloud.openfeign.compression.request")
+@ConfigurationProperties("feign.compression.request")
 public class FeignClientEncodingProperties {

 	/**
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration;
 // The OK HTTP client uses "transparent" compression.
 // If the content-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty("spring.cloud.openfeign.compression.request.enabled")
+@ConditionalOnProperty("feign.compression.request.enabled")
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {

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

 package org.springframework.cloud.openfeign.loadbalancer;

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

 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -38,7 +36,6 @@ import org.springframework.context.annotation.Configuration;
 * that uses {@link Client.Default} under the hood.
 *
 * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@@ -49,10 +46,9 @@ class DefaultFeignLoadBalancerConfiguration {
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
-				loadBalancerClientFactory, transformers);
+				loadBalancerClientFactory);
 	}

 	@Bean
@@ -62,10 +58,9 @@ class DefaultFeignLoadBalancerConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		return new RetryableFeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
-				loadBalancedRetryFactory, loadBalancerClientFactory, transformers);
+				loadBalancedRetryFactory, loadBalancerClientFactory);
 	}

 }
@@ -19,8 +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;
@@ -51,7 +49,6 @@ import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils
 * {@link ServiceInstance} to use while resolving the request host.
 *
 * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -65,11 +62,9 @@ public class FeignBlockingLoadBalancerClient implements Client {

 	private final LoadBalancerClientFactory loadBalancerClientFactory;

-	private final List<LoadBalancerFeignRequestTransformer> transformers;
-
 	/**
 	 * @deprecated in favour of
-	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
+	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory)}
 	 */
 	@Deprecated
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
@@ -77,29 +72,13 @@ public class FeignBlockingLoadBalancerClient implements Client {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = Collections.emptyList();
 	}

-	/**
-	 * @deprecated in favour of
-	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
-	 */
-	@Deprecated
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = Collections.emptyList();
-	}
-
-	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
-		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = transformers;
 	}

 	@Override
@@ -130,7 +109,7 @@ public class FeignBlockingLoadBalancerClient implements Client {
 					.body(message, StandardCharsets.UTF_8).build();
 		}
 		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri).toString();
-		Request newRequest = buildRequest(request, reconstructedUrl, instance);
+		Request newRequest = buildRequest(request, reconstructedUrl);
 		return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbRequest, lbResponse,
 				supportedLifecycleProcessors);
 	}
@@ -140,16 +119,6 @@ public class FeignBlockingLoadBalancerClient implements Client {
 				request.charset(), request.requestTemplate());
 	}

-	protected Request buildRequest(Request request, String reconstructedUrl, ServiceInstance instance) {
-		Request newRequest = buildRequest(request, reconstructedUrl);
-		if (transformers != null) {
-			for (LoadBalancerFeignRequestTransformer transformer : transformers) {
-				newRequest = transformer.transformRequest(newRequest, instance);
-			}
-		}
-		return newRequest;
-	}
-
 	// Visible for Sleuth instrumentation
 	public Client getDelegate() {
 		return delegate;
@@ -16,8 +16,6 @@

 package org.springframework.cloud.openfeign.loadbalancer;

-import java.util.List;
-
 import feign.Client;
 import feign.hc5.ApacheHttp5Client;
 import org.apache.hc.client5.http.classic.HttpClient;
@@ -42,12 +40,11 @@ import org.springframework.context.annotation.Import;
 * that uses {@link ApacheHttp5Client} under the hood.
 *
 * @author Nguyen Ky Thanh
- * @author changjin wei(魏昌进)
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttp5Client.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
-@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.hc5.enabled", havingValue = "true")
+@ConditionalOnProperty(value = "feign.httpclient.hc5.enabled", havingValue = "true")
@Import(HttpClient5FeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
 class HttpClient5FeignLoadBalancerConfiguration {
@@ -56,11 +53,9 @@ class HttpClient5FeignLoadBalancerConfiguration {
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
-				transformers);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
 	}

 	@Bean
@@ -70,11 +65,10 @@ class HttpClient5FeignLoadBalancerConfiguration {
 	@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) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory, transformers);
+				loadBalancerClientFactory);
 	}

 }
@@ -16,8 +16,6 @@

 package org.springframework.cloud.openfeign.loadbalancer;

-import java.util.List;
-
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import org.apache.http.client.HttpClient;
@@ -44,13 +42,12 @@ import org.springframework.context.annotation.Import;
 *
 * @author Olga Maciaszek-Sharma
 * @author Nguyen Ky Thanh
- * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
-@ConditionalOnProperty(value = "spring.cloud.openfeign.httpclient.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
@Conditional(HttpClient5DisabledConditions.class)
@Import(HttpClientFeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
@@ -60,11 +57,9 @@ class HttpClientFeignLoadBalancerConfiguration {
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
-				transformers);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
 	}

 	@Bean
@@ -74,11 +69,10 @@ class HttpClientFeignLoadBalancerConfiguration {
 	@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) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory, transformers);
+				loadBalancerClientFactory);
 	}

 }
@@ -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);
-
-}
@@ -33,7 +33,7 @@ import org.springframework.cloud.client.loadbalancer.RequestData;
 import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatusCode;
+import org.springframework.http.HttpStatus;

 /**
 * @author Olga Maciaszek-Sharma
@@ -73,7 +73,7 @@ final class LoadBalancerUtils {
 	static ResponseData buildResponseData(Response response) {
 		HttpHeaders responseHeaders = new HttpHeaders();
 		response.headers().forEach((key, value) -> responseHeaders.put(key, new ArrayList<>(value)));
-		return new ResponseData(HttpStatusCode.valueOf(response.status()), responseHeaders, null,
+		return new ResponseData(HttpStatus.resolve(response.status()), responseHeaders, null,
 				buildRequestData(response.request()));
 	}

@@ -16,8 +16,6 @@

 package org.springframework.cloud.openfeign.loadbalancer;

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

@@ -41,12 +39,11 @@ import org.springframework.context.annotation.Import;
 * that uses {@link OkHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty("spring.cloud.openfeign.okhttp.enabled")
+@ConditionalOnProperty("feign.okhttp.enabled")
@ConditionalOnBean({ LoadBalancerClient.class, LoadBalancerClientFactory.class })
@Import(OkHttpFeignConfiguration.class)
@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
@@ -56,11 +53,9 @@ class OkHttpFeignLoadBalancerConfiguration {
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory,
-				transformers);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
 	}

 	@Bean
@@ -70,11 +65,10 @@ class OkHttpFeignLoadBalancerConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, okhttp3.OkHttpClient okHttpClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory, transformers);
+				loadBalancerClientFactory);
 	}

 }
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -66,7 +65,6 @@ import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils
 * load-balanced with Spring Cloud LoadBalancer.
 *
 * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @since 2.2.6
 */
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -82,11 +80,9 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {

 	private final LoadBalancerClientFactory loadBalancerClientFactory;

-	private final List<LoadBalancerFeignRequestTransformer> transformers;
-
 	/**
 	 * @deprecated in favour of
-	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
+	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory)}
 	 */
 	@Deprecated
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
@@ -96,31 +92,14 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = Collections.emptyList();
 	}

-	/**
-	 * @deprecated in favour of
-	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
-	 */
-	@Deprecated
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = Collections.emptyList();
-	}
-
-	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory,
-			List<LoadBalancerFeignRequestTransformer> transformers) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
-		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
-		this.loadBalancerClientFactory = loadBalancerClientFactory;
-		this.transformers = transformers;
 	}

 	@Override
@@ -179,7 +158,7 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 					}
 					String reconstructedUrl = loadBalancerClient.reconstructURI(retrievedServiceInstance, originalUri)
 							.toString();
-					feignRequest = buildRequest(request, reconstructedUrl, retrievedServiceInstance);
+					feignRequest = buildRequest(request, reconstructedUrl);
 				}
 			}
 			org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
@@ -212,16 +191,6 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 				request.charset(), request.requestTemplate());
 	}

-	protected Request buildRequest(Request request, String reconstructedUrl, ServiceInstance instance) {
-		Request newRequest = buildRequest(request, reconstructedUrl);
-		if (transformers != null) {
-			for (LoadBalancerFeignRequestTransformer transformer : transformers) {
-				newRequest = transformer.transformRequest(newRequest, instance);
-			}
-		}
-		return newRequest;
-	}
-
 	private RetryTemplate buildRetryTemplate(String serviceId, Request request, LoadBalancedRetryPolicy retryPolicy) {
 		RetryTemplate retryTemplate = new RetryTemplate();
 		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory.createBackOffPolicy(serviceId);
@@ -43,7 +43,6 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken;
 * @author Tim Ysewyn
 * @since 3.0.0
 */
-@Deprecated // spring-security-oauth2 reached EOL
 public class OAuth2FeignRequestInterceptor implements RequestInterceptor {

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-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.
@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * @author Olga Maciaszek-Sharma
 * @since 2.2.8
 */
-@ConfigurationProperties("spring.cloud.openfeign.encoder")
+@ConfigurationProperties("feign.encoder")
 public class FeignEncoderProperties {

 	/**
@@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * @author Nguyen Ky Thanh
 * @author Olga Maciaszek-Sharma
 */
-@ConfigurationProperties(prefix = "spring.cloud.openfeign.httpclient")
+@ConfigurationProperties(prefix = "feign.httpclient")
 public class FeignHttpClientProperties {

 	/**
@@ -95,7 +95,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * Additional {@link OkHttpClient}-specific properties.
 	 */
-	private OkHttp okHttp = new OkHttp();
+	private OkHttpClientProperties okHttpClientProperties = new OkHttpClientProperties();

 	public int getConnectionTimerRepeat() {
 		return connectionTimerRepeat;
@@ -169,12 +169,12 @@ public class FeignHttpClientProperties {
 		this.hc5 = hc5;
 	}

-	public OkHttp getOkHttp() {
-		return okHttp;
+	public OkHttpClientProperties getOkHttpClientProperties() {
+		return okHttpClientProperties;
 	}

-	public void setOkHttp(OkHttp okHttp) {
-		this.okHttp = okHttp;
+	public void setOkHttpClientProperties(OkHttpClientProperties okHttpClientProperties) {
+		this.okHttpClientProperties = okHttpClientProperties;
 	}

 	public static class Hc5Properties {
@@ -292,7 +292,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * {@link OkHttpClient}-specific properties.
 	 */
-	public static class OkHttp {
+	public static class OkHttpClientProperties {

 		/**
 		 * {@link OkHttpClient} read timeout; defaults to 60 seconds.
@@ -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.
@@ -196,21 +196,6 @@ public class PageJacksonModule extends Module {
 			return delegate.isEmpty();
 		}

-		@Override
-		public int hashCode() {
-			return delegate.hashCode();
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			return delegate.equals(obj);
-		}
-
-		@Override
-		public String toString() {
-			return delegate.toString();
-		}
-
 	}

 }
@@ -247,7 +247,7 @@ public class SpringEncoder implements Encoder {
 		return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType);
 	}

-	protected boolean binaryContentType(FeignOutputMessage outputMessage) {
+	private boolean binaryContentType(FeignOutputMessage outputMessage) {
 		MediaType contentType = outputMessage.getHeaders().getContentType();
 		return contentType == null || Stream
 				.of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF,
@@ -3,79 +3,73 @@
 	],
 	"properties": [
 		{
-			"name": "spring.cloud.openfeign.autoconfiguration.jackson.enabled",
+			"name": "feign.autoconfiguration.jackson.enabled",
 			"type": "java.lang.Boolean",
 			"description": "If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.circuitbreaker.enabled",
+			"name": "feign.circuitbreaker.enabled",
 			"type": "java.lang.Boolean",
 			"description": "If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.circuitbreaker.group.enabled",
+			"name": "feign.circuitbreaker.group.enabled",
 			"type": "java.lang.Boolean",
 			"description": "If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
-			"type": "java.lang.Boolean",
-			"description": "If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.",
-			"defaultValue": "false"
-		},
-		{
-			"name": "spring.cloud.openfeign.httpclient.enabled",
+			"name": "feign.httpclient.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables the use of the Apache HTTP Client by Feign.",
 			"defaultValue": "true"
 		},
 		{
-			"name": "spring.cloud.openfeign.httpclient.hc5.enabled",
+			"name": "feign.httpclient.hc5.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables the use of the Apache HTTP Client 5 by Feign.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.okhttp.enabled",
+			"name": "feign.okhttp.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables the use of the OK HTTP Client by Feign.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.compression.response.enabled",
+			"name": "feign.compression.response.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables the response from Feign to be compressed.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.compression.request.enabled",
+			"name": "feign.compression.request.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables the request sent by Feign to be compressed.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.metrics.enabled",
+			"name": "feign.metrics.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables metrics capability for Feign.",
 			"defaultValue": "true"
 		},
 		{
-			"name": "spring.cloud.openfeign.client.refresh-enabled",
+			"name": "feign.client.refresh-enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables options value refresh capability for Feign.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.oauth2.enabled",
+			"name": "feign.oauth2.enabled",
 			"type": "java.lang.Boolean",
 			"description": "Enables feign interceptor for managing oauth2 access token.",
 			"defaultValue": "false"
 		},
 		{
-			"name": "spring.cloud.openfeign.oauth2.load-balanced",
+			"name": "feign.oauth2.load-balanced",
 			"type": "java.lang.Boolean",
 			"description": "Enables load balancing for oauth2 access token provider.",
 			"defaultValue": "false"
@@ -47,7 +47,7 @@ class EnableFeignClientsTests {
 	@BeforeEach
 	void setUp() {
 		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
-				.properties("debug=true", "spring.cloud.openfeign.httpclient.enabled=false")
+				.properties("debug=true", "feign.httpclient.enabled=false")
 				.sources(EnableFeignClientsTests.PlainConfiguration.class).run();
 	}

@@ -27,7 +27,7 @@ import org.springframework.boot.test.context.assertj.AssertableApplicationContex
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration.CircuitBreakerPresentFeignTargeterConfiguration.AlphanumericCircuitBreakerNameResolver;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration.CircuitBreakerPresentFeignTargeterConfiguration.DefaultCircuitBreakerNameResolver;
 import org.springframework.cloud.openfeign.security.MockOAuth2ClientContext;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorBuilder;
@@ -51,30 +51,30 @@ class FeignAutoConfigurationTests {

 	private final ApplicationContextRunner runner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class))
-			.withPropertyValues("spring.cloud.openfeign.httpclient.enabled=false");
+			.withPropertyValues("feign.httpclient.enabled=false");

 	@Test
 	void shouldInstantiateDefaultTargeterWhenFeignCircuitBreakerIsDisabled() {
-		runner.withPropertyValues("spring.cloud.openfeign.circuitbreaker.enabled=false")
+		runner.withPropertyValues("feign.circuitbreaker.enabled=false")
 				.run(ctx -> assertOnlyOneTargeterPresent(ctx, DefaultTargeter.class));
 	}

 	@Test
 	void shouldInstantiateFeignCircuitBreakerTargeterWhenEnabled() {
 		runner.withBean(CircuitBreakerFactory.class, () -> mock(CircuitBreakerFactory.class))
-				.withPropertyValues("spring.cloud.openfeign.circuitbreaker.enabled=true").run(ctx -> {
+				.withPropertyValues("feign.circuitbreaker.enabled=true").run(ctx -> {
 					assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class);
 					assertThatFeignCircuitBreakerTargeterHasGroupEnabledPropertyWithValue(ctx, false);
 					assertThatFeignCircuitBreakerTargeterHasSameCircuitBreakerNameResolver(ctx,
-							AlphanumericCircuitBreakerNameResolver.class);
+							DefaultCircuitBreakerNameResolver.class);
 				});
 	}

 	@Test
 	void shouldInstantiateFeignCircuitBreakerTargeterWithEnabledGroup() {
 		runner.withBean(CircuitBreakerFactory.class, () -> mock(CircuitBreakerFactory.class))
-				.withPropertyValues("spring.cloud.openfeign.circuitbreaker.enabled=true")
-				.withPropertyValues("spring.cloud.openfeign.circuitbreaker.group.enabled=true").run(ctx -> {
+				.withPropertyValues("feign.circuitbreaker.enabled=true")
+				.withPropertyValues("feign.circuitbreaker.group.enabled=true").run(ctx -> {
 					assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class);
 					assertThatFeignCircuitBreakerTargeterHasGroupEnabledPropertyWithValue(ctx, true);
 				});
@@ -84,7 +84,7 @@ class FeignAutoConfigurationTests {
 	void shouldInstantiateFeignCircuitBreakerTargeterWhenEnabledWithCustomCircuitBreakerNameResolver() {
 		runner.withBean(CircuitBreakerFactory.class, () -> mock(CircuitBreakerFactory.class))
 				.withBean(CircuitBreakerNameResolver.class, CustomCircuitBreakerNameResolver::new)
-				.withPropertyValues("spring.cloud.openfeign.circuitbreaker.enabled=true").run(ctx -> {
+				.withPropertyValues("feign.circuitbreaker.enabled=true").run(ctx -> {
 					assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class);
 					assertThatFeignCircuitBreakerTargeterHasSameCircuitBreakerNameResolver(ctx,
 							CustomCircuitBreakerNameResolver.class);
@@ -93,8 +93,8 @@ class FeignAutoConfigurationTests {

 	@Test
 	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithoutInterceptors() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true")
-				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
+		runner.withPropertyValues("feign.oauth2.enabled=true").withBean(MockOAuth2ClientContext.class, "token")
+				.withBean(BaseOAuth2ProtectedResourceDetails.class)
 				.withBean(LoadBalancerInterceptor.class, () -> mock(LoadBalancerInterceptor.class)).run(ctx -> {
 					assertOauth2FeignRequestInterceptorExists(ctx);
 					assertAccessTokenProviderInterceptorNotExists(ctx, LoadBalancerInterceptor.class);
@@ -103,9 +103,8 @@ class FeignAutoConfigurationTests {

 	@Test
 	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithLoadBalancedInterceptor() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true",
-				"spring.cloud.openfeign.oauth2.load-balanced=true").withBean(MockOAuth2ClientContext.class, "token")
-				.withBean(BaseOAuth2ProtectedResourceDetails.class)
+		runner.withPropertyValues("feign.oauth2.enabled=true", "feign.oauth2.load-balanced=true")
+				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
 				.withBean(LoadBalancerInterceptor.class, () -> mock(LoadBalancerInterceptor.class)).run(ctx -> {
 					assertOauth2FeignRequestInterceptorExists(ctx);
 					assertAccessTokenProviderInterceptorExists(ctx, LoadBalancerInterceptor.class);
@@ -114,9 +113,9 @@ class FeignAutoConfigurationTests {

 	@Test
 	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithoutLoadBalancedInterceptorIfNoBeanPresent() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true",
-				"spring.cloud.openfeign.oauth2.load-balanced=true").withBean(MockOAuth2ClientContext.class, "token")
-				.withBean(BaseOAuth2ProtectedResourceDetails.class).run(ctx -> {
+		runner.withPropertyValues("feign.oauth2.enabled=true", "feign.oauth2.load-balanced=true")
+				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
+				.run(ctx -> {
 					assertOauth2FeignRequestInterceptorExists(ctx);
 					assertAccessTokenProviderInterceptorNotExists(ctx, LoadBalancerInterceptor.class);
 				});
@@ -124,8 +123,8 @@ class FeignAutoConfigurationTests {

 	@Test
 	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithCustomAccessTokenProviderInterceptor() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true")
-				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
+		runner.withPropertyValues("feign.oauth2.enabled=true").withBean(MockOAuth2ClientContext.class, "token")
+				.withBean(BaseOAuth2ProtectedResourceDetails.class)
 				.withBean(CustomOAuth2FeignRequestInterceptorConfigurer.class).run(ctx -> {
 					assertOauth2FeignRequestInterceptorExists(ctx);
 					assertAccessTokenProviderInterceptorExists(ctx, BasicAuthenticationInterceptor.class);
@@ -17,56 +17,35 @@
 package org.springframework.cloud.openfeign;

 import java.lang.reflect.Field;
-import java.util.stream.Stream;

-import feign.Client;
 import feign.Feign;
 import feign.Logger;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.ArgumentCaptor;

 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
 import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;

 /**
 * @author Matt King
 * @author Sam Kruglov
- * @author Felix Dittrich
- * @author Olga Maciaszek-Sharma
 */
 class FeignBuilderCustomizerTests {

-	private static final Targeter targeterSpy = spy(DefaultTargeter.class);
-
-	private static final Client defaultClient = mock(Client.class);
-
 	@Test
 	void testBuilderCustomizer() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration2.class);

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

-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.HEADERS);
 		assertFeignBuilderField(builder, "decode404", true);

@@ -83,17 +62,13 @@ class FeignBuilderCustomizerTests {

 	@Test
 	void testBuildCustomizerOrdered() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);

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

-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.FULL);
 		assertFeignBuilderField(builder, "decode404", true);

@@ -102,19 +77,15 @@ class FeignBuilderCustomizerTests {

 	@Test
 	void testBuildCustomizerOrderedWithAdditional() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);

 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		clientFactoryBean.addCustomizer(builder -> builder.logLevel(Logger.Level.BASIC));
 		clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
-		clientFactoryBean.getTarget();
+		FeignContext feignContext = context.getBean(FeignContext.class);

-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.BASIC);
 		assertFeignBuilderField(builder, "decode404", true);
 		assertFeignBuilderField(builder, "closeAfterDecode", false);
@@ -122,41 +93,16 @@ class FeignBuilderCustomizerTests {
 		context.close();
 	}

-	@ParameterizedTest(name = "should use custom HttpClient with config: {0}")
-	@MethodSource("testConfiguration")
-	void testBuildCustomizerWithCustomHttpClient(Class configClass) {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-		Client customClientMock = mock(Client.class);
-
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configClass);
-		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
-		clientFactoryBean.addCustomizer(builder -> builder.client(customClientMock));
-		clientFactoryBean.getTarget();
-
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
-		assertFeignBuilderField(builder, "client", customClientMock);
-
-		context.close();
-	}
-
-	private static FeignClientFactoryBean defaultFeignClientFactoryBean(String url) {
+	private static FeignClientFactoryBean defaultFeignClientFactoryBean() {
 		FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
 		feignClientFactoryBean.setContextId("test");
 		feignClientFactoryBean.setName("test");
 		feignClientFactoryBean.setType(FeignClientFactoryTests.TestType.class);
 		feignClientFactoryBean.setPath("");
-		if (url != null) {
-			feignClientFactoryBean.setUrl(url);
-		}
+		feignClientFactoryBean.setUrl("http://some.absolute.url");
 		return feignClientFactoryBean;
 	}

-	private static Stream<Class> testConfiguration() {
-		return Stream.of(SampleConfiguration3.class, LoadBalancedSampleConfiguration.class);
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration2 {
@@ -183,12 +129,7 @@ class FeignBuilderCustomizerTests {

 		@Bean
 		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean("http://some.absolute.url");
-		}
-
-		@Bean
-		Targeter targeter() {
-			return targeterSpy;
+			return defaultFeignClientFactoryBean();
 		}

 	}
@@ -226,29 +167,7 @@ class FeignBuilderCustomizerTests {

 		@Bean
 		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean("http://some.absolute.url");
-		}
-
-		@Bean
-		Targeter targeter() {
-			return targeterSpy;
-		}
-
-		@Bean
-		Client client() {
-			return defaultClient;
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(SampleConfiguration3.class)
-	protected static class LoadBalancedSampleConfiguration {
-
-		@Primary
-		@Bean
-		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean(null);
+			return defaultFeignClientFactoryBean();
 		}

 	}
@@ -79,7 +79,7 @@ class FeignClientMetricsEnabledConditionTests {
 		when(beanProvider.getIfAvailable()).thenReturn(null);

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment, never()).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment, never()).getProperty("feign.client.name");
 	}

 	@Test
@@ -89,7 +89,7 @@ class FeignClientMetricsEnabledConditionTests {
 		when(feignClientProperties.getConfig()).thenReturn(null);

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment, never()).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment, never()).getProperty("feign.client.name");
 	}

 	@Test
@@ -97,11 +97,11 @@ class FeignClientMetricsEnabledConditionTests {
 		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -109,11 +109,11 @@ class FeignClientMetricsEnabledConditionTests {
 		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn(null);
+		when(environment.getProperty("feign.client.name")).thenReturn(null);
 		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -121,12 +121,12 @@ class FeignClientMetricsEnabledConditionTests {
 		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("");
+		when(environment.getProperty("feign.client.name")).thenReturn("");
 		when(feignClientProperties.getConfig()).thenReturn(new HashMap<>());

 		assertThat(condition.matches(context, metadata)).isTrue();

-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -134,11 +134,11 @@ class FeignClientMetricsEnabledConditionTests {
 		FeignClientProperties feignClientProperties = mock(FeignClientProperties.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", null));

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -148,12 +148,12 @@ class FeignClientMetricsEnabledConditionTests {
 				FeignClientProperties.FeignClientConfiguration.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
 		when(feignClientConfig.getMetrics()).thenReturn(null);

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -163,12 +163,12 @@ class FeignClientMetricsEnabledConditionTests {
 				FeignClientProperties.FeignClientConfiguration.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
 		when(feignClientConfig.getMetrics()).thenReturn(new FeignClientProperties.MetricsProperties());

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -178,14 +178,14 @@ class FeignClientMetricsEnabledConditionTests {
 				FeignClientProperties.FeignClientConfiguration.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
 		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
 		metricsProperties.setEnabled(null);
 		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -195,14 +195,14 @@ class FeignClientMetricsEnabledConditionTests {
 				FeignClientProperties.FeignClientConfiguration.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
 		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
 		metricsProperties.setEnabled(true);
 		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);

 		assertThat(condition.matches(context, metadata)).isTrue();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 	@Test
@@ -212,14 +212,14 @@ class FeignClientMetricsEnabledConditionTests {
 				FeignClientProperties.FeignClientConfiguration.class);
 		when(beanProvider.getIfAvailable()).thenReturn(feignClientProperties);
 		when(context.getEnvironment()).thenReturn(environment);
-		when(environment.getProperty("spring.cloud.openfeign.client.name")).thenReturn("foo");
+		when(environment.getProperty("feign.client.name")).thenReturn("foo");
 		when(feignClientProperties.getConfig()).thenReturn(Maps.newHashMap("foo", feignClientConfig));
 		FeignClientProperties.MetricsProperties metricsProperties = new FeignClientProperties.MetricsProperties();
 		metricsProperties.setEnabled(false);
 		when(feignClientConfig.getMetrics()).thenReturn(metricsProperties);

 		assertThat(condition.matches(context, metadata)).isFalse();
-		verify(environment).getProperty("spring.cloud.openfeign.client.name");
+		verify(environment).getProperty("feign.client.name");
 	}

 }
@@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@DirtiesContext
@SpringBootTest(classes = FeignClientUsingConfigurerTest.Application.class, value = {
-		"spring.cloud.openfeign.client.config.default.loggerLevel=full",
-		"spring.cloud.openfeign.client.config.default.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor",
-		"spring.cloud.openfeign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
+		"feign.client.config.default.loggerLevel=full",
+		"feign.client.config.default.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor",
+		"feign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
 class FeignClientUsingConfigurerTest {

 	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
@@ -32,6 +32,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

+import javax.servlet.http.HttpServletRequest;
+
 import feign.Capability;
 import feign.Feign;
 import feign.InvocationHandlerFactory;
@@ -45,7 +47,6 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.micrometer.MicrometerCapability;
-import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -18,30 +18,24 @@ package org.springframework.cloud.openfeign;

 import java.util.Collections;

-import feign.Target;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;

 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.env.MockEnvironment;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.bind.annotation.GetMapping;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

 /**
 * @author Spencer Gibb
 * @author Gang Li
 * @author Michal Domagala
 * @author Szymon Linowski
- * @author Olga Maciaszek-Sharma
 */
 class FeignClientsRegistrarTests {

@@ -103,39 +97,14 @@ class FeignClientsRegistrarTests {

 	@Test
 	void shouldPassSubLevelFeignClient() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		((DefaultListableBeanFactory) context.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
-		context.register(TopLevelSubLevelTestConfig.class);
-		assertThatCode(context::refresh)
+		AnnotationConfigApplicationContext config = new AnnotationConfigApplicationContext();
+		((DefaultListableBeanFactory) config.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
+		config.register(TopLevelSubLevelTestConfig.class);
+		assertThatCode(() -> config.refresh())
 				.as("Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved")
 				.doesNotThrowAnyException();
 	}

-	@Test
-	@DisabledForJreRange(min = JRE.JAVA_16)
-	void shouldResolveNullUrl() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(NullUrlFeignClientTestConfig.class);
-		context.refresh();
-
-		Object feignClientBean = context.getBean(NullUrlFeignClient.class);
-
-		Object invocationHandlerLambda = ReflectionTestUtils.getField(feignClientBean, "h");
-		Target.HardCodedTarget<NullUrlFeignClient> target = (Target.HardCodedTarget<NullUrlFeignClient>) ReflectionTestUtils
-				.getField(invocationHandlerLambda, "arg$3");
-		assertThat(target.name()).isEqualTo("nullUrlFeignClient");
-		assertThat(target.url()).isEqualTo("http://nullUrlFeignClient");
-	}
-
-	@Test
-	void shouldResolveAndValidateNullName() {
-		assertThatIllegalStateException().isThrownBy(() -> {
-			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-			context.register(NullExpressionNameFeignClientTestConfig.class);
-			context.refresh();
-		});
-	}
-
 	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
 	protected interface FallbackClient {

@@ -153,16 +122,6 @@ class FeignClientsRegistrarTests {

 	}

-	@FeignClient(name = "nullUrlFeignClient", url = "${test.url:#{null}}", path = "${test.path:#{null}}")
-	protected interface NullUrlFeignClient {
-
-	}
-
-	@FeignClient(name = "${test.name:#{null}}")
-	protected interface NullExpressionNameFeignClient {
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
@@ -183,18 +142,4 @@ class FeignClientsRegistrarTests {

 	}

-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@EnableFeignClients(clients = NullUrlFeignClient.class)
-	protected static class NullUrlFeignClientTestConfig {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@EnableFeignClients(clients = NullExpressionNameFeignClient.class)
-	protected static class NullExpressionNameFeignClientTestConfig {
-
-	}
-
 }
@@ -45,9 +45,8 @@ class FeignCompressionTests {
 	@Test
 	void testInterceptors() {
 		new ApplicationContextRunner()
-				.withPropertyValues("spring.cloud.openfeign.compression.response.enabled=true",
-						"spring.cloud.openfeign.compression.request.enabled=true",
-						"spring.cloud.openfeign.okhttp.enabled=false")
+				.withPropertyValues("feign.compression.response.enabled=true", "feign.compression.request.enabled=true",
+						"feign.okhttp.enabled=false")
 				.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
 						FeignContentGzipEncodingAutoConfiguration.class, FeignAcceptGzipEncodingAutoConfiguration.class,
 						HttpClientConfiguration.class, PlainConfig.class))
@@ -60,8 +60,7 @@ class FeignHttpClient5ConfigurationTests {
 	@Test
 	void verifyHttpClient5AutoConfig() {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true",
-						"spring.cloud.openfeign.httpclient.enabled=false")
+				.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=false")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();

@@ -75,8 +74,7 @@ class FeignHttpClient5ConfigurationTests {
 	@Test
 	void hc5ShouldWinIfTheBothVersionsAvailable() {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true",
-						"spring.cloud.openfeign.httpclient.enabled=true")
+				.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=true")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();

@@ -91,8 +89,7 @@ class FeignHttpClient5ConfigurationTests {
 	@Test
 	void hc4ShouldBeTheDefaultIfHc5NotEnabled() {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=false",
-						"spring.cloud.openfeign.httpclient.enabled=true")
+				.properties("feign.httpclient.hc5.enabled=false", "feign.httpclient.enabled=true")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();

@@ -110,7 +107,7 @@ class FeignHttpClient5ConfigurationTests {
 		@Test
 		void hc4ShouldWinEvenHc5ConfigEnabled() {
 			ConfigurableApplicationContext context = new SpringApplicationBuilder()
-					.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true").web(WebApplicationType.NONE)
+					.properties("feign.httpclient.hc5.enabled=true").web(WebApplicationType.NONE)
 					.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();

 			verifyHc4BeansAvailable(context);
@@ -48,9 +48,8 @@ class FeignHttpClientConfigurationTests {
 	@BeforeEach
 	void setUp() {
 		this.context = new SpringApplicationBuilder()
-				.properties("debug=true", "spring.cloud.openfeign.httpclient.disableSslValidation=true")
-				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
-				.run();
+				.properties("debug=true", "feign.httpclient.disableSslValidation=true").web(WebApplicationType.NONE)
+				.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 	}

 	@AfterEach
@@ -31,12 +31,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.cloud.test.TestSocketUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.util.ReflectionUtils;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -48,8 +48,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = DEFINED_PORT,
-		value = { "spring.application.name=feignclienturltest", "spring.cloud.openfeign.circuitbreaker.enabled=false",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
+		value = { "spring.application.name=feignclienturltest", "feign.circuitbreaker.enabled=false",
+				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class FeignHttpClientUrlTests {

@@ -66,7 +66,7 @@ class FeignHttpClientUrlTests {

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

@@ -31,12 +31,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.cloud.test.TestSocketUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.util.ReflectionUtils;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -48,9 +48,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientUrlTestsWithRetryableLoadBalancer.TestConfig.class,
-		webEnvironment = DEFINED_PORT,
-		value = { "spring.application.name=feignclienturlwithretryableloadbalancertest",
-				"spring.cloud.openfeign.hystrix.enabled=false", "spring.cloud.openfeign.okhttp.enabled=false" })
+		webEnvironment = DEFINED_PORT, value = { "spring.application.name=feignclienturlwithretryableloadbalancertest",
+				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 class FeignHttpClientUrlTestsWithRetryableLoadBalancer {

@@ -67,7 +66,7 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer {

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

@@ -44,9 +44,8 @@ class FeignOkHttpConfigurationTests {
 	@BeforeEach
 	void setUp() {
 		this.context = new SpringApplicationBuilder()
-				.properties("debug=true", "spring.cloud.openfeign.httpclient.disableSslValidation=true",
-						"spring.cloud.openfeign.okhttp.enabled=true", "spring.cloud.openfeign.httpclient.enabled=false",
-						"spring.cloud.openfeign.httpclient.okhttp.read-timeout=9s")
+				.properties("debug=true", "feign.httpclient.disableSslValidation=true", "feign.okhttp.enabled=true",
+						"feign.httpclient.enabled=false", "feign.httpclient.okhttp-client-properties.read-timeout=9s")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();
 	}
@@ -41,10 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@SpringBootTest(classes = GzipDecodingTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=defaultGzipDecoderTests",
-				"spring.cloud.openfeign.compression.response.enabled=true",
-				"spring.cloud.openfeign.client.config.default.loggerLevel=none",
-				"spring.cloud.openfeign.metrics.enabled=false",
+		value = { "spring.application.name=defaultGzipDecoderTests", "feign.compression.response.enabled=true",
+				"feign.client.config.default.loggerLevel=none", "feign.metrics.enabled=false",
 				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
@DirtiesContext
 class GzipDecodingTests extends FeignClientFactoryBean {
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -52,8 +52,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@SpringBootTest(classes = BeansFeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=feignclienttest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"spring.cloud.openfeign.httpclient.enabled=false", "spring.cloud.openfeign.okhttp.enabled=false" })
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false" })
@DirtiesContext
 public class BeansFeignClientTests {

@@ -21,8 +21,9 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Function;

+import javax.servlet.http.HttpServletRequest;
+
 import feign.RequestInterceptor;
-import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.ObjectProvider;
@@ -59,7 +60,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 * @author John Niang
 */
@SpringBootTest(classes = AsyncCircuitBreakerTest.Application.class, webEnvironment = RANDOM_PORT,
-		properties = "spring.cloud.openfeign.circuitbreaker.enabled=true")
+		properties = "feign.circuitbreaker.enabled=true")
@AutoConfigureMockMvc
 class AsyncCircuitBreakerTest {

@@ -1,79 +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.circuitbreaker;
-
-import feign.Target;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.openfeign.CircuitBreakerNameResolver;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Ryan Baxter
- */
-public class CircuitBreakerAutoConfigurationTests {
-
-	@SpringBootTest(classes = CircuitBreakerTests.Application.class,
-			webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-			value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
-					"spring.cloud.openfeign.circuitbreaker.enabled=true",
-					"spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled=false" })
-	@Nested
-	class DefaultNamingStrategy {
-
-		@Autowired
-		CircuitBreakerNameResolver nameResolver;
-
-		@Test
-		public void assertDefaultNamingStrategy() throws Exception {
-			Target target = mock(Target.class);
-			when(target.type()).thenReturn(CircuitBreakerTests.TestClientWithFactory.class);
-			assertThat(nameResolver.resolveCircuitBreakerName("foo", target,
-					CircuitBreakerTests.TestClientWithFactory.class.getMethod("getHello")))
-							.isEqualTo("TestClientWithFactory#getHello()");
-		}
-
-	}
-
-	@SpringBootTest(classes = CircuitBreakerTests.Application.class,
-			webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-			value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
-					"spring.cloud.openfeign.circuitbreaker.enabled=true" })
-	@Nested
-	class AlphanumericNamingStrategy {
-
-		@Autowired
-		CircuitBreakerNameResolver nameResolver;
-
-		@Test
-		public void assertAlphanumericNamingStrategy() throws Exception {
-			Target target = mock(Target.class);
-			when(target.type()).thenReturn(CircuitBreakerTests.TestClientWithFactory.class);
-			assertThat(nameResolver.resolveCircuitBreakerName("foo", target,
-					CircuitBreakerTests.TestClientWithFactory.class.getMethod("getHello")))
-							.isEqualTo("TestClientWithFactorygetHello");
-		}
-
-	}
-
-}
@@ -16,7 +16,6 @@

 package org.springframework.cloud.openfeign.circuitbreaker;

-import java.io.IOException;
 import java.util.function.Function;

 import org.apache.commons.logging.Log;
@@ -38,24 +37,22 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.cloud.test.TestSocketUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

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

 /**
 * @author Spencer Gibb
 */
-@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT,
-		value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
-				"spring.cloud.openfeign.circuitbreaker.enabled=true" })
+@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT, value = {
+		"spring.application.name=springcircuittest", "spring.jmx.enabled=false", "feign.circuitbreaker.enabled=true" })
@DirtiesContext
 class CircuitBreakerTests {

@@ -65,15 +62,12 @@ class CircuitBreakerTests {
 	@Autowired
 	TestClient testClient;

-	@Autowired
-	ExceptionClient exceptionClient;
-
 	@Autowired
 	TestClientWithFactory testClientWithFactory;

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

 	@AfterAll
@@ -114,17 +108,6 @@ class CircuitBreakerTests {
 		assertThat(testClientWithFactory.getException()).isEqualTo("Fixed response");
 	}

-	@Test
-	void testRuntimeExceptionUnwrapped() {
-		assertThatExceptionOfType(UnsupportedOperationException.class)
-				.isThrownBy(() -> exceptionClient.getRuntimeException());
-	}
-
-	@Test
-	void testCheckedExceptionWrapped() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> exceptionClient.getCheckedException());
-	}
-
 	@FeignClient(name = "test", url = "http://localhost:${server.port}/", fallback = Fallback.class)
 	protected interface TestClient {

@@ -136,18 +119,6 @@ class CircuitBreakerTests {

 	}

-	@FeignClient(name = "exceptionClient", url = "http://localhost:${server.port}/",
-			fallbackFactory = ExceptionThrowingFallbackFactory.class)
-	protected interface ExceptionClient {
-
-		@GetMapping("/runtimeException")
-		Hello getRuntimeException();
-
-		@GetMapping("/runtimeException")
-		Hello getCheckedException() throws IOException;
-
-	}
-
 	@Component
 	static class Fallback implements TestClient {

@@ -185,25 +156,6 @@ class CircuitBreakerTests {

 	}

-	static class ExceptionThrowingFallbackFactory implements FallbackFactory<ExceptionClient> {
-
-		@Override
-		public ExceptionClient create(Throwable cause) {
-			return new ExceptionClient() {
-				@Override
-				public Hello getRuntimeException() {
-					throw new UnsupportedOperationException("Not implemented!");
-				}
-
-				@Override
-				public Hello getCheckedException() throws IOException {
-					throw new IOException();
-				}
-			};
-		}
-
-	}
-
 	static class FallbackWithFactory implements TestClientWithFactory {

 		@Override
@@ -221,7 +173,7 @@ class CircuitBreakerTests {
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
-	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class, ExceptionClient.class })
+	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements TestClient {

@@ -273,11 +225,6 @@ class CircuitBreakerTests {
 			return new TestFallbackFactory();
 		}

-		@Bean
-		ExceptionThrowingFallbackFactory exceptionThrowingFallbackFactory() {
-			return new ExceptionThrowingFallbackFactory();
-		}
-
 	}

 }
@@ -35,11 +35,11 @@ import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableExcept
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.cloud.test.TestSocketUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -54,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
@SpringBootTest(classes = CircuitBreakerWithNoFallbackTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
 		value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
-				"spring.cloud.openfeign.circuitbreaker.enabled=true" })
+				"feign.circuitbreaker.enabled=true" })
@DirtiesContext
 public class CircuitBreakerWithNoFallbackTests {

@@ -66,7 +66,7 @@ public class CircuitBreakerWithNoFallbackTests {

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

 	@AfterAll
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Jakub Narloch
 */
@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.cloud.openfeign.compression.response.enabled=true" })
+		value = { "feign.compression.response.enabled=true" })
@DirtiesContext
 class FeignAcceptEncodingTests {

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -47,7 +47,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Jakub Narloch
 */
@SpringBootTest(classes = FeignContentEncodingTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.cloud.openfeign.compression.request.enabled=true" })
+		value = { "feign.compression.request.enabled=true" })
 class FeignContentEncodingTests {

 	@Autowired
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -55,8 +55,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Hyeonmin Park
 */
@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.cloud.openfeign.compression.request.enabled=true",
-				"spring.cloud.openfeign.autoconfiguration.jackson.enabled=true" })
+		value = { "feign.compression.request.enabled=true", "feign.autoconfiguration.jackson.enabled=true" })
 class FeignPageableEncodingTests {

 	@Autowired
@@ -27,14 +27,9 @@ import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 * Utility class used for testing.
 *
 * @author Jakub Narloch
- * @author Olga Maciaszek-Sharma
 */
 final class Invoices {

-	private Invoices() {
-		throw new IllegalStateException("Can't instantiate a utility class");
-	}
-
 	public static List<Invoice> createInvoiceList(int count) {
 		final List<Invoice> invoices = new ArrayList<>();
 		for (int ind = 0; ind < count; ind++) {
@@ -74,21 +74,21 @@ public final class Request extends com.google.protobuf.GeneratedMessageV3 implem
 			while (!done) {
 				int tag = input.readTag();
 				switch (tag) {
-					case 0:
+				case 0:
+					done = true;
+					break;
+				default:
+					if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
 						done = true;
-						break;
-					default:
-						if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
-							done = true;
-						}
-						break;
-					case 8:
-						this.id_ = input.readInt32();
-						break;
-					case 18:
-						String s = input.readStringRequireUtf8();
-						this.msg_ = s;
-						break;
+					}
+					break;
+				case 8:
+					this.id_ = input.readInt32();
+					break;
+				case 18:
+					String s = input.readStringRequireUtf8();
+					this.msg_ = s;
+					break;
 				}
 			}
 		}
@@ -18,7 +18,7 @@ package org.springframework.cloud.openfeign.hateoas.app;

 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -21,11 +21,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -67,10 +65,9 @@ import static org.mockito.Mockito.when;
 * Commons project, so here we are only testing the interactions between
 * {@link FeignBlockingLoadBalancerClient} and its delegates.
 *
- * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @see <a href=
 * "https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
+ * @author Olga Maciaszek-Sharma
 */
@ExtendWith(MockitoExtension.class)
 class FeignBlockingLoadBalancerClientTests {
@@ -83,11 +80,8 @@ class FeignBlockingLoadBalancerClientTests {

 	private final LoadBalancerProperties loadBalancerProperties = new LoadBalancerProperties();

-	private final List<LoadBalancerFeignRequestTransformer> transformers = Arrays.asList(new InstanceIdTransformer(),
-			new ServiceIdTransformer());
-
 	private final FeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new FeignBlockingLoadBalancerClient(
-			delegate, loadBalancerClient, loadBalancerClientFactory, transformers);
+			delegate, loadBalancerClient, loadBalancerClientFactory);

 	@BeforeEach
 	void setUp() {
@@ -139,11 +133,9 @@ class FeignBlockingLoadBalancerClientTests {
 		Request actualRequest = captor.getValue();
 		assertThat(actualRequest.httpMethod()).isEqualTo(Request.HttpMethod.GET);
 		assertThat(actualRequest.url()).isEqualTo(url);
-		assertThat(actualRequest.headers()).hasSize(3);
+		assertThat(actualRequest.headers()).hasSize(1);
 		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
 				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		assertThat(actualRequest.headers()).containsEntry("X-ServiceId", Collections.singletonList("test"));
-		assertThat(actualRequest.headers()).containsEntry("X-InstanceId", Collections.singletonList("test-1"));
 		assertThat(new String(actualRequest.body())).isEqualTo("hello");
 	}

@@ -261,28 +253,4 @@ class FeignBlockingLoadBalancerClientTests {

 	}

-	private static class InstanceIdTransformer implements LoadBalancerFeignRequestTransformer {
-
-		@Override
-		public Request transformRequest(Request request, ServiceInstance instance) {
-			Map<String, Collection<String>> headers = new HashMap<>(request.headers());
-			headers.put("X-InstanceId", Collections.singletonList(instance.getInstanceId()));
-			return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
-					request.requestTemplate());
-		}
-
-	}
-
-	private static class ServiceIdTransformer implements 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()));
-			return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
-					request.requestTemplate());
-		}
-
-	}
-
 }
@@ -43,7 +43,7 @@ class FeignLoadBalancerAutoConfigurationTests {

 	@Test
 	void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=false",
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
 				"spring.cloud.loadbalancer.retry.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, Client.Default.class);
@@ -58,12 +58,12 @@ class FeignLoadBalancerAutoConfigurationTests {

 	@Test
 	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=false",
-				"spring.cloud.openfeign.okhttp.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false",
-				"spring.cloud.openfeign.httpclient.okhttp.read-timeout=9s");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+			"feign.okhttp.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false",
+			"feign.httpclient.okhttp-client-properties.read-timeout=9s");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		Map<String, FeignBlockingLoadBalancerClient> beans = context
-				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
+			.getBeansOfType(FeignBlockingLoadBalancerClient.class);
 		assertThat(beans).as("Missing bean of type %s", OkHttpClient.class).hasSize(1);
 		Client client = beans.get("feignClient").getDelegate();
 		assertThat(client).isInstanceOf(OkHttpClient.class);
@@ -75,8 +75,8 @@ class FeignLoadBalancerAutoConfigurationTests {

 	@Test
 	void shouldInstantiateHttpFeignClient5WhenEnabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=false",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.openfeign.httpclient.hc5.enabled=true",
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true",
 				"spring.cloud.loadbalancer.retry.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, ApacheHttp5Client.class);
@@ -84,8 +84,8 @@ class FeignLoadBalancerAutoConfigurationTests {

 	@Test
 	void shouldInstantiateHttpFeignClient5WhenBothHttpClientAndHttpClient5Enabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=true",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.openfeign.httpclient.hc5.enabled=true",
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=true",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true",
 				"spring.cloud.loadbalancer.retry.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, ApacheHttp5Client.class);
@@ -93,7 +93,7 @@ class FeignLoadBalancerAutoConfigurationTests {

 	@Test
 	void shouldInstantiateRetryableDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=false");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, Client.Default.class);
 	}
@@ -107,24 +107,24 @@ class FeignLoadBalancerAutoConfigurationTests {

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

 	@Test
 	void shouldInstantiateRetryableHttpFeignClient5WhenEnabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=false",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.openfeign.httpclient.hc5.enabled=true");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, ApacheHttp5Client.class);
 	}

 	@Test
 	void shouldInstantiateRetryableHttpFeignClient5WhenBothHttpClientAndHttpClient5Enabled() {
-		ConfigurableApplicationContext context = initContext("spring.cloud.openfeign.httpclient.enabled=true",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.openfeign.httpclient.hc5.enabled=true");
+		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=true",
+				"feign.okhttp.enabled=false", "feign.httpclient.hc5.enabled=true");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalancedWithRetries(context, ApacheHttp5Client.class);
 	}
@@ -22,11 +22,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -71,10 +69,9 @@ import static org.mockito.Mockito.when;
 * Commons project, so here we are only testing the interactions between
 * {@link RetryableFeignBlockingLoadBalancerClient} and its delegates.
 *
- * @author Olga Maciaszek-Sharma
- * @author changjin wei(魏昌进)
 * @see <a href=
 * "https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
+ * @author Olga Maciaszek-Sharma
 */
@ExtendWith(MockitoExtension.class)
 class RetryableFeignBlockingLoadBalancerClientTests {
@@ -89,11 +86,8 @@ class RetryableFeignBlockingLoadBalancerClientTests {

 	private final LoadBalancerProperties properties = new LoadBalancerProperties();

-	private final List<LoadBalancerFeignRequestTransformer> transformers = Arrays.asList(new InstanceIdTransformer(),
-			new ServiceIdTransformer());
-
 	private final RetryableFeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableFeignBlockingLoadBalancerClient(
-			delegate, loadBalancerClient, retryFactory, loadBalancerClientFactory, transformers);
+			delegate, loadBalancerClient, retryFactory, properties, loadBalancerClientFactory);

 	private final ServiceInstance serviceInstance = new DefaultServiceInstance("test-a", "test", "testhost", 80, false);

@@ -203,11 +197,9 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 		Request actualRequest = captor.getValue();
 		assertThat(actualRequest.httpMethod()).isEqualTo(Request.HttpMethod.GET);
 		assertThat(actualRequest.url()).isEqualTo(url);
-		assertThat(actualRequest.headers()).hasSize(3);
+		assertThat(actualRequest.headers()).hasSize(1);
 		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
 				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		assertThat(actualRequest.headers()).containsEntry("X-ServiceId", Collections.singletonList("test"));
-		assertThat(actualRequest.headers()).containsEntry("X-InstanceId", Collections.singletonList("test-1"));
 		assertThat(new String(actualRequest.body())).isEqualTo("hello");
 	}

@@ -318,28 +310,4 @@ class RetryableFeignBlockingLoadBalancerClientTests {

 	}

-	private static class InstanceIdTransformer implements LoadBalancerFeignRequestTransformer {
-
-		@Override
-		public Request transformRequest(Request request, ServiceInstance instance) {
-			Map<String, Collection<String>> headers = new HashMap<>(request.headers());
-			headers.put("X-InstanceId", Collections.singletonList(instance.getInstanceId()));
-			return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
-					request.requestTemplate());
-		}
-
-	}
-
-	private static class ServiceIdTransformer implements 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()));
-			return Request.create(request.httpMethod(), request.url(), headers, request.body(), request.charset(),
-					request.requestTemplate());
-		}
-
-	}
-
 }
@@ -16,7 +16,8 @@

 package org.springframework.cloud.openfeign.security;

-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,8 +44,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		webEnvironment = RANDOM_PORT,
 		value = { "security.oauth2.client.id=test-service", "security.oauth2.client.client-id=test-service",
 				"security.oauth2.client.client-secret=test-service",
-				"security.oauth2.client.grant-type=client_credentials", "spring.cloud.openfeign.oauth2.enabled=true",
-				"spring.cloud.openfeign.oauth2.load-balanced=true" })
+				"security.oauth2.client.grant-type=client_credentials", "feign.oauth2.enabled=true",
+				"feign.oauth2.load-balanced=true" })
@DirtiesContext
 public class AccessTokenProviderWithLoadBalancerInterceptorTests {

@@ -16,7 +16,8 @@

 package org.springframework.cloud.openfeign.security;

-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		webEnvironment = RANDOM_PORT,
 		value = { "security.oauth2.client.id=test-service", "security.oauth2.client.client-id=test-service",
 				"security.oauth2.client.client-secret=test-service",
-				"security.oauth2.client.grant-type=client_credentials", "spring.cloud.openfeign.oauth2.enabled=true" })
+				"security.oauth2.client.grant-type=client_credentials", "feign.oauth2.enabled=true" })
@DirtiesContext
 public class AccessTokenProviderWithoutLoadBalancerInterceptorTests {

@@ -28,11 +28,11 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.cloud.test.TestSocketUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -49,7 +49,7 @@ public class AbstractSpringMvcContractIntegrationTests {

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

 	@AfterAll
@@ -71,18 +71,14 @@ class FeignHttpClientPropertiesTests {

 	@Test
 	void testCustomization() {
-		TestPropertyValues.of("spring.cloud.openfeign.httpclient.maxConnections=2",
-				"spring.cloud.openfeign.httpclient.connectionTimeout=2",
-				"spring.cloud.openfeign.httpclient.maxConnectionsPerRoute=2",
-				"spring.cloud.openfeign.httpclient.timeToLive=2",
-				"spring.cloud.openfeign.httpclient.disableSslValidation=true",
-				"spring.cloud.openfeign.httpclient.followRedirects=false",
-				"spring.cloud.openfeign.httpclient.disableSslValidation=true",
-				"spring.cloud.openfeign.httpclient.followRedirects=false",
-				"spring.cloud.openfeign.httpclient.hc5.poolConcurrencyPolicy=lax",
-				"spring.cloud.openfeign.httpclient.hc5.poolReusePolicy=lifo",
-				"spring.cloud.openfeign.httpclient.hc5.socketTimeout=200",
-				"spring.cloud.openfeign.httpclient.hc5.socketTimeoutUnit=milliseconds").applyTo(this.context);
+		TestPropertyValues
+				.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2",
+						"feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2",
+						"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
+						"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
+						"feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo",
+						"feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds")
+				.applyTo(this.context);
 		setupContext();
 		assertThat(getProperties().getMaxConnections()).isEqualTo(2);
 		assertThat(getProperties().getConnectionTimeout()).isEqualTo(2);
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -30,8 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Ram Anaswara
 */
@SpringBootTest(classes = SpringMvcContractSlashEncodingIntegrationTests.Config.class,
-		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
-		properties = { "spring.cloud.openfeign.client.decodeSlash=false" })
+		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = { "feign.client.decodeSlash=false" })
 public class SpringMvcContractSlashEncodingIntegrationTests extends AbstractSpringMvcContractIntegrationTests {

 	@Autowired
@@ -78,9 +78,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
 * @author Olga Maciaszek-Sharma
 * @author Szymon Linowski
 * @author Sam Kruglov
- * @author Bhavya Agrawal
- **/
-
+ */
 class SpringMvcContractTests {

 	private static final Class<?> EXECUTABLE_TYPE;
@@ -173,39 +171,6 @@ class SpringMvcContractTests {
 		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo("id");
 	}

-	@Test
-	void testProcessAnnotations_SimpleNoPath() throws Exception {
-		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest");
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/");
-		assertThat(data.template().method()).isEqualTo("GET");
-		assertThat(data.template().headers().get("Accept").iterator().next())
-				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
-	}
-
-	@Test
-	void testProcessAnnotations_SimplePathIsOnlyASlash() throws Exception {
-		Method method = TestTemplate_Simple.class.getDeclaredMethod("getSlashPath", String.class);
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/?id=" + "{id}");
-		assertThat(data.template().method()).isEqualTo("GET");
-		assertThat(data.template().headers().get("Accept").iterator().next())
-				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
-	}
-
-	@Test
-	void testProcessAnnotations_MissingLeadingSlashInPath() throws Exception {
-		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTestNoLeadingSlash", String.class);
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/test?name=" + "{name}");
-		assertThat(data.template().method()).isEqualTo("GET");
-		assertThat(data.template().headers().get("Accept").iterator().next())
-				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
-	}
-
 	@Test
 	void testProcessAnnotations_SimpleGetMapping() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("getMappingTest", String.class);
@@ -651,12 +616,6 @@ class SpringMvcContractTests {
 		@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject postMappingTest(@RequestBody TestObject object);

-		@GetMapping(value = "/", produces = MediaType.APPLICATION_JSON_VALUE)
-		ResponseEntity<TestObject> getSlashPath(@RequestParam("id") String id);
-
-		@GetMapping(path = "test", produces = MediaType.APPLICATION_JSON_VALUE)
-		ResponseEntity<TestObject> getTestNoLeadingSlash(@RequestParam("name") String name);
-
 	}

 	@RequestMapping("/prepend/{classId}")
@@ -63,8 +63,7 @@ import static org.mockito.Mockito.mockingDetails;
 * @author Ryan Baxter
 * @author Olga Maciaszek-Sharma
 */
-@SpringBootTest(properties = { "spring.cloud.openfeign.okhttp.enabled: false",
-		"spring.cloud.loadbalancer.retry.enabled=false" })
+@SpringBootTest(properties = { "feign.okhttp.enabled: false", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class ApacheHttpClientConfigurationTests {

@@ -24,13 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * {@link Object#equals(Object)} and {@link Object#hashCode()}.
 *
 * @author Jonatan Ivanov
- * @author Olga Maciaszek-Sharma
 */
-public final class EqualsAndHashCodeAssert {
-
-	private EqualsAndHashCodeAssert() {
-		throw new IllegalStateException("Can't instantiate a utility class");
-	}
+public class EqualsAndHashCodeAssert {

 	/**
 	 * Checks if equals is reflexive: for any non-null reference value x, x.equals(x)
@@ -46,9 +46,9 @@ import static org.mockito.Mockito.mockingDetails;
 * @author Ryan Baxter
 * @author Olga Maciaszek-Sharma
 */
-@SpringBootTest(properties = { "spring.cloud.openfeign.okhttp.enabled: true",
-		"spring.cloud.httpclientfactories.ok.enabled: true", "spring.cloud.openfeign.okhttp.enabled: true",
-		"spring.cloud.openfeign.httpclient.enabled: false", "spring.cloud.loadbalancer.retry.enabled=false" })
+@SpringBootTest(properties = { "feign.okhttp.enabled: true", "spring.cloud.httpclientfactories.ok.enabled: true",
+		"feign.okhttp.enabled: true", "feign.httpclient.enabled: false",
+		"spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class OkHttpClientConfigurationTests {

@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -47,8 +47,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 */
@SpringBootTest(classes = FeignClientNotPrimaryTests.Application.class, webEnvironment = RANDOM_PORT,
 		value = { "spring.application.name=feignclientnotprimarytest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"spring.cloud.openfeign.httpclient.enabled=false", "spring.cloud.openfeign.okhttp.enabled=false" })
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false" })
@DirtiesContext
 class FeignClientNotPrimaryTests {

@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
@@ -55,8 +55,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "spring.cloud.openfeign.circuitbreaker.enabled=false",
-				"spring.cloud.openfeign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
+		value = { "spring.application.name=feignclienttest", "feign.circuitbreaker.enabled=false",
+				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class FeignHttpClientTests {

@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
@@ -54,8 +54,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignOkHttpTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "spring.cloud.openfeign.circuitbreaker.enabled=false",
-				"spring.cloud.openfeign.httpclient.enabled=false", "spring.cloud.openfeign.okhttp.enabled=true",
+		value = { "spring.application.name=feignclienttest", "feign.circuitbreaker.enabled=false",
+				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true",
 				"spring.cloud.httpclientfactories.ok.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class FeignOkHttpTests {
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -47,9 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@SpringBootTest(classes = IterableParameterTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=iterableparametertest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"spring.cloud.openfeign.httpclient.enabled=false", "spring.cloud.openfeign.okhttp.enabled=false",
-				"spring.cloud.openfeign.circuitbreaker.enabled=false" })
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.circuitbreaker.enabled=false" })
@DirtiesContext
 class IterableParameterTests {

@@ -32,12 +32,13 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
+
 import feign.Client;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.codec.EncodeException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
@@ -98,9 +99,9 @@ import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
 */
@SpringBootTest(classes = ValidFeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=feignclienttest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"spring.cloud.openfeign.httpclient.enabled=false", "spring.cloud.openfeign.okhttp.enabled=false",
-				"spring.cloud.openfeign.circuitbreaker.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false" })
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG", "feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=false", "feign.circuitbreaker.enabled=true",
+				"spring.cloud.loadbalancer.retry.enabled=false" })
@DirtiesContext
 class ValidFeignClientTests {

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -43,7 +43,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Ryan Baxter
 */
@SpringBootTest(classes = FeignClientEnvVarTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "spring.cloud.openfeign.httpclient.enabled=false",
+		value = { "spring.application.name=feignclienttest", "feign.httpclient.enabled=false",
 				"basepackage=org.springframework.cloud.openfeign.testclients" })
@DirtiesContext
 class FeignClientEnvVarTests {
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
@@ -45,7 +45,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@SpringBootTest(classes = FeignClientScanningTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest", "spring.cloud.openfeign.httpclient.enabled=false" })
+		value = { "spring.application.name=feignclienttest", "feign.httpclient.enabled=false" })
@DirtiesContext
 class FeignClientScanningTests {

@@ -24,8 +24,8 @@ management.endpoints.web.expose: '*'

 ---
 spring.config.activate.on-profile: no-metrics
-spring.cloud.openfeign.metrics.enabled: false
+feign.metrics.enabled: false

 ---
 spring.config.activate.on-profile: no-foo-metrics
-spring.cloud.openfeign.client.config.foo.metrics.enabled: false
+feign.client.config.foo.metrics.enabled: false
@@ -1,27 +1,27 @@
 # This configuration used by test class FeignClientUsingPropertiesTests
 logging.level.org.springframework.cloud.openfeign=debug
-spring.cloud.openfeign.client.default-to-properties=true
-spring.cloud.openfeign.client.default-config=default
-spring.cloud.openfeign.client.config.default.connectTimeout=5000
-spring.cloud.openfeign.client.config.default.readTimeout=5000
-spring.cloud.openfeign.client.config.default.loggerLevel=full
-spring.cloud.openfeign.client.config.default.errorDecoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.DefaultErrorDecoder
-spring.cloud.openfeign.client.config.default.retryer=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoRetryer
-spring.cloud.openfeign.client.config.default.decode404=true
-spring.cloud.openfeign.client.config.default.capabilities=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoOpCapability
-spring.cloud.openfeign.client.config.default.queryMapEncoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoOpQueryMapEncoder
-spring.cloud.openfeign.client.config.foo.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor
-spring.cloud.openfeign.client.config.foo.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor
-spring.cloud.openfeign.client.config.singleValue.defaultRequestHeaders[singleValueHeaders]=header
-spring.cloud.openfeign.client.config.singleValue.defaultQueryParameters[singleValueParameters]=parameter
-spring.cloud.openfeign.client.config.multipleValue.defaultRequestHeaders[multipleValueHeaders]=header1,header2
-spring.cloud.openfeign.client.config.multipleValue.defaultQueryParameters[multipleValueParameters]=parameter1,parameter2
-spring.cloud.openfeign.client.config.bar.connectTimeout=1000
-spring.cloud.openfeign.client.config.bar.readTimeout=1000
-spring.cloud.openfeign.client.config.form.encoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FormEncoder
-spring.cloud.openfeign.client.config.unwrap.connectTimeout=1000
-spring.cloud.openfeign.client.config.unwrap.readTimeout=1000
-spring.cloud.openfeign.client.config.unwrap.exceptionPropagationPolicy=unwrap
-spring.cloud.openfeign.client.config.readTimeout.readTimeout=1000
-spring.cloud.openfeign.client.config.connectTimeout.connectTimeout=1000
-spring.cloud.openfeign.client.config.default.followRedirects=false
+feign.client.default-to-properties=true
+feign.client.default-config=default
+feign.client.config.default.connectTimeout=5000
+feign.client.config.default.readTimeout=5000
+feign.client.config.default.loggerLevel=full
+feign.client.config.default.errorDecoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.DefaultErrorDecoder
+feign.client.config.default.retryer=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoRetryer
+feign.client.config.default.decode404=true
+feign.client.config.default.capabilities=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoOpCapability
+feign.client.config.default.queryMapEncoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.NoOpQueryMapEncoder
+feign.client.config.foo.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor
+feign.client.config.foo.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor
+feign.client.config.singleValue.defaultRequestHeaders[singleValueHeaders]=header
+feign.client.config.singleValue.defaultQueryParameters[singleValueParameters]=parameter
+feign.client.config.multipleValue.defaultRequestHeaders[multipleValueHeaders]=header1,header2
+feign.client.config.multipleValue.defaultQueryParameters[multipleValueParameters]=parameter1,parameter2
+feign.client.config.bar.connectTimeout=1000
+feign.client.config.bar.readTimeout=1000
+feign.client.config.form.encoder=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FormEncoder
+feign.client.config.unwrap.connectTimeout=1000
+feign.client.config.unwrap.readTimeout=1000
+feign.client.config.unwrap.exceptionPropagationPolicy=unwrap
+feign.client.config.readTimeout.readTimeout=1000
+feign.client.config.connectTimeout.connectTimeout=1000
+feign.client.config.default.followRedirects=false
@@ -1,10 +1,10 @@
 # This configuration used by test class FeignClientWithRefreshableOptionsTest
 logging.level.org.springframework.cloud.openfeign=debug
-spring.cloud.openfeign.client.default-to-properties=true
-spring.cloud.openfeign.client.default-config=default
-spring.cloud.openfeign.client.refresh-enabled=true
-spring.cloud.openfeign.client.config.default.connectTimeout=5000
-spring.cloud.openfeign.client.config.default.readTimeout=5000
-spring.cloud.openfeign.client.config.default.loggerLevel=full
-spring.cloud.openfeign.client.config.connectTimeout.connectTimeout=2000
-spring.cloud.openfeign.client.config.readTimeout.readTimeout=2000
+feign.client.default-to-properties=true
+feign.client.default-config=default
+feign.client.refresh-enabled=true
+feign.client.config.default.connectTimeout=5000
+feign.client.config.default.readTimeout=5000
+feign.client.config.default.loggerLevel=full
+feign.client.config.connectTimeout.connectTimeout=2000
+feign.client.config.readTimeout.readTimeout=2000
@@ -6,19 +6,18 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.0</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>3.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
 		<feign.version>11.8</feign.version>
 		<feign-form.version>3.8.0</feign-form.version>
-		<!-- Deprecated - reached EOL -->
-		<spring-security-oauth2-autoconfigure.version>2.5.2</spring-security-oauth2-autoconfigure.version>
+		<spring-security-oauth2-autoconfigure.version>2.1.2.RELEASE</spring-security-oauth2-autoconfigure.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -58,7 +57,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>
@@ -69,7 +68,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>
@@ -87,7 +86,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>
@@ -98,7 +97,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>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -12,8 +12,6 @@
 	<suppress files=".*ProtobufSpringEncoderTest.*" checks="LineLengthCheck" />
 	<suppress files=".*ProtobufTest.*" checks="LineLengthCheck" />
 	<suppress files=".*Hello.*" checks="RedundantModifier"/>
-	<suppress files=".*test.*" checks="JavadocStyle"/>
-	<suppress files=".*test.*" checks="JavadocVariable"/>
 	<!-- Important -->
 	<suppress files=".*HttpEncoding.*" checks="InterfaceIsTypeCheck" />
 </suppressions>
Author	SHA1	Message	Date
Olga MaciaszekSharma	dc3a73c055	Add test. Fix typo in docs. Update config properties documentation.	2022-01-14 19:57:40 +01:00
Olga MaciaszekSharma	ad9998e68c	Allow configuring OkHttpClient readTimeout via properties.	2022-01-14 19:36:00 +01:00