Bumping versions

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 3.0.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ 3.0.x ]
 
 jobs:
   build:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        java: ["17"]
+        java: ["8", "11", "16"]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -20,4 +20,5 @@ _site/
 *.swo
 .vscode/
 .flattened-pom.xml
+.sdkmanrc
 

.sdkmanrc

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

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.0.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>

docs/src/main/asciidoc/_configprops.adoc

@@ -1,37 +1,35 @@
 |===
 |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.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used.
+|feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
+|feign.httpclient.connection-timeout | `2000` | 
+|feign.httpclient.connection-timer-repeat | `3000` | 
+|feign.httpclient.disable-ssl-validation | `false` | 
+|feign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign.
+|feign.httpclient.follow-redirects | `true` | 
+|feign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
+|feign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
+|feign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
+|feign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
+|feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
+|feign.httpclient.max-connections | `200` | 
+|feign.httpclient.max-connections-per-route | `50` | 
+|feign.httpclient.time-to-live | `900` | 
+|feign.httpclient.time-to-live-unit |  | 
+|feign.metrics.enabled | `true` | Enables metrics capability for Feign.
+|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
 
-|===
+|===

docs/src/main/asciidoc/index.adoc

@@ -1 +0,0 @@
-include::spring-cloud-openfeign.adoc[]

docs/src/main/asciidoc/index.adoc

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

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

@@ -52,9 +52,6 @@ public interface StoreClient {
 
 	@RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
 	Store update(@PathVariable("storeId") Long storeId, Store store);
-
-	@RequestMapping(method = RequestMethod.DELETE, value = "/stores/{storeId:\\d+}")
-	void delete(@PathVariable Long storeId);
 }
 ----
 
@@ -122,7 +119,6 @@ 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`.
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
 * `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
@@ -130,7 +126,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:
@@ -142,7 +138,7 @@ Spring Cloud OpenFeign _does not_ provide the following beans by default for fei
 * `Collection<RequestInterceptor>`
 * `SetterFactory`
 * `QueryMapEncoder`
-* `Capability` (`MicrometerCapability` and `CachingCapability` are provided by default)
+* `Capability` (`MicrometerCapability` is provided by default)
 
 A bean of `Retryer.NEVER_RETRY` with the type `Retryer` is created by default, which will disable retrying.
 Notice this retrying behavior is different from the Feign default one, where it will automatically retry IOExceptions,
@@ -173,58 +169,53 @@ 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
+				metrics.enabled: false
 ----
 
 Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.
 
-If you prefer using configuration properties to configured all `@FeignClient`, you can create configuration properties with `default` feign name.
+If you prefer using configuration properties to configure all `@FeignClient`, you can create configuration properties with `default` feign name.
 
-You can use `spring.cloud.openfeign.client.config.feignName.defaultQueryParameters` and `spring.cloud.openfeign.client.config.feignName.defaultRequestHeaders` to specify query parameters and headers that will be sent with every request of the client named `feignName`.
+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 +261,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 +332,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,7 +365,7 @@ 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-cloud-feign-circuitbreaker-fallback]]
@@ -509,21 +500,29 @@ 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.
 
+For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
+
+[source,java]
+----
+feign.compression.response.enabled=true
+feign.compression.response.useGzipDecoder=true
+----
+
 === Feign logging
 
 A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
@@ -580,8 +579,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.
 
@@ -589,11 +588,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:
 
@@ -608,22 +607,6 @@ public class FooConfiguration {
 }
 ----
 
-=== Feign Caching
-
-If `@EnableCaching` annotation is used, a `CachingCapability` bean is created and registered so that your Feign client recognizes `@Cache*` annotations on its interface:
-
-[source,java,indent=0]
-----
-public interface DemoClient {
-
-	@GetMapping("/demo/{filterParam}")
-    @Cacheable(cacheNames = "demo-cache", key = "#keyParam")
-	String demoEndpoint(String keyParam, @PathVariable String filterParam);
-}
-----
-
-You can also disable the feature via property `spring.cloud.openfeign.cache.enabled=false`.
-
 === Feign @QueryMap support
 
 The OpenFeign `@QueryMap` annotation provides support for POJOs to be used as
@@ -711,21 +694,20 @@ public interface DemoTemplate {
 ----
 
 === Feign `CollectionFormat` support
-We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation.
-You can annotate a Feign client method (or the whole class to affect all methods) with it by passing the desired `feign.CollectionFormat` as annotation value.
+We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation.You can annotate a Feign client method with it by passing the desired `feign.CollectionFormat` as annotation value.
 
 In the following example, the `CSV` format is used instead of the default `EXPLODED` to process the method.
 
 [source,java,indent=0]
 ----
 @FeignClient(name = "demo")
-protected interface PageableFeignClient {
+	protected interface PageableFeignClient {
 
-    @CollectionFormat(feign.CollectionFormat.CSV)
-    @GetMapping(path = "/page")
-    ResponseEntity performRequest(Pageable page);
+		@CollectionFormat(feign.CollectionFormat.CSV)
+		@GetMapping(path = "/page")
+		ResponseEntity performRequest(Pageable page);
 
-}
+	}
 ----
 
 TIP: Set the `CSV` format while sending `Pageable` as a query parameter in order for it to be encoded correctly.
@@ -743,7 +725,7 @@ To work around this problem you can use an `ObjectProvider` when autowiring your
 [source,java,indent=0]
 ----
 @Autowired
-ObjectProvider<TestFeignClient> testFeignClient;
+ObjectProvider<TestFeginClient> testFeginClient;
 ----
 
 === Spring Data Support
@@ -752,7 +734,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
@@ -761,20 +743,10 @@ 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
-----
-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
-----
 
 == Configuration properties
 

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>3.0.8-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.0.5</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.0.7-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>
@@ -72,15 +79,6 @@
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<configuration>
-					<ignoredResourcePatterns>
-						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-					</ignoredResourcePatterns>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.0.8-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -61,16 +61,15 @@
 			<artifactId>reactor-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava-reactive-streams</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.annotation</groupId>
-					<artifactId>javax.annotation-api</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -120,6 +119,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>
@@ -129,16 +133,6 @@
 			<groupId>org.springframework.security.oauth.boot</groupId>
 			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>javax.activation-api</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -155,6 +149,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-test-support</artifactId>
@@ -184,7 +183,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.19.3</version>
+			<version>3.19.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.Capability;
-import feign.InvocationHandlerFactory;
-
-import org.springframework.cache.interceptor.CacheInterceptor;
-
-/**
- * Allows Spring's @Cache* annotations to be declared on the feign client's methods.
- *
- * @author Sam Kruglov
- */
-public class CachingCapability implements Capability {
-
-	private final CacheInterceptor cacheInterceptor;
-
-	public CachingCapability(CacheInterceptor cacheInterceptor) {
-		this.cacheInterceptor = cacheInterceptor;
-	}
-
-	@Override
-	public InvocationHandlerFactory enrich(InvocationHandlerFactory invocationHandlerFactory) {
-		return new FeignCachingInvocationHandlerFactory(invocationHandlerFactory, cacheInterceptor);
-	}
-
-}

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

@@ -25,10 +25,9 @@ import java.lang.annotation.Target;
  * Indicates which collection format should be used while processing the annotated method.
  *
  * @author Olga Maciaszek-Sharma
- * @author Sam Kruglov
  * @see feign.CollectionFormat
  */
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CollectionFormat {
 

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

@@ -18,15 +18,15 @@ package org.springframework.cloud.openfeign;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.PreDestroy;
+
 import com.fasterxml.jackson.databind.Module;
-import feign.Capability;
 import feign.Client;
 import feign.Feign;
 import feign.RequestInterceptor;
@@ -34,7 +34,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;
@@ -51,18 +50,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.cloud.client.actuator.HasFeatures;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
-import org.springframework.cloud.client.loadbalancer.RetryLoadBalancerInterceptor;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
-import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorConfigurer;
+import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
@@ -76,8 +72,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 
-import static org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorBuilder.buildWithConfigurers;
-
 /**
  * @author Spencer Gibb
  * @author Julien Roy
@@ -88,13 +82,12 @@ import static org.springframework.cloud.openfeign.security.OAuth2FeignRequestInt
  * @author Nguyen Ky Thanh
  * @author Andrii Bohutskyi
  * @author Kwangyong Kim
- * @author Sam Kruglov
- * @author Wojciech Mąka
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Feign.class)
 @EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class,
 		FeignEncoderProperties.class })
+@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {
 
 	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);
@@ -114,16 +107,9 @@ public class FeignAutoConfiguration {
 		return context;
 	}
 
-	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.cache.enabled", matchIfMissing = true)
-	@ConditionalOnBean(CacheInterceptor.class)
-	public Capability cachingCapability(CacheInterceptor cacheInterceptor) {
-		return new CachingCapability(cacheInterceptor);
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
-	@ConditionalOnProperty(value = "spring.cloud.openfeign.autoconfiguration.jackson.enabled", havingValue = "true")
+	@ConditionalOnProperty(value = "feign.autoconfiguration.jackson.enabled", havingValue = "true")
 	protected static class FeignJacksonConfiguration {
 
 		@Bean
@@ -154,7 +140,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
@@ -173,7 +159,7 @@ public class FeignAutoConfiguration {
 		@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);
@@ -197,7 +183,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 {
 
@@ -265,7 +251,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;
@@ -274,8 +260,8 @@ public class FeignAutoConfiguration {
 		@ConditionalOnMissingBean(ConnectionPool.class)
 		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-			int maxTotalConnections = httpClientProperties.getMaxConnections();
-			long timeToLive = httpClientProperties.getTimeToLive();
+			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+			Long timeToLive = httpClientProperties.getTimeToLive();
 			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
 			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 		}
@@ -283,13 +269,12 @@ public class FeignAutoConfiguration {
 		@Bean
 		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory, ConnectionPool connectionPool,
 				FeignHttpClientProperties httpClientProperties) {
-			boolean followRedirects = httpClientProperties.isFollowRedirects();
-			int connectTimeout = httpClientProperties.getConnectionTimeout();
-			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+			Boolean followRedirects = httpClientProperties.isFollowRedirects();
+			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+			Boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
 			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
 					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
-					.readTimeout(readTimeout).connectionPool(connectionPool).build();
+					.connectionPool(connectionPool).build();
 			return this.okHttpClient;
 		}
 
@@ -312,7 +297,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 {
 
@@ -326,33 +311,16 @@ public class FeignAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OAuth2ClientContext.class)
-	@ConditionalOnProperty("spring.cloud.openfeign.oauth2.enabled")
+	@ConditionalOnProperty("feign.oauth2.enabled")
+	@Deprecated // spring-security-oauth2 reached EOL
 	protected static class Oauth2FeignConfiguration {
 
-		@ConditionalOnBean({ RetryLoadBalancerInterceptor.class, OAuth2ClientContext.class,
-				OAuth2ProtectedResourceDetails.class })
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
-		@Bean
-		public OAuth2FeignRequestInterceptorConfigurer retryLoadBalancerInterceptorInjectingConfigurer(
-				final RetryLoadBalancerInterceptor loadBalancerInterceptor) {
-			return builder -> builder.withAccessTokenProviderInterceptors(loadBalancerInterceptor);
-		}
-
-		@ConditionalOnBean({ LoadBalancerInterceptor.class, OAuth2ClientContext.class,
-				OAuth2ProtectedResourceDetails.class })
-		@ConditionalOnProperty(value = "spring.cloud.openfeign.oauth2.load-balanced", havingValue = "true")
-		@Bean
-		public OAuth2FeignRequestInterceptorConfigurer loadBalancerInterceptorInjectingConfigurer(
-				final LoadBalancerInterceptor loadBalancerInterceptor) {
-			return builder -> builder.withAccessTokenProviderInterceptors(loadBalancerInterceptor);
-		}
-
 		@Bean
 		@ConditionalOnMissingBean(OAuth2FeignRequestInterceptor.class)
 		@ConditionalOnBean({ OAuth2ClientContext.class, OAuth2ProtectedResourceDetails.class })
 		public RequestInterceptor oauth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
-				OAuth2ProtectedResourceDetails resource, List<OAuth2FeignRequestInterceptorConfigurer> configurers) {
-			return buildWithConfigurers(oAuth2ClientContext, resource, configurers);
+				OAuth2ProtectedResourceDetails resource) {
+			return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, resource);
 		}
 
 	}

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

@@ -1,82 +0,0 @@
-/*
- * Copyright 2013-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Optional;
-
-import feign.InvocationHandlerFactory;
-import feign.Target;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.cache.interceptor.CacheInterceptor;
-
-/**
- * Allows Spring's @Cache* annotations to be declared on the feign client's methods.
- *
- * @author Sam Kruglov
- */
-public class FeignCachingInvocationHandlerFactory implements InvocationHandlerFactory {
-
-	private final InvocationHandlerFactory delegateFactory;
-
-	private final CacheInterceptor cacheInterceptor;
-
-	public FeignCachingInvocationHandlerFactory(InvocationHandlerFactory delegateFactory,
-			CacheInterceptor cacheInterceptor) {
-		this.delegateFactory = delegateFactory;
-		this.cacheInterceptor = cacheInterceptor;
-	}
-
-	@Override
-	public InvocationHandler create(Target target, Map<Method, MethodHandler> dispatch) {
-		final InvocationHandler delegateHandler = delegateFactory.create(target, dispatch);
-		return (proxy, method, argsNullable) -> {
-			Object[] args = Optional.ofNullable(argsNullable).orElseGet(() -> new Object[0]);
-			return cacheInterceptor.invoke(new MethodInvocation() {
-				@Override
-				public Method getMethod() {
-					return method;
-				}
-
-				@Override
-				public Object[] getArguments() {
-					return args;
-				}
-
-				@Override
-				public Object proceed() throws Throwable {
-					return delegateHandler.invoke(proxy, method, args);
-				}
-
-				@Override
-				public Object getThis() {
-					return target;
-				}
-
-				@Override
-				public AccessibleObject getStaticPart() {
-					return method;
-				}
-			});
-		};
-	}
-
-}

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

@@ -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 {
 
 	}

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

@@ -68,8 +68,6 @@ import org.springframework.util.StringUtils;
  * @author Jonatan Ivanov
  * @author Sam Kruglov
  * @author Jasbir Singh
- * @author Hyeonmin Park
- * @author Felix Dittrich
  */
 public class FeignClientFactoryBean
 		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {
@@ -133,6 +131,7 @@ public class FeignClientFactoryBean
 		// @formatter:on
 
 		configureFeign(context, builder);
+		applyBuildCustomizers(context, builder);
 
 		return builder;
 	}
@@ -296,10 +295,6 @@ public class FeignClientFactoryBean
 		if (config.getCapabilities() != null) {
 			config.getCapabilities().stream().map(this::getOrInstantiate).forEach(builder::addCapability);
 		}
-
-		if (config.getQueryMapEncoder() != null) {
-			builder.queryMapEncoder(getOrInstantiate(config.getQueryMapEncoder()));
-		}
 	}
 
 	private void addDefaultQueryParams(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) {
@@ -374,7 +369,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,9 +438,6 @@ 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));
 	}

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

@@ -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) {

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

@@ -26,7 +26,6 @@ import feign.Capability;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Logger;
-import feign.QueryMapEncoder;
 import feign.RequestInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
@@ -41,9 +40,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Ram Anaswara
  * @author Jonatan Ivanov
  * @author Olga Maciaszek-Sharma
- * @author Hyeonmin Park
  */
-@ConfigurationProperties("spring.cloud.openfeign.client")
+@ConfigurationProperties("feign.client")
 public class FeignClientProperties {
 
 	private boolean defaultToProperties = true;
@@ -141,8 +139,6 @@ public class FeignClientProperties {
 
 		private List<Class<Capability>> capabilities;
 
-		private Class<QueryMapEncoder> queryMapEncoder;
-
 		private MetricsProperties metrics;
 
 		private Boolean followRedirects;
@@ -259,14 +255,6 @@ public class FeignClientProperties {
 			this.capabilities = capabilities;
 		}
 
-		public Class<QueryMapEncoder> getQueryMapEncoder() {
-			return queryMapEncoder;
-		}
-
-		public void setQueryMapEncoder(Class<QueryMapEncoder> queryMapEncoder) {
-			this.queryMapEncoder = queryMapEncoder;
-		}
-
 		public MetricsProperties getMetrics() {
 			return metrics;
 		}
@@ -301,8 +289,7 @@ public class FeignClientProperties {
 					&& Objects.equals(exceptionPropagationPolicy, that.exceptionPropagationPolicy)
 					&& Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders)
 					&& Objects.equals(defaultQueryParameters, that.defaultQueryParameters)
-					&& Objects.equals(capabilities, that.capabilities)
-					&& Objects.equals(queryMapEncoder, that.queryMapEncoder) && Objects.equals(metrics, that.metrics)
+					&& Objects.equals(capabilities, that.capabilities) && Objects.equals(metrics, that.metrics)
 					&& Objects.equals(followRedirects, that.followRedirects);
 		}
 
@@ -310,7 +297,7 @@ public class FeignClientProperties {
 		public int hashCode() {
 			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer, errorDecoder, requestInterceptors,
 					decode404, encoder, decoder, contract, exceptionPropagationPolicy, defaultQueryParameters,
-					defaultRequestHeaders, capabilities, queryMapEncoder, metrics, followRedirects);
+					defaultRequestHeaders, capabilities, metrics, followRedirects);
 		}
 
 	}

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

@@ -25,7 +25,7 @@ import org.springframework.cloud.context.named.NamedContextFactory;
  * @author Dave Syer
  * @author Gregor Zurowski
  */
-public class FeignClientSpecification implements NamedContextFactory.Specification {
+class FeignClientSpecification implements NamedContextFactory.Specification {
 
 	private String name;
 
@@ -34,7 +34,7 @@ public class FeignClientSpecification implements NamedContextFactory.Specificati
 	FeignClientSpecification() {
 	}
 
-	public FeignClientSpecification(String name, Class<?>[] configuration) {
+	FeignClientSpecification(String name, Class<?>[] configuration) {
 		this.name = name;
 		this.configuration = configuration;
 	}

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

@@ -47,7 +47,6 @@ import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.support.AbstractFormWriter;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.PageableSpringQueryMapEncoder;
 import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
@@ -71,7 +70,6 @@ import static feign.form.ContentType.MULTIPART;
  * @author Jonatan Ivanov
  * @author Olga Maciaszek-Sharma
  * @author Hyeonmin Park
- * @author Yanming Zhou
  */
 @Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
@@ -99,25 +97,22 @@ public class FeignClientsConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Decoder feignDecoder(ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(messageConverters, customizers)));
+	public Decoder feignDecoder() {
+		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
-	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return springEncoder(formWriterProvider, encoderProperties, customizers);
+	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		return springEncoder(formWriterProvider, encoderProperties);
 	}
 
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
-	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		PageableSpringEncoder encoder = new PageableSpringEncoder(
-				springEncoder(formWriterProvider, encoderProperties, customizers));
+	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		PageableSpringEncoder encoder = new PageableSpringEncoder(springEncoder(formWriterProvider, encoderProperties));
 
 		if (springDataWebProperties != null) {
 			encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
@@ -131,26 +126,20 @@ public class FeignClientsConfiguration {
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public QueryMapEncoder feignQueryMapEncoderPageable() {
-		PageableSpringQueryMapEncoder queryMapEncoder = new PageableSpringQueryMapEncoder();
-		if (springDataWebProperties != null) {
-			queryMapEncoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
-			queryMapEncoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter());
-			queryMapEncoder.setSortParameter(springDataWebProperties.getSort().getSortParameter());
-		}
-		return queryMapEncoder;
+		return new PageableSpringQueryMapEncoder();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
 		boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash();
-		return new SpringMvcContract(parameterProcessors, feignConversionService, decodeSlash);
+		return new SpringMvcContract(this.parameterProcessors, feignConversionService, decodeSlash);
 	}
 
 	@Bean
 	public FormattingConversionService feignConversionService() {
 		FormattingConversionService conversionService = new DefaultFormattingConversionService();
-		for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) {
+		for (FeignFormatterRegistrar feignFormatterRegistrar : this.feignFormatterRegistrars) {
 			feignFormatterRegistrar.registerFormatters(conversionService);
 		}
 		return conversionService;
@@ -165,7 +154,7 @@ public class FeignClientsConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
-		return new DefaultFeignLoggerFactory(logger);
+		return new DefaultFeignLoggerFactory(this.logger);
 	}
 
 	@Bean
@@ -176,15 +165,14 @@ public class FeignClientsConfiguration {
 	}
 
 	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+			FeignEncoderProperties encoderProperties) {
 		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
 
 		if (formWriter != null) {
-			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties,
-					customizers);
+			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), this.messageConverters, encoderProperties);
 		}
 		else {
-			return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers);
+			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters, encoderProperties);
 		}
 	}
 
@@ -214,7 +202,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 +225,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 {
 

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

@@ -440,7 +440,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);
 	}
 
 }

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

@@ -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

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

@@ -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 {
 
 	}

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

@@ -1,67 +0,0 @@
-/*
- * Copyright 2013-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import feign.MethodMetadata;
-
-import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.CookieValue;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * @{link CookieValue} annotation processor.
- * @author Gong Yi
- *
- */
-public class CookieValueParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<CookieValue> ANNOTATION = CookieValue.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		MethodMetadata data = context.getMethodMetadata();
-		CookieValue cookie = ANNOTATION.cast(annotation);
-		String name = cookie.value().trim();
-		checkState(emptyToNull(name) != null, "Cookie.name() was empty on parameter %s", parameterIndex);
-		context.setParameterName(name);
-		String cookieExpression = data.template().headers().getOrDefault(HttpHeaders.COOKIE, Arrays.asList("")).stream()
-				.findFirst().orElse("");
-		if (cookieExpression.length() == 0) {
-			cookieExpression = String.format("%s={%s}", name, name);
-		}
-		else {
-			cookieExpression += String.format("; %s={%s}", name, name);
-		}
-		data.template().removeHeader(HttpHeaders.COOKIE);
-		data.template().header(HttpHeaders.COOKIE, cookieExpression);
-		return true;
-	}
-
-}

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

@@ -34,7 +34,6 @@ import static feign.Util.emptyToNull;
  *
  * @author Jakub Narloch
  * @author Abhijit Sarkar
- * @author Yanming Zhou
  * @see AnnotatedParameterProcessor
  */
 public class PathVariableParameterProcessor implements AnnotatedParameterProcessor {
@@ -55,8 +54,7 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 
 		MethodMetadata data = context.getMethodMetadata();
 		String varName = '{' + name + '}';
-		String varNameRegex = ".*\\{" + name + "(:[^}]+)?\\}.*";
-		if (!data.template().url().matches(varNameRegex) && !searchMapValues(data.template().queries(), varName)
+		if (!data.template().url().contains(varName) && !searchMapValues(data.template().queries(), varName)
 				&& !searchMapValues(data.template().headers(), varName)) {
 			data.formParams().add(name);
 		}

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

@@ -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;

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

@@ -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,

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

@@ -16,10 +16,10 @@
 
 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;
 
@@ -48,8 +48,8 @@ public class OkHttpFeignConfiguration {
 	@ConditionalOnMissingBean(ConnectionPool.class)
 	public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
 			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-		int maxTotalConnections = httpClientProperties.getMaxConnections();
-		long timeToLive = httpClientProperties.getTimeToLive();
+		Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+		Long timeToLive = httpClientProperties.getTimeToLive();
 		TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
 		return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
 	}
@@ -57,12 +57,11 @@ public class OkHttpFeignConfiguration {
 	@Bean
 	public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory, ConnectionPool connectionPool,
 			FeignHttpClientProperties httpClientProperties) {
-		boolean followRedirects = httpClientProperties.isFollowRedirects();
-		int connectTimeout = httpClientProperties.getConnectionTimeout();
-		Duration reaTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+		Boolean followRedirects = httpClientProperties.isFollowRedirects();
+		Integer connectTimeout = httpClientProperties.getConnectionTimeout();
 		this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation())
 				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
-				.readTimeout(reaTimeout).connectionPool(connectionPool).build();
+				.connectionPool(connectionPool).build();
 		return this.okHttpClient;
 	}
 

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

@@ -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")

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

@@ -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 {
 
 	/**

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

@@ -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 {
 

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

@@ -83,7 +83,7 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 	}
 
 	/**
-	 * Returns whether the content mime types matches the configured mime types.
+	 * Returns whether the content mime types matches the configures mime types.
 	 * @param contentTypes the content types
 	 * @return true if any specified content type matches the request content types
 	 */

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

@@ -16,18 +16,26 @@
 
 package org.springframework.cloud.openfeign.hateoas;
 
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.hateoas.config.HateoasConfiguration;
-import org.springframework.hateoas.config.WebConverters;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
 
 /**
  * @author Hector Espert
@@ -35,15 +43,23 @@ import org.springframework.hateoas.config.WebConverters;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
-@ConditionalOnClass(WebConverters.class)
+@ConditionalOnClass(RepresentationModel.class)
 @AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
-		RepositoryRestMvcAutoConfiguration.class, HateoasConfiguration.class })
+		RepositoryRestMvcAutoConfiguration.class })
 public class FeignHalAutoConfiguration {
 
 	@Bean
-	@ConditionalOnBean(WebConverters.class)
-	HttpMessageConverterCustomizer webConvertersCustomizer(WebConverters webConverters) {
-		return new WebConvertersCustomizer(webConverters);
+	@ConditionalOnBean(HalMediaTypeConfiguration.class)
+	@ConditionalOnMissingBean
+	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
+			ObjectProvider<ObjectMapper> objectMapper, HalMediaTypeConfiguration halConfiguration) {
+		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
+		halConfiguration.configureObjectMapper(mapper);
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
+				RepresentationModel.class);
+		converter.setSupportedMediaTypes(Collections.singletonList(HAL_JSON));
+		converter.setObjectMapper(mapper);
+		return converter;
 	}
 
 }

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

@@ -1,41 +0,0 @@
-/*
- * Copyright 2016-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hateoas;
-
-import java.util.List;
-
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
-import org.springframework.hateoas.config.WebConverters;
-import org.springframework.http.converter.HttpMessageConverter;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-public class WebConvertersCustomizer implements HttpMessageConverterCustomizer {
-
-	private final WebConverters webConverters;
-
-	public WebConvertersCustomizer(WebConverters webConverters) {
-		this.webConverters = webConverters;
-	}
-
-	@Override
-	public void accept(List<HttpMessageConverter<?>> httpMessageConverters) {
-		webConverters.augmentClient(httpMessageConverters);
-	}
-
-}

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

@@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -39,15 +39,15 @@ import org.springframework.context.annotation.Configuration;
  * @since 2.2.0
  */
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(LoadBalancerClientsProperties.class)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class DefaultFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(LoadBalancerClient loadBalancerClient,
+	public Client feignClient(LoadBalancerClient loadBalancerClient, LoadBalancerProperties properties,
 			LoadBalancerClientFactory loadBalancerClientFactory) {
-		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
+		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient, properties,
 				loadBalancerClientFactory);
 	}
 
@@ -58,9 +58,10 @@ class DefaultFeignLoadBalancerConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		return new RetryableFeignBlockingLoadBalancerClient(new Client.Default(null, null), loadBalancerClient,
-				loadBalancedRetryFactory, loadBalancerClientFactory);
+				loadBalancedRetryFactory, properties, loadBalancerClientFactory);
 	}
 
 }

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

@@ -60,24 +60,15 @@ public class FeignBlockingLoadBalancerClient implements Client {
 
 	private final LoadBalancerClient loadBalancerClient;
 
+	private final LoadBalancerProperties properties;
+
 	private final LoadBalancerClientFactory loadBalancerClientFactory;
 
-	/**
-	 * @deprecated in favour of
-	 * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory)}
-	 */
-	@Deprecated
 	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
-		this.loadBalancerClientFactory = loadBalancerClientFactory;
-	}
-
-	public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
+		this.properties = properties;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 	}
 
@@ -125,7 +116,6 @@ public class FeignBlockingLoadBalancerClient implements Client {
 	}
 
 	private String getHint(String serviceId) {
-		LoadBalancerProperties properties = loadBalancerClientFactory.getProperties(serviceId);
 		String defaultHint = properties.getHint().getOrDefault("default", "default");
 		String hintPropertyValue = properties.getHint().get(serviceId);
 		return hintPropertyValue != null ? hintPropertyValue : defaultHint;

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

@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.clientconfig.HttpClient5FeignConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -44,18 +44,18 @@ import org.springframework.context.annotation.Import;
 @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)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class HttpClient5FeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
 	}
 
 	@Bean
@@ -65,10 +65,11 @@ class HttpClient5FeignLoadBalancerConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient5,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		Client delegate = new ApacheHttp5Client(httpClient5);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory);
+				properties, loadBalancerClientFactory);
 	}
 
 }

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

@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.HttpClient5DisabledConditions;
 import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
@@ -47,19 +47,19 @@ import org.springframework.context.annotation.Import;
 @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)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class HttpClientFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
 	}
 
 	@Bean
@@ -69,10 +69,11 @@ class HttpClientFeignLoadBalancerConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled", havingValue = "true",
 			matchIfMissing = true)
 	public Client feignRetryClient(LoadBalancerClient loadBalancerClient, HttpClient httpClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory);
+				properties, loadBalancerClientFactory);
 	}
 
 }

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

@@ -33,6 +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.HttpStatus;
 
 /**
  * @author Olga Maciaszek-Sharma
@@ -72,7 +73,8 @@ 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(response.status(), responseHeaders, null, buildRequestData(response.request()));
+		return new ResponseData(HttpStatus.resolve(response.status()), responseHeaders, null,
+				buildRequestData(response.request()));
 	}
 
 	static RequestData buildRequestData(Request request) {

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

@@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -43,19 +43,19 @@ import org.springframework.context.annotation.Import;
  */
 @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)
+@EnableConfigurationProperties(LoadBalancerProperties.class)
 class OkHttpFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
+			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancerClientFactory);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
 	}
 
 	@Bean
@@ -65,10 +65,11 @@ 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) {
+			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
+			LoadBalancerClientFactory loadBalancerClientFactory) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient, loadBalancedRetryFactory,
-				loadBalancerClientFactory);
+				properties, loadBalancerClientFactory);
 	}
 
 }

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

@@ -78,27 +78,17 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 
 	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
 
+	private final LoadBalancerProperties properties;
+
 	private final LoadBalancerClientFactory loadBalancerClientFactory;
 
-	/**
-	 * @deprecated in favour of
-	 * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory)}
-	 */
-	@Deprecated
 	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
 			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
 			LoadBalancerClientFactory loadBalancerClientFactory) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
-		this.loadBalancerClientFactory = loadBalancerClientFactory;
-	}
-
-	public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
-		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
+		this.properties = properties;
 		this.loadBalancerClientFactory = loadBalancerClientFactory;
 	}
 
@@ -242,7 +232,6 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 	}
 
 	private String getHint(String serviceId) {
-		LoadBalancerProperties properties = loadBalancerClientFactory.getProperties(serviceId);
 		String defaultHint = properties.getHint().getOrDefault("default", "default");
 		String hintPropertyValue = properties.getHint().get(serviceId);
 		return hintPropertyValue != null ? hintPropertyValue : defaultHint;

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

@@ -43,6 +43,7 @@ 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 {
 
 	/**

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

@@ -1,81 +0,0 @@
-/*
- * Copyright 2015-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.security;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
-import org.springframework.security.oauth2.client.token.AccessTokenProvider;
-import org.springframework.security.oauth2.client.token.AccessTokenProviderChain;
-import org.springframework.security.oauth2.client.token.OAuth2AccessTokenSupport;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider;
-import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeAccessTokenProvider;
-import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitAccessTokenProvider;
-import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider;
-
-/**
- * Allows to customize pre-defined {@link OAuth2FeignRequestInterceptor} using configurer
- * beans of class {@link OAuth2FeignRequestInterceptorConfigurer}. Each configurer
- * instance can add {@link AccessTokenProvider} new {@link ClientHttpRequestInterceptor}
- * instances.
- *
- * @author Wojciech Mąka
- * @since 3.1.1
- */
-public class OAuth2FeignRequestInterceptorBuilder {
-
-	private AccessTokenProvider accessTokenProvider;
-
-	private final List<ClientHttpRequestInterceptor> accessTokenProviderInterceptors = new ArrayList<>();
-
-	public OAuth2FeignRequestInterceptorBuilder() {
-		accessTokenProvider = new AccessTokenProviderChain(Arrays.<AccessTokenProvider>asList(
-				new AuthorizationCodeAccessTokenProvider(), new ImplicitAccessTokenProvider(),
-				new ResourceOwnerPasswordAccessTokenProvider(), new ClientCredentialsAccessTokenProvider()));
-	}
-
-	public OAuth2FeignRequestInterceptorBuilder withAccessTokenProviderInterceptors(
-			ClientHttpRequestInterceptor... interceptors) {
-		accessTokenProviderInterceptors.addAll(Arrays.asList(interceptors));
-		return this;
-	}
-
-	OAuth2FeignRequestInterceptor build(OAuth2ClientContext oAuth2ClientContext,
-			OAuth2ProtectedResourceDetails resource) {
-		if (OAuth2AccessTokenSupport.class.isAssignableFrom(accessTokenProvider.getClass())) {
-			((OAuth2AccessTokenSupport) accessTokenProvider).setInterceptors(accessTokenProviderInterceptors);
-		}
-		final OAuth2FeignRequestInterceptor feignRequestInterceptor = new OAuth2FeignRequestInterceptor(
-				oAuth2ClientContext, resource);
-		feignRequestInterceptor.setAccessTokenProvider(accessTokenProvider);
-		return feignRequestInterceptor;
-	}
-
-	public static OAuth2FeignRequestInterceptor buildWithConfigurers(OAuth2ClientContext oAuth2ClientContext,
-			OAuth2ProtectedResourceDetails resource, List<OAuth2FeignRequestInterceptorConfigurer> buildConfigurers) {
-		final OAuth2FeignRequestInterceptorBuilder builder = new OAuth2FeignRequestInterceptorBuilder();
-		for (OAuth2FeignRequestInterceptorConfigurer configurer : buildConfigurers) {
-			configurer.customize(builder);
-		}
-		return builder.build(oAuth2ClientContext, resource);
-	}
-
-}

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

@@ -1,35 +0,0 @@
-/*
- * Copyright 2015-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.security;
-
-import org.springframework.security.oauth2.client.token.AccessTokenProvider;
-
-/**
- * Interface for configurer beans working with
- * {@link OAuth2FeignRequestInterceptorBuilder} in order to provide custom interceptors
- * for {@link AccessTokenProvider} managed internally by
- * {@link OAuth2FeignRequestInterceptor}.
- *
- * @author Wojciech Mąka
- * @since 3.1.1
- */
-@FunctionalInterface
-public interface OAuth2FeignRequestInterceptorConfigurer {
-
-	void customize(OAuth2FeignRequestInterceptorBuilder requestInterceptorBuilder);
-
-}

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.support;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.zip.GZIPInputStream;
+
+import feign.FeignException;
+import feign.Response;
+import feign.codec.Decoder;
+
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
+
+/**
+ * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder}
+ * to decode.
+ *
+ * @author Jaesik Kim
+ */
+public class DefaultGzipDecoder implements Decoder {
+
+	private Decoder decoder;
+
+	public DefaultGzipDecoder(Decoder decoder) {
+		this.decoder = decoder;
+	}
+
+	@Override
+	public Object decode(final Response response, Type type) throws IOException, FeignException {
+		Collection<String> encoding = response.headers().containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
+				? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER) : null;
+
+		if (encoding != null) {
+			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
+				String decompressedBody = decompress(response);
+				if (decompressedBody != null) {
+					Response decompressedResponse = response.toBuilder().body(decompressedBody.getBytes()).build();
+					return decoder.decode(decompressedResponse, type);
+				}
+			}
+		}
+		return decoder.decode(response, type);
+	}
+
+	private String decompress(Response response) throws IOException {
+		if (response.body() == null) {
+			return null;
+		}
+		try (GZIPInputStream gzipInputStream = new GZIPInputStream(response.body().asInputStream());
+				BufferedReader reader = new BufferedReader(
+						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
+			String outputString = "";
+			String line;
+			while ((line = reader.readLine()) != null) {
+				outputString += line;
+			}
+			return outputString;
+		}
+	}
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.support;
+
+import feign.codec.Decoder;
+import feign.optionals.OptionalDecoder;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configures Default Gzip Decoder.
+ *
+ * @author Jaesik Kim
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty("feign.compression.response.enabled")
+// The OK HTTP client uses "transparent" compression.
+// If the accept-encoding header is present, it disables transparent compression
+@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
+@AutoConfigureAfter(FeignAutoConfiguration.class)
+public class DefaultGzipDecoderConfiguration {
+
+	private ObjectFactory<HttpMessageConverters> messageConverters;
+
+	public DefaultGzipDecoderConfiguration(ObjectFactory<HttpMessageConverters> messageConverters) {
+		this.messageConverters = messageConverters;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
+	public Decoder defaultGzipDecoder() {
+		return new OptionalDecoder(
+				new ResponseEntityDecoder(new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
+	}
+
+}

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

@@ -1,54 +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.support;
-
-import java.util.function.Consumer;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectProvider;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-class EmptyObjectProvider<T> implements ObjectProvider<T> {
-
-	@Override
-	public T getObject(Object... args) throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getIfAvailable() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getIfUnique() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getObject() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public void forEach(Consumer action) {
-		// do nothing
-	}
-
-}

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

@@ -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 {
 
 	/**

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

@@ -16,19 +16,15 @@
 
 package org.springframework.cloud.openfeign.support;
 
-import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import feign.okhttp.OkHttpClient;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * @author Ryan Baxter
  * @author Nguyen Ky Thanh
- * @author Olga Maciaszek-Sharma
  */
-@ConfigurationProperties(prefix = "spring.cloud.openfeign.httpclient")
+@ConfigurationProperties(prefix = "feign.httpclient")
 public class FeignHttpClientProperties {
 
 	/**
@@ -92,13 +88,8 @@ public class FeignHttpClientProperties {
 	 */
 	private Hc5Properties hc5 = new Hc5Properties();
 
-	/**
-	 * Additional {@link OkHttpClient}-specific properties.
-	 */
-	private OkHttp okHttp = new OkHttp();
-
 	public int getConnectionTimerRepeat() {
-		return connectionTimerRepeat;
+		return this.connectionTimerRepeat;
 	}
 
 	public void setConnectionTimerRepeat(int connectionTimerRepeat) {
@@ -106,7 +97,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public boolean isDisableSslValidation() {
-		return disableSslValidation;
+		return this.disableSslValidation;
 	}
 
 	public void setDisableSslValidation(boolean disableSslValidation) {
@@ -114,7 +105,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public int getMaxConnections() {
-		return maxConnections;
+		return this.maxConnections;
 	}
 
 	public void setMaxConnections(int maxConnections) {
@@ -122,7 +113,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public int getMaxConnectionsPerRoute() {
-		return maxConnectionsPerRoute;
+		return this.maxConnectionsPerRoute;
 	}
 
 	public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
@@ -130,7 +121,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public long getTimeToLive() {
-		return timeToLive;
+		return this.timeToLive;
 	}
 
 	public void setTimeToLive(long timeToLive) {
@@ -138,7 +129,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public TimeUnit getTimeToLiveUnit() {
-		return timeToLiveUnit;
+		return this.timeToLiveUnit;
 	}
 
 	public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) {
@@ -146,7 +137,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public boolean isFollowRedirects() {
-		return followRedirects;
+		return this.followRedirects;
 	}
 
 	public void setFollowRedirects(boolean followRedirects) {
@@ -154,7 +145,7 @@ public class FeignHttpClientProperties {
 	}
 
 	public int getConnectionTimeout() {
-		return connectionTimeout;
+		return this.connectionTimeout;
 	}
 
 	public void setConnectionTimeout(int connectionTimeout) {
@@ -169,14 +160,6 @@ public class FeignHttpClientProperties {
 		this.hc5 = hc5;
 	}
 
-	public OkHttp getOkHttp() {
-		return okHttp;
-	}
-
-	public void setOkHttp(OkHttp okHttp) {
-		this.okHttp = okHttp;
-	}
-
 	public static class Hc5Properties {
 
 		/**
@@ -220,7 +203,7 @@ public class FeignHttpClientProperties {
 		private TimeUnit socketTimeoutUnit = DEFAULT_SOCKET_TIMEOUT_UNIT;
 
 		public PoolConcurrencyPolicy getPoolConcurrencyPolicy() {
-			return poolConcurrencyPolicy;
+			return this.poolConcurrencyPolicy;
 		}
 
 		public void setPoolConcurrencyPolicy(PoolConcurrencyPolicy poolConcurrencyPolicy) {
@@ -289,24 +272,4 @@ public class FeignHttpClientProperties {
 
 	}
 
-	/**
-	 * {@link OkHttpClient}-specific properties.
-	 */
-	public static class OkHttp {
-
-		/**
-		 * {@link OkHttpClient} read timeout; defaults to 60 seconds.
-		 */
-		private Duration readTimeout = Duration.ofSeconds(60);
-
-		public Duration getReadTimeout() {
-			return readTimeout;
-		}
-
-		public void setReadTimeout(Duration readTimeout) {
-			this.readTimeout = readTimeout;
-		}
-
-	}
-
 }

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

@@ -1,33 +0,0 @@
-/*
- * Copyright 2016-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.support;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import org.springframework.http.converter.HttpMessageConverter;
-
-/**
- * Allows customising {@link HttpMessageConverter} objects passed via {@link Consumer}
- * parameter.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.1.0
- */
-public interface HttpMessageConverterCustomizer extends Consumer<List<HttpMessageConverter<?>>> {
-
-}

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

@@ -32,7 +32,6 @@ import org.springframework.data.domain.Sort;
  * Provides support for encoding spring Pageable via composition.
  *
  * @author Pascal Büttiker
- * @author Yanming Zhou
  */
 public class PageableSpringEncoder implements Encoder {
 
@@ -83,8 +82,8 @@ public class PageableSpringEncoder implements Encoder {
 				Pageable pageable = (Pageable) object;
 
 				if (pageable.isPaged()) {
-					template.query(pageParameter, String.valueOf(pageable.getPageNumber()));
-					template.query(sizeParameter, String.valueOf(pageable.getPageSize()));
+					template.query(pageParameter, pageable.getPageNumber() + "");
+					template.query(sizeParameter, pageable.getPageSize() + "");
 				}
 
 				if (pageable.getSort() != null) {

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

@@ -31,38 +31,10 @@ import org.springframework.data.domain.Sort;
  * {@link org.springframework.cloud.openfeign.SpringQueryMap}.
  *
  * @author Hyeonmin Park
- * @author Yanming Zhou
  * @since 2.2.8
  */
 public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 
-	/**
-	 * Page index parameter name.
-	 */
-	private String pageParameter = "page";
-
-	/**
-	 * Page size parameter name.
-	 */
-	private String sizeParameter = "size";
-
-	/**
-	 * Sort parameter name.
-	 */
-	private String sortParameter = "sort";
-
-	public void setPageParameter(String pageParameter) {
-		this.pageParameter = pageParameter;
-	}
-
-	public void setSizeParameter(String sizeParameter) {
-		this.sizeParameter = sizeParameter;
-	}
-
-	public void setSortParameter(String sortParameter) {
-		this.sortParameter = sortParameter;
-	}
-
 	@Override
 	public Map<String, Object> encode(Object object) {
 		if (supports(object)) {
@@ -72,8 +44,8 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 				Pageable pageable = (Pageable) object;
 
 				if (pageable.isPaged()) {
-					queryMap.put(pageParameter, pageable.getPageNumber());
-					queryMap.put(sizeParameter, pageable.getPageSize());
+					queryMap.put("page", pageable.getPageNumber());
+					queryMap.put("size", pageable.getPageSize());
 				}
 
 				if (pageable.getSort() != null) {
@@ -97,7 +69,7 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
 		}
 		if (!sortQueries.isEmpty()) {
-			queryMap.put(sortParameter, sortQueries);
+			queryMap.put("sort", sortQueries);
 		}
 	}
 

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

@@ -21,7 +21,6 @@ import java.io.InputStream;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
-import java.util.List;
 
 import feign.FeignException;
 import feign.Response;
@@ -29,48 +28,31 @@ import feign.codec.DecodeException;
 import feign.codec.Decoder;
 
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.client.HttpMessageConverterExtractor;
 
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;
 
 /**
  * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
  */
 public class SpringDecoder implements Decoder {
 
-	private final ObjectFactory<HttpMessageConverters> messageConverters;
+	private ObjectFactory<HttpMessageConverters> messageConverters;
 
-	private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
-
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringDecoder#SpringDecoder(ObjectFactory, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringDecoder(ObjectFactory<HttpMessageConverters> messageConverters) {
-		this(messageConverters, new EmptyObjectProvider<>());
-	}
-
-	public SpringDecoder(ObjectFactory<HttpMessageConverters> messageConverters,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		this.messageConverters = messageConverters;
-		this.customizers = customizers;
 	}
 
 	@Override
 	public Object decode(final Response response, Type type) throws IOException, FeignException {
 		if (type instanceof Class || type instanceof ParameterizedType || type instanceof WildcardType) {
-			List<HttpMessageConverter<?>> converters = messageConverters.getObject().getConverters();
-			customizers.forEach(customizer -> customizer.accept(converters));
 			@SuppressWarnings({ "unchecked", "rawtypes" })
-			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(type, converters);
+			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(type,
+					this.messageConverters.getObject().getConverters());
 
 			return extractor.extractData(new FeignResponseAdapter(response));
 		}
@@ -88,23 +70,23 @@ public class SpringDecoder implements Decoder {
 
 		@Override
 		public HttpStatus getStatusCode() throws IOException {
-			return HttpStatus.valueOf(response.status());
+			return HttpStatus.valueOf(this.response.status());
 		}
 
 		@Override
 		public int getRawStatusCode() throws IOException {
-			return response.status();
+			return this.response.status();
 		}
 
 		@Override
 		public String getStatusText() throws IOException {
-			return response.reason();
+			return this.response.reason();
 		}
 
 		@Override
 		public void close() {
 			try {
-				response.body().close();
+				this.response.body().close();
 			}
 			catch (IOException ex) {
 				// Ignore exception on close...
@@ -113,12 +95,12 @@ public class SpringDecoder implements Decoder {
 
 		@Override
 		public InputStream getBody() throws IOException {
-			return response.body().asInputStream();
+			return this.response.body().asInputStream();
 		}
 
 		@Override
 		public HttpHeaders getHeaders() {
-			return getHttpHeaders(response.headers());
+			return getHttpHeaders(this.response.headers());
 		}
 
 	}

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

@@ -24,7 +24,6 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -36,7 +35,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.http.HttpHeaders;
@@ -76,37 +74,19 @@ public class SpringEncoder implements Encoder {
 
 	private final FeignEncoderProperties encoderProperties;
 
-	private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
-
 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this(new SpringFormEncoder(), messageConverters);
 	}
 
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters) {
 		this(springFormEncoder, messageConverters, new FeignEncoderProperties());
 	}
 
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters,
 			FeignEncoderProperties encoderProperties) {
-		this(springFormEncoder, messageConverters, encoderProperties, new EmptyObjectProvider<>());
-	}
-
-	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters,
-			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		this.springFormEncoder = springFormEncoder;
 		this.messageConverters = messageConverters;
 		this.encoderProperties = encoderProperties;
-		this.customizers = customizers;
 	}
 
 	@Override
@@ -137,9 +117,7 @@ public class SpringEncoder implements Encoder {
 
 	private void encodeWithMessageConverter(Object requestBody, Type bodyType, RequestTemplate request,
 			MediaType requestContentType) {
-		List<HttpMessageConverter<?>> converters = messageConverters.getObject().getConverters();
-		customizers.forEach(customizer -> customizer.accept(converters));
-		for (HttpMessageConverter messageConverter : converters) {
+		for (HttpMessageConverter messageConverter : this.messageConverters.getObject().getConverters()) {
 			FeignOutputMessage outputMessage;
 			try {
 				if (messageConverter instanceof GenericHttpMessageConverter) {

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

@@ -40,7 +40,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.CollectionFormat;
-import org.springframework.cloud.openfeign.annotation.CookieValueParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
@@ -82,7 +81,6 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
  * @author Artyom Romanenko
  * @author Darren Foong
  * @author Ram Anaswara
- * @author Sam Kruglov
  */
 public class SpringMvcContract extends Contract.BaseContract implements ResourceLoaderAware {
 
@@ -181,10 +179,6 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 					+ ". @RequestMapping annotation is not allowed on @FeignClient interfaces.");
 			throw new IllegalArgumentException("@RequestMapping annotation not allowed on @FeignClient interfaces");
 		}
-		CollectionFormat collectionFormat = findMergedAnnotation(clz, CollectionFormat.class);
-		if (collectionFormat != null) {
-			data.template().collectionFormat(collectionFormat.value());
-		}
 	}
 
 	@Override
@@ -341,7 +335,6 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
 		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestPartParameterProcessor());
-		annotatedArgumentResolvers.add(new CookieValueParameterProcessor());
 
 		return annotatedArgumentResolvers;
 	}

spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -3,76 +3,70 @@
 	],
 	"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.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.response.useGzipDecoder",
+			"type": "java.lang.Boolean",
+			"description": "Enables the default gzip decoder to be used.",
+			"defaultValue": "false"
+		},
+		{
+			"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",
-			"type": "java.lang.Boolean",
-			"description": "Enables feign interceptor for managing oauth2 access token.",
-			"defaultValue": "false"
-		},
-		{
-			"name": "spring.cloud.openfeign.oauth2.load-balanced",
-			"type": "java.lang.Boolean",
-			"description": "Enables load balancing for oauth2 access token provider.",
-			"defaultValue": "false"
 		}
 	]
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java

@@ -18,7 +18,8 @@ package org.springframework.cloud.openfeign;
 
 import java.util.Objects;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +31,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,17 +39,15 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Jaesik Kim
- * @author Olga Maciaszek-Sharma
  */
-@SpringBootTest(classes = GzipDecodingTests.Application.class,
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = DefaultGzipDecoderTests.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.compression.response.useGzipDecoder=true", "feign.client.config.default.loggerLevel=full",
 				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
 @DirtiesContext
-class GzipDecodingTests extends FeignClientFactoryBean {
+public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 
 	@Autowired
 	FeignContext context;
@@ -55,7 +55,7 @@ class GzipDecodingTests extends FeignClientFactoryBean {
 	@Value("${local.server.port}")
 	private int port = 0;
 
-	GzipDecodingTests() {
+	public DefaultGzipDecoderTests() {
 		setName("tests");
 		setContextId("test");
 	}
@@ -66,7 +66,7 @@ class GzipDecodingTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testBodyDecompress() {
+	public void testBodyDecompress() {
 		ResponseEntity<Hello> response = testClient().getGzipResponse();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
@@ -76,7 +76,7 @@ class GzipDecodingTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testNullBodyDecompress() {
+	public void testNullBodyDecompress() {
 		ResponseEntity<Hello> response = testClient().getNullResponse();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
@@ -86,7 +86,7 @@ class GzipDecodingTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testCharsetDecompress() {
+	public void testCharsetDecompress() {
 		ResponseEntity<Hello> response = testClient().getUtf8Response();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsSpringDataTests.java

@@ -17,7 +17,8 @@
 package org.springframework.cloud.openfeign;
 
 import feign.codec.Encoder;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -25,19 +26,22 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Spencer Gibb
  */
+@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = EnableFeignClientsSpringDataTests.PlainConfiguration.class)
 @DirtiesContext
-class EnableFeignClientsSpringDataTests {
+public class EnableFeignClientsSpringDataTests {
 
 	@Autowired
 	private FeignContext feignContext;
 
 	@Test
-	void encoderDefaultCorrect() {
+	public void encoderDefaultCorrect() {
+
 		PageableSpringEncoder.class.cast(this.feignContext.getInstance("foo", Encoder.class));
 	}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java

@@ -23,15 +23,17 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.optionals.OptionalDecoder;
 import feign.slf4j.Slf4jLogger;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -39,47 +41,48 @@ import org.springframework.context.annotation.Import;
 /**
  * @author Spencer Gibb
  */
+@RunWith(ModifiedClassPathRunner.class)
 @ClassPathExclusions({ "spring-data-commons-*.jar" })
-class EnableFeignClientsTests {
+public class EnableFeignClientsTests {
 
 	private ConfigurableApplicationContext context;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public 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();
 	}
 
-	@AfterEach
-	void tearDown() {
+	@After
+	public void tearDown() {
 		if (context != null) {
 			context.close();
 		}
 	}
 
 	@Test
-	void decoderDefaultCorrect() {
+	public void decoderDefaultCorrect() {
 		OptionalDecoder.class.cast(this.context.getBeansOfType(Decoder.class).get(0));
 	}
 
 	@Test
-	void encoderDefaultCorrect() {
+	public void encoderDefaultCorrect() {
 		SpringEncoder.class.cast(this.context.getBeansOfType(Encoder.class).get(0));
 	}
 
 	@Test
-	void loggerDefaultCorrect() {
+	public void loggerDefaultCorrect() {
 		Slf4jLogger.class.cast(this.context.getBeansOfType(Logger.class).get(0));
 	}
 
 	@Test
-	void contractDefaultCorrect() {
+	public void contractDefaultCorrect() {
 		SpringMvcContract.class.cast(this.context.getBeansOfType(Contract.class).get(0));
 	}
 
 	@Test
-	void builderDefaultCorrect() {
+	public void builderDefaultCorrect() {
 		Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java

@@ -23,19 +23,10 @@ import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 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.DefaultCircuitBreakerNameResolver;
-import org.springframework.cloud.openfeign.security.MockOAuth2ClientContext;
-import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
-import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorBuilder;
-import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptorConfigurer;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
-import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -45,24 +36,23 @@ import static org.mockito.Mockito.mock;
  * @author Olga Maciaszek-Sharma
  * @author Andrii Bohutskyi
  * @author Kwangyong Kim
- * @author Wojciech Mąka
  */
 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,
@@ -73,8 +63,8 @@ class FeignAutoConfigurationTests {
 	@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,74 +74,13 @@ 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);
 				});
 	}
 
-	@Test
-	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithoutInterceptors() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true")
-				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
-				.withBean(LoadBalancerInterceptor.class, () -> mock(LoadBalancerInterceptor.class)).run(ctx -> {
-					assertOauth2FeignRequestInterceptorExists(ctx);
-					assertAccessTokenProviderInterceptorNotExists(ctx, LoadBalancerInterceptor.class);
-				});
-	}
-
-	@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)
-				.withBean(LoadBalancerInterceptor.class, () -> mock(LoadBalancerInterceptor.class)).run(ctx -> {
-					assertOauth2FeignRequestInterceptorExists(ctx);
-					assertAccessTokenProviderInterceptorExists(ctx, LoadBalancerInterceptor.class);
-				});
-	}
-
-	@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 -> {
-					assertOauth2FeignRequestInterceptorExists(ctx);
-					assertAccessTokenProviderInterceptorNotExists(ctx, LoadBalancerInterceptor.class);
-				});
-	}
-
-	@Test
-	void shouldInstantiateFeignOAuth2FeignRequestInterceptorWithCustomAccessTokenProviderInterceptor() {
-		runner.withPropertyValues("spring.cloud.openfeign.oauth2.enabled=true")
-				.withBean(MockOAuth2ClientContext.class, "token").withBean(BaseOAuth2ProtectedResourceDetails.class)
-				.withBean(CustomOAuth2FeignRequestInterceptorConfigurer.class).run(ctx -> {
-					assertOauth2FeignRequestInterceptorExists(ctx);
-					assertAccessTokenProviderInterceptorExists(ctx, BasicAuthenticationInterceptor.class);
-				});
-	}
-
-	private void assertOauth2FeignRequestInterceptorExists(ConfigurableApplicationContext ctx) {
-		AssertableApplicationContext context = AssertableApplicationContext.get(() -> ctx);
-		assertThat(context).hasSingleBean(OAuth2FeignRequestInterceptor.class);
-	}
-
-	private void assertAccessTokenProviderInterceptorExists(ConfigurableApplicationContext ctx,
-			Class<? extends ClientHttpRequestInterceptor> clazz) {
-		AssertableApplicationContext context = AssertableApplicationContext.get(() -> ctx);
-		assertThat(context).getBean(OAuth2FeignRequestInterceptor.class).extracting("accessTokenProvider")
-				.extracting("interceptors").asList().first().isInstanceOf(clazz);
-	}
-
-	private void assertAccessTokenProviderInterceptorNotExists(ConfigurableApplicationContext ctx,
-			Class<? extends ClientHttpRequestInterceptor> clazz) {
-		AssertableApplicationContext context = AssertableApplicationContext.get(() -> ctx);
-		assertThat(context).getBean(OAuth2FeignRequestInterceptor.class).extracting("accessTokenProvider")
-				.extracting("interceptors").asList().filteredOn(obj -> clazz.isAssignableFrom(obj.getClass()))
-				.isEmpty();
-	}
-
 	private void assertOnlyOneTargeterPresent(ConfigurableApplicationContext ctx, Class<?> beanClass) {
 		assertThat(ctx.getBeansOfType(Targeter.class)).hasSize(1).hasValueSatisfying(new Condition<>(
 				beanClass::isInstance, String.format("Targeter should be an instance of %s", beanClass)));
@@ -179,14 +108,4 @@ class FeignAutoConfigurationTests {
 
 	}
 
-	static class CustomOAuth2FeignRequestInterceptorConfigurer implements OAuth2FeignRequestInterceptorConfigurer {
-
-		@Override
-		public void customize(OAuth2FeignRequestInterceptorBuilder requestInterceptorBuilder) {
-			requestInterceptorBuilder
-					.withAccessTokenProviderInterceptors(new BasicAuthenticationInterceptor("username", "password"));
-		}
-
-	}
-
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java

@@ -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.junit.Test;
 
 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);
+public class FeignBuilderCustomizerTests {
 
 	@Test
-	void testBuilderCustomizer() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
+	public void testBuilderCustomizer() {
 		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);
 
@@ -82,18 +61,14 @@ class FeignBuilderCustomizerTests {
 	}
 
 	@Test
-	void testBuildCustomizerOrdered() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
+	public void testBuildCustomizerOrdered() {
 		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);
 
@@ -101,20 +76,16 @@ class FeignBuilderCustomizerTests {
 	}
 
 	@Test
-	void testBuildCustomizerOrderedWithAdditional() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
+	public void testBuildCustomizerOrderedWithAdditional() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);
 
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		clientFactoryBean.addCustomizer(builder -> builder.logLevel(Logger.Level.BASIC));
 		clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
-		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();
 		}
 
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java

@@ -25,8 +25,11 @@ import java.util.Collections;
 import java.util.List;
 
 import feign.Feign;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 
 import org.springframework.cloud.openfeign.testclients.TestClient;
@@ -34,14 +37,15 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Sven Döring
  * @author Sam Kruglov
- * @author Szymon Linowski
  */
-class FeignClientBuilderTests {
+public class FeignClientBuilderTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
 	private FeignClientBuilder feignClientBuilder;
 
@@ -71,14 +75,14 @@ class FeignClientBuilderTests {
 		return (T) ReflectionUtils.getField(field, factoryBean);
 	}
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public void setUp() {
 		this.applicationContext = Mockito.mock(ApplicationContext.class);
 		this.feignClientBuilder = new FeignClientBuilder(this.applicationContext);
 	}
 
 	@Test
-	void safetyCheckForNewFieldsOnTheFeignClientAnnotation() {
+	public void safetyCheckForNewFieldsOnTheFeignClientAnnotation() {
 		final List<String> methodNames = new ArrayList();
 		for (final Method method : FeignClient.class.getMethods()) {
 			methodNames.add(method.getName());
@@ -97,7 +101,7 @@ class FeignClientBuilderTests {
 	}
 
 	@Test
-	void forType_preinitializedBuilder() {
+	public void forType_preinitializedBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder.forType(TestFeignClient.class, "TestClient");
 
@@ -116,7 +120,7 @@ class FeignClientBuilderTests {
 	}
 
 	@Test
-	void forType_allFieldsSetOnBuilder() {
+	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder.forType(TestFeignClient.class, "TestClient")
 				.decode404(true).url("Url/").path("/Path").contextId("TestContext");
@@ -135,7 +139,7 @@ class FeignClientBuilderTests {
 	}
 
 	@Test
-	void forType_clientFactoryBeanProvided() {
+	public void forType_clientFactoryBeanProvided() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
 				.forType(TestFeignClient.class, new FeignClientFactoryBean(), "TestClient").decode404(true)
@@ -156,19 +160,21 @@ class FeignClientBuilderTests {
 	}
 
 	@Test
-	void forType_build() {
+	public void forType_build() {
 		// given:
 		Mockito.when(this.applicationContext.getBean(FeignContext.class)).thenThrow(new ClosedFileSystemException()); // throw
-		// an
-		// unusual
-		// exception
-		// in
-		// the
-		// FeignClientFactoryBean
+																														// an
+																														// unusual
+																														// exception
+																														// in
+																														// the
+																														// FeignClientFactoryBean
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder.forType(TestClient.class, "TestClient");
+
 		// expect: 'the build will fail right after calling build() with the mocked
 		// unusual exception'
-		assertThatExceptionOfType(ClosedFileSystemException.class).isThrownBy(() -> builder.build());
+		this.thrown.expect(Matchers.isA(ClosedFileSystemException.class));
+		builder.build();
 	}
 
 	private interface TestFeignClient {

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientCacheTests.java

@@ -1,123 +0,0 @@
-/*
- * Copyright 2020-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.net.UnknownHostException;
-
-import feign.Contract;
-import feign.RequestLine;
-import feign.RetryableException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-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.cache.CacheManager;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.interceptor.SimpleKey;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Sam Kruglov
- */
-@SpringBootTest(classes = FeignClientCacheTests.TestConfiguration.class)
-@DirtiesContext
-public class FeignClientCacheTests {
-
-	private static final String CACHE_NAME = "foo-cache";
-
-	@Autowired
-	private FooClient foo;
-
-	@Test
-	void cacheExists(@Autowired CacheManager cacheManager) {
-		assertThat(cacheManager.getCache(CACHE_NAME)).isNotNull();
-	}
-
-	@Test
-	void interceptedCallsReal() {
-		assertThatExceptionOfType(RetryableException.class).isThrownBy(foo::getWithCache)
-				.withRootCauseInstanceOf(UnknownHostException.class);
-	}
-
-	@Test
-	void nonInterceptedCallsReal() {
-		assertThatExceptionOfType(RetryableException.class).isThrownBy(foo::getWithoutCache)
-				.withRootCauseInstanceOf(UnknownHostException.class);
-	}
-
-	@Nested
-	class givenCached {
-
-		String cachedValue = "cached";
-
-		@BeforeEach
-		void setUp(@Autowired CacheManager cacheManager) {
-			cacheManager.getCache(CACHE_NAME).put(SimpleKey.EMPTY, cachedValue);
-		}
-
-		@Test
-		void interceptedReturnsCached() {
-			assertThat(foo.getWithCache()).isSameAs(cachedValue);
-		}
-
-		@Test
-		void nonInterceptedCallsReal() {
-			assertThatExceptionOfType(RetryableException.class).isThrownBy(foo::getWithoutCache)
-					.withRootCauseInstanceOf(UnknownHostException.class);
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableFeignClients(clients = FooClient.class)
-	@EnableAutoConfiguration
-	@EnableCaching
-	protected static class TestConfiguration {
-
-	}
-
-	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
-	interface FooClient {
-
-		@RequestLine("GET /with-cache")
-		@Cacheable(cacheNames = CACHE_NAME)
-		String getWithCache();
-
-		@RequestLine("GET /without-cache")
-		String getWithoutCache();
-
-	}
-
-	public static class FooConfiguration {
-
-		@Bean
-		Contract feignContract() {
-			return new Contract.Default();
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientConfigurationTests.java

@@ -24,7 +24,6 @@ import feign.Capability;
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
 import feign.Logger;
-import feign.QueryMapEncoder;
 import feign.RequestInterceptor;
 import feign.Retryer;
 import feign.codec.Decoder;
@@ -44,7 +43,6 @@ import static org.springframework.cloud.openfeign.test.EqualsAndHashCodeAssert.a
 
 /**
  * @author Jonatan Ivanov
- * @author Hyeonmin Park
  */
 class FeignClientConfigurationTests {
 
@@ -66,7 +64,6 @@ class FeignClientConfigurationTests {
 		assertThat(config.getContract()).isNull();
 		assertThat(config.getExceptionPropagationPolicy()).isNull();
 		assertThat(config.getCapabilities()).isNull();
-		assertThat(config.getQueryMapEncoder()).isNull();
 		assertThat(config.getMetrics()).isNull();
 	}
 
@@ -91,7 +88,6 @@ class FeignClientConfigurationTests {
 		config.setExceptionPropagationPolicy(ExceptionPropagationPolicy.UNWRAP);
 		List<Class<Capability>> capabilities = Lists.list(Capability.class);
 		config.setCapabilities(capabilities);
-		config.setQueryMapEncoder(QueryMapEncoder.class);
 		FeignClientProperties.MetricsProperties metrics = new FeignClientProperties.MetricsProperties();
 		config.setMetrics(metrics);
 
@@ -109,7 +105,6 @@ class FeignClientConfigurationTests {
 		assertThat(config.getContract()).isSameAs(Contract.class);
 		assertThat(config.getExceptionPropagationPolicy()).isSameAs(ExceptionPropagationPolicy.UNWRAP);
 		assertThat(config.getCapabilities()).isSameAs(capabilities);
-		assertThat(config.getQueryMapEncoder()).isSameAs(QueryMapEncoder.class);
 		assertThat(config.getMetrics()).isSameAs(metrics);
 	}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientMetricsEnabledConditionTests.java

@@ -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");
 	}
 
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingConfigurerTest.java

@@ -24,7 +24,8 @@ import feign.Feign;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.micrometer.MicrometerCapability;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -34,6 +35,7 @@ import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -43,11 +45,12 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Jonatan Ivanov
  */
 @DirtiesContext
+@RunWith(SpringJUnit4ClassRunner.class)
 @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" })
-class FeignClientUsingConfigurerTest {
+		"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" })
+public class FeignClientUsingConfigurerTest {
 
 	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
 
@@ -58,7 +61,7 @@ class FeignClientUsingConfigurerTest {
 	private FeignContext context;
 
 	@Test
-	void testFeignClient() {
+	public void testFeignClient() {
 		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
 				.getBeanDefinition(BEAN_NAME_PREFIX + "TestFeignClient")
 				.getAttribute("feignClientsRegistrarFactoryBean");
@@ -81,7 +84,7 @@ class FeignClientUsingConfigurerTest {
 	}
 
 	@Test
-	void testNoInheritFeignClient() {
+	public void testNoInheritFeignClient() {
 		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
 				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
 				.getAttribute("feignClientsRegistrarFactoryBean");
@@ -97,7 +100,7 @@ class FeignClientUsingConfigurerTest {
 	}
 
 	@Test
-	void testNoInheritFeignClient_ignoreProperties() {
+	public void testNoInheritFeignClient_ignoreProperties() {
 		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
 				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
 				.getAttribute("feignClientsRegistrarFactoryBean");

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java

@@ -32,10 +32,11 @@ 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;
-import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
@@ -45,7 +46,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;
@@ -78,7 +78,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * @author Olga Maciaszek-Sharma
  * @author Ilia Ilinykh
  * @author Jonatan Ivanov
- * @author Hyeonmin Park
  */
 @SuppressWarnings("FieldMayBeFinal")
 @SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
@@ -247,19 +246,6 @@ public class FeignClientUsingPropertiesTests {
 				.hasAtLeastOneElementOfType(MicrometerCapability.class);
 	}
 
-	@Test
-	public void clientShouldContainQueryMapEncoder() {
-		fooFactoryBean.setApplicationContext(applicationContext);
-		Feign.Builder feignBuilder = fooFactoryBean.feign(context);
-		FooClient fooClient = feignBuilder.target(FooClient.class, "http://localhost:" + port);
-
-		String response = fooClient.foo();
-		assertThat(response).isEqualTo("OK");
-		QueryMapEncoder queryMapEncoder = (QueryMapEncoder) ReflectionTestUtils.getField(feignBuilder,
-				"queryMapEncoder");
-		assertThat(queryMapEncoder).isInstanceOf(NoOpQueryMapEncoder.class);
-	}
-
 	@Test
 	@DisabledForJreRange(min = JRE.JAVA_16)
 	public void shouldSetFollowRedirects() {
@@ -432,13 +418,4 @@ public class FeignClientUsingPropertiesTests {
 
 	}
 
-	public static class NoOpQueryMapEncoder implements QueryMapEncoder {
-
-		@Override
-		public Map<String, Object> encode(Object o) {
-			return null;
-		}
-
-	}
-
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java

@@ -18,22 +18,17 @@ 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.junit.Test;
 
 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;
 
 /**
@@ -43,42 +38,42 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  * @author Szymon Linowski
  * @author Olga Maciaszek-Sharma
  */
-class FeignClientsRegistrarTests {
+public class FeignClientsRegistrarTests {
 
-	@Test
-	void badNameHttpPrefix() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> testGetName("http://bad_hostname"));
+	@Test(expected = IllegalStateException.class)
+	public void badNameHttpPrefix() {
+		testGetName("https://bad_hostname");
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void badNameHttpsPrefix() {
+		testGetName("https://bad_hostname");
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void badName() {
+		testGetName("bad_hostname");
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void badNameStartsWithHttp() {
+		testGetName("http_bad_hostname");
 	}
 
 	@Test
-	void badNameHttpsPrefix() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> testGetName("https://bad_hostname"));
-	}
-
-	@Test
-	void badName() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> testGetName("bad_hostname"));
-	}
-
-	@Test
-	void badNameStartsWithHttp() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> testGetName("http_bad_hostname"));
-	}
-
-	@Test
-	void goodName() {
+	public void goodName() {
 		String name = testGetName("good-name");
 		assertThat(name).as("name was wrong").isEqualTo("good-name");
 	}
 
 	@Test
-	void goodNameHttpPrefix() {
+	public void goodNameHttpPrefix() {
 		String name = testGetName("https://good-name");
 		assertThat(name).as("name was wrong").isEqualTo("https://good-name");
 	}
 
 	@Test
-	void goodNameHttpsPrefix() {
+	public void goodNameHttpsPrefix() {
 		String name = testGetName("https://goodname");
 		assertThat(name).as("name was wrong").isEqualTo("https://goodname");
 	}
@@ -89,46 +84,28 @@ class FeignClientsRegistrarTests {
 		return registrar.getName(Collections.singletonMap("name", name));
 	}
 
-	@Test
-	void testFallback() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
-				.isThrownBy(() -> new AnnotationConfigApplicationContext(FallbackTestConfig.class));
+	@Test(expected = IllegalArgumentException.class)
+	public void testFallback() {
+		new AnnotationConfigApplicationContext(FallbackTestConfig.class);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testFallbackFactory() {
+		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}
 
 	@Test
-	void testFallbackFactory() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
-				.isThrownBy(() -> new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class));
-	}
-
-	@Test
-	void shouldPassSubLevelFeignClient() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		((DefaultListableBeanFactory) context.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
-		context.register(TopLevelSubLevelTestConfig.class);
-		assertThatCode(context::refresh)
+	public void shouldPassSubLevelFeignClient() {
+		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() {
+	public void shouldResolveAndValidateNullName() {
 		assertThatIllegalStateException().isThrownBy(() -> {
 			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 			context.register(NullExpressionNameFeignClientTestConfig.class);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java

@@ -21,7 +21,8 @@ import java.util.Map;
 import feign.Client;
 import feign.RequestInterceptor;
 import feign.httpclient.ApacheHttpClient;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -31,6 +32,8 @@ import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoC
 import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingInterceptor;
 import org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration;
 import org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingInterceptor;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,14 +43,15 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Ryan Baxter
  * @author Biju Kunjummen
  */
-class FeignCompressionTests {
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "ribbon-loadbalancer-{version:\\d.*}.jar" })
+public class FeignCompressionTests {
 
 	@Test
-	void testInterceptors() {
+	public 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))

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignContextTest.java

@@ -21,7 +21,7 @@ import java.util.Collection;
 import feign.Logger;
 import feign.RequestInterceptor;
 import org.assertj.core.util.Lists;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -30,10 +30,10 @@ import org.springframework.context.annotation.Import;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class FeignContextTest {
+public class FeignContextTest {
 
 	@Test
-	void getInstanceWithoutAncestors_verifyNullForMissing() {
+	public void getInstanceWithoutAncestors_verifyNullForMissing() {
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.refresh();
 
@@ -51,7 +51,7 @@ class FeignContextTest {
 	}
 
 	@Test
-	void getInstancesWithoutAncestors_verifyEmptyForMissing() {
+	public void getInstancesWithoutAncestors_verifyEmptyForMissing() {
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.refresh();
 
@@ -66,7 +66,7 @@ class FeignContextTest {
 	}
 
 	@Test
-	void getInstanceWithoutAncestors() {
+	public void getInstanceWithoutAncestors() {
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.refresh();
 
@@ -80,7 +80,7 @@ class FeignContextTest {
 	}
 
 	@Test
-	void getInstancesWithoutAncestors() {
+	public void getInstancesWithoutAncestors() {
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.refresh();
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignErrorDecoderFactoryTests.java

@@ -18,7 +18,7 @@ package org.springframework.cloud.openfeign;
 
 import feign.Response;
 import feign.codec.ErrorDecoder;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -30,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Michael Cramer
  */
-class FeignErrorDecoderFactoryTests {
+public class FeignErrorDecoderFactoryTests {
 
 	@Test
-	void testNoDefaultFactory() {
+	public void testNoDefaultFactory() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration1.class);
 		String[] beanNamesForType = context.getBeanNamesForType(FeignErrorDecoderFactory.class);
 		assertThat(beanNamesForType).isEmpty();
@@ -41,7 +41,7 @@ class FeignErrorDecoderFactoryTests {
 	}
 
 	@Test
-	void testCustomErrorDecoderFactory() {
+	public void testCustomErrorDecoderFactory() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration2.class);
 		FeignErrorDecoderFactory errorDecoderFactory = context.getBean(FeignErrorDecoderFactory.class);
 		assertThat(errorDecoderFactory).isNotNull();
@@ -52,7 +52,7 @@ class FeignErrorDecoderFactoryTests {
 	}
 
 	@Test
-	void testCustomErrorDecoderFactoryNotOverwritingErrorDecoder() {
+	public void testCustomErrorDecoderFactoryNotOverwritingErrorDecoder() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration3.class);
 		FeignErrorDecoderFactory errorDecoderFactory = context.getBean(FeignErrorDecoderFactory.class);
 		assertThat(errorDecoderFactory).isNotNull();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java

@@ -22,12 +22,14 @@ import feign.httpclient.ApacheHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
 import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Nguyen Ky Thanh
  */
-class FeignHttpClient5ConfigurationTests {
+public class FeignHttpClient5ConfigurationTests {
 
 	private static void verifyHc4BeansAvailable(ConfigurableApplicationContext context) {
 		org.apache.http.impl.client.CloseableHttpClient httpClient4 = context
@@ -57,60 +59,64 @@ class FeignHttpClient5ConfigurationTests {
 		assertThat(client).isInstanceOf(ApacheHttp5Client.class);
 	}
 
-	@Test
-	void verifyHttpClient5AutoConfig() {
-		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true",
-						"spring.cloud.openfeign.httpclient.enabled=false")
-				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
-				.run();
-
-		verifyHc5BeansAvailable(context);
-
-		if (context != null) {
-			context.close();
-		}
-	}
-
-	@Test
-	void hc5ShouldWinIfTheBothVersionsAvailable() {
-		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true",
-						"spring.cloud.openfeign.httpclient.enabled=true")
-				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
-				.run();
-
-		Client client = context.getBean(Client.class);
-		assertThat(client).isInstanceOf(ApacheHttp5Client.class);
-
-		if (context != null) {
-			context.close();
-		}
-	}
-
-	@Test
-	void hc4ShouldBeTheDefaultIfHc5NotEnabled() {
-		ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("spring.cloud.openfeign.httpclient.hc5.enabled=false",
-						"spring.cloud.openfeign.httpclient.enabled=true")
-				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
-				.run();
-
-		verifyHc4BeansAvailable(context);
-
-		if (context != null) {
-			context.close();
-		}
-	}
-
-	@ClassPathExclusions({ "feign-hc5-{version:\\d.*}.jar", "httpclient5-{version:\\d.*}.jar",
-			"httpcore5-{version:\\d.*}.jar", "httpcore5-h2-{version:\\d.*}.jar" })
-	static class WithoutLoadBalancerAndHc5InClasspath {
+	@RunWith(ModifiedClassPathRunner.class)
+	@ClassPathExclusions("ribbon-loadbalancer-{version:\\d.*}.jar")
+	public static class WithoutLoadBalancerInClasspath {
 
 		@Test
-		void hc4ShouldWinEvenHc5ConfigEnabled() {
+		public void verifyHttpClient5AutoConfig() {
 			ConfigurableApplicationContext context = new SpringApplicationBuilder()
-					.properties("spring.cloud.openfeign.httpclient.hc5.enabled=true").web(WebApplicationType.NONE)
+					.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=false")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			verifyHc5BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+		@Test
+		public void hc5ShouldWinIfTheBothVersionsAvailable() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=true", "feign.httpclient.enabled=true")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			Client client = context.getBean(Client.class);
+			assertThat(client).isInstanceOf(ApacheHttp5Client.class);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+		@Test
+		public void hc4ShouldBeTheDefaultIfHc5NotEnabled() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=false", "feign.httpclient.enabled=true")
+					.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
+					.run();
+
+			verifyHc4BeansAvailable(context);
+
+			if (context != null) {
+				context.close();
+			}
+		}
+
+	}
+
+	@RunWith(ModifiedClassPathRunner.class)
+	@ClassPathExclusions({ "ribbon-loadbalancer-{version:\\d.*}.jar", "feign-hc5-{version:\\d.*}.jar",
+			"httpclient5-{version:\\d.*}.jar", "httpcore5-{version:\\d.*}.jar", "httpcore5-h2-{version:\\d.*}.jar" })
+	public static class WithoutLoadBalancerAndHc5InClasspath {
+
+		@Test
+		public void hc4ShouldWinEvenHc5ConfigEnabled() {
+			ConfigurableApplicationContext context = new SpringApplicationBuilder()
+					.properties("feign.httpclient.hc5.enabled=true").web(WebApplicationType.NONE)
 					.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 
 			verifyHc4BeansAvailable(context);
@@ -121,7 +127,7 @@ class FeignHttpClient5ConfigurationTests {
 		}
 
 		@Test
-		void hc4ShouldBeTheDefault() {
+		public void hc4ShouldBeTheDefault() {
 			ConfigurableApplicationContext context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
 					.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientConfigurationTests.java

@@ -26,13 +26,16 @@ import org.apache.http.config.Lookup;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.impl.conn.DefaultHttpClientConnectionOperator;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
@@ -41,27 +44,28 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Ryan Baxter
  */
-class FeignHttpClientConfigurationTests {
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "ribbon-loadbalancer-{version:\\d.*}.jar" })
+public class FeignHttpClientConfigurationTests {
 
 	private ConfigurableApplicationContext context;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public 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
-	void tearDown() {
+	@After
+	public void tearDown() {
 		if (this.context != null) {
 			this.context.close();
 		}
 	}
 
 	@Test
-	void disableSslTest() {
+	public void disableSslTest() throws Exception {
 		try {
 			HttpClientConnectionManager connectionManager = this.context.getBean(HttpClientConnectionManager.class);
 			Lookup<ConnectionSocketFactory> socketFactoryRegistry = getConnectionSocketFactoryLookup(connectionManager);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java

@@ -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 {
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithRetryableLoadBalancer.java

@@ -49,8 +49,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  */
 @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" })
+		value = { "spring.application.name=feignclienturlwithretryableloadbalancertest", "feign.hystrix.enabled=false",
+				"feign.okhttp.enabled=false", "spring.cloud.loadbalancer.ribbon.enabled=false" })
 @DirtiesContext
 class FeignHttpClientUrlTestsWithRetryableLoadBalancer {
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignLoggerFactoryTests.java

@@ -18,7 +18,7 @@ package org.springframework.cloud.openfeign;
 
 import feign.Logger;
 import feign.slf4j.Slf4jLogger;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -30,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Venil Noronha
  */
-class FeignLoggerFactoryTests {
+public class FeignLoggerFactoryTests {
 
 	@Test
-	void testDefaultLogger() {
+	public void testDefaultLogger() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration1.class);
 		FeignLoggerFactory loggerFactory = context.getBean(FeignLoggerFactory.class);
 		assertThat(loggerFactory).isNotNull();
@@ -44,7 +44,7 @@ class FeignLoggerFactoryTests {
 	}
 
 	@Test
-	void testCustomLogger() {
+	public void testCustomLogger() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration2.class);
 		FeignLoggerFactory loggerFactory = context.getBean(FeignLoggerFactory.class);
 		assertThat(loggerFactory).isNotNull();
@@ -55,7 +55,7 @@ class FeignLoggerFactoryTests {
 	}
 
 	@Test
-	void testCustomLoggerFactory() {
+	public void testCustomLoggerFactory() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleConfiguration3.class);
 		FeignLoggerFactory loggerFactory = context.getBean(FeignLoggerFactory.class);
 		assertThat(loggerFactory).isNotNull();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java

@@ -21,14 +21,17 @@ import java.lang.reflect.Field;
 import javax.net.ssl.HostnameVerifier;
 
 import okhttp3.OkHttpClient;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
@@ -37,42 +40,36 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Ryan Baxter
  */
-class FeignOkHttpConfigurationTests {
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "ribbon-loadbalancer-{version:\\d.*}.jar" })
+public class FeignOkHttpConfigurationTests {
 
 	private ConfigurableApplicationContext context;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public 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")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();
 	}
 
-	@AfterEach
-	void tearDown() {
-		if (context != null) {
-			context.close();
+	@After
+	public void tearDown() {
+		if (this.context != null) {
+			this.context.close();
 		}
 	}
 
 	@Test
-	void disableSslTest() {
-		OkHttpClient httpClient = context.getBean(OkHttpClient.class);
+	public void disableSslTest() throws Exception {
+		OkHttpClient httpClient = this.context.getBean(OkHttpClient.class);
 		HostnameVerifier hostnameVerifier = (HostnameVerifier) this.getField(httpClient, "hostnameVerifier");
-		assertThat(hostnameVerifier instanceof OkHttpClientFactory.TrustAllHostnames).isTrue();
+		assertThat(OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier)).isTrue();
 	}
 
-	@Test
-	void shouldConfigureReadTimeout() {
-		OkHttpClient httpClient = context.getBean(OkHttpClient.class);
-
-		assertThat(httpClient.readTimeoutMillis()).isEqualTo(9000);
-	}
-
-	protected Object getField(Object target, String name) {
+	protected <T> Object getField(Object target, String name) {
 		Field field = ReflectionUtils.findField(target.getClass(), name);
 		ReflectionUtils.makeAccessible(field);
 		Object value = ReflectionUtils.getField(field, target);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java

@@ -21,8 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -37,6 +37,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -45,12 +46,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
- * @author Szymon Linowski
  */
+@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringDecoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
 @DirtiesContext
-class SpringDecoderTests extends FeignClientFactoryBean {
+public class SpringDecoderTests extends FeignClientFactoryBean {
 
 	@Autowired
 	FeignContext context;
@@ -58,7 +59,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 	@LocalServerPort
 	private int port = 0;
 
-	SpringDecoderTests() {
+	public SpringDecoderTests() {
 		setName("test");
 		setContextId("test");
 	}
@@ -74,7 +75,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testResponseEntity() {
+	public void testResponseEntity() {
 		ResponseEntity<Hello> response = testClient().getHelloResponse();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
@@ -84,14 +85,14 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testSimpleType() {
+	public void testSimpleType() {
 		Hello hello = testClient().getHello();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match").isEqualTo(new Hello("hello world 1"));
 	}
 
 	@Test
-	void testUserParameterizedTypeDecode() {
+	public void testUserParameterizedTypeDecode() {
 		List<Hello> hellos = testClient().getHellos();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(hellos.size()).as("hellos was not the right size").isEqualTo(2);
@@ -99,7 +100,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testSimpleParameterizedTypeDecode() {
+	public void testSimpleParameterizedTypeDecode() {
 		List<String> hellos = testClient().getHelloStrings();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(hellos.size()).as("hellos was not the right size").isEqualTo(2);
@@ -108,7 +109,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	void testWildcardTypeDecode() {
+	public void testWildcardTypeDecode() {
 		ResponseEntity<?> wildcard = testClient().getWildcard();
 		assertThat(wildcard).as("wildcard was null").isNotNull();
 		assertThat(wildcard.getStatusCode()).as("wrong status code").isEqualTo(HttpStatus.OK);
@@ -120,7 +121,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 	}
 
 	@Test
-	void testResponseEntityVoid() {
+	public void testResponseEntityVoid() {
 		ResponseEntity<Void> response = testClient().getHelloVoid();
 		assertThat(response).as("response was null").isNotNull();
 		List<String> headerVals = response.getHeaders().get("x-test-header");
@@ -130,13 +131,13 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 		assertThat(header).as("header was wrong").isEqualTo("myval");
 	}
 
-	@Test
-	void test404() {
-		Assertions.assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> testClient().getNotFound());
+	@Test(expected = RuntimeException.class)
+	public void test404() {
+		testClient().getNotFound();
 	}
 
 	@Test
-	void testDecodes404() {
+	public void testDecodes404() {
 		final ResponseEntity<String> response = testClient(true).getNotFound();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getBody()).as("response body was not null").isNull();
@@ -144,7 +145,7 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 
 	@Test
 	// Issue: https://github.com/spring-cloud/spring-cloud-openfeign/issues/456
-	void testResponseEntityHeaders() {
+	public void testResponseEntityHeaders() {
 		ResponseEntity<String> response = testClient().getContentType();
 		assertThat(response.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
 	}
@@ -181,10 +182,10 @@ class SpringDecoderTests extends FeignClientFactoryBean {
 
 		private String message;
 
-		Hello() {
+		public Hello() {
 		}
 
-		Hello(String message) {
+		public Hello(String message) {
 			this.message = message;
 		}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/beans/BeansFeignClientTests.java

@@ -21,7 +21,8 @@ import java.lang.reflect.Proxy;
 import java.util.Map;
 import java.util.Objects;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,6 +38,7 @@ 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.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -50,10 +52,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Halvdan Hoem Grelland
  * @author Aaron Whiteside
  */
+@RunWith(SpringJUnit4ClassRunner.class)
 @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 {
 
@@ -75,13 +78,13 @@ public class BeansFeignClientTests {
 	private TestClient buildByBuilder;
 
 	@Test
-	void testAnnotations() {
+	public void testAnnotations() {
 		Map<String, Object> beans = this.context.getBeansWithAnnotation(FeignClient.class);
 		assertThat(beans.containsKey(TestClient.class.getName())).as("Wrong clients: " + beans).isTrue();
 	}
 
 	@Test
-	void testClient() {
+	public void testClient() {
 		assertThat(this.testClient).as("testClient was null").isNotNull();
 		assertThat(this.extraClient).as("extraClient was null").isNotNull();
 		assertThat(Proxy.isProxyClass(this.testClient.getClass())).as("testClient is not a java Proxy").isTrue();
@@ -90,7 +93,7 @@ public class BeansFeignClientTests {
 	}
 
 	@Test
-	void extraClient() {
+	public void extraClient() {
 		assertThat(this.extraClient).as("extraClient was null").isNotNull();
 		assertThat(Proxy.isProxyClass(this.extraClient.getClass())).as("extraClient is not a java Proxy").isTrue();
 		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.extraClient);
@@ -98,7 +101,7 @@ public class BeansFeignClientTests {
 	}
 
 	@Test
-	void buildByBuilder() {
+	public void buildByBuilder() {
 		assertThat(this.buildByBuilder).as("buildByBuilder was null").isNotNull();
 		assertThat(Proxy.isProxyClass(this.buildByBuilder.getClass())).as("buildByBuilder is not a java Proxy")
 				.isTrue();
@@ -129,10 +132,10 @@ public class BeansFeignClientTests {
 
 		private String message;
 
-		Hello() {
+		public Hello() {
 		}
 
-		Hello(String message) {
+		public Hello(String message) {
 			this.message = message;
 		}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/AsyncCircuitBreakerTest.java

@@ -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 {
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java

@@ -21,10 +21,11 @@ import java.util.function.Function;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -43,6 +44,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.SocketUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -53,11 +55,11 @@ 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" })
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT, value = {
+		"spring.application.name=springcircuittest", "spring.jmx.enabled=false", "feign.circuitbreaker.enabled=true" })
 @DirtiesContext
-class CircuitBreakerTests {
+public class CircuitBreakerTests {
 
 	@Autowired
 	MyCircuitBreaker myCircuitBreaker;
@@ -72,22 +74,22 @@ class CircuitBreakerTests {
 	TestClientWithFactory testClientWithFactory;
 
 	@BeforeAll
-	static void beforeClass() {
+	public static void beforeClass() {
 		System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort()));
 	}
 
 	@AfterAll
-	static void afterClass() {
+	public static void afterClass() {
 		System.clearProperty("server.port");
 	}
 
-	@BeforeEach
-	void setup() {
+	@Before
+	public void setup() {
 		this.myCircuitBreaker.clear();
 	}
 
 	@Test
-	void testSimpleTypeWithFallback() {
+	public void testSimpleTypeWithFallback() {
 		Hello hello = testClient.getHello();
 
 		assertThat(hello).as("hello was null").isNotNull();
@@ -96,12 +98,12 @@ class CircuitBreakerTests {
 	}
 
 	@Test
-	void test404WithFallback() {
+	public void test404WithFallback() {
 		assertThat(testClient.getException()).isEqualTo("Fixed response");
 	}
 
 	@Test
-	void testSimpleTypeWithFallbackFactory() {
+	public void testSimpleTypeWithFallbackFactory() {
 		Hello hello = testClientWithFactory.getHello();
 
 		assertThat(hello).as("hello was null").isNotNull();
@@ -110,18 +112,18 @@ class CircuitBreakerTests {
 	}
 
 	@Test
-	void test404WithFallbackFactory() {
+	public void test404WithFallbackFactory() {
 		assertThat(testClientWithFactory.getException()).isEqualTo("Fixed response");
 	}
 
 	@Test
-	void testRuntimeExceptionUnwrapped() {
+	public void testRuntimeExceptionUnwrapped() {
 		assertThatExceptionOfType(UnsupportedOperationException.class)
 				.isThrownBy(() -> exceptionClient.getRuntimeException());
 	}
 
 	@Test
-	void testCheckedExceptionWrapped() {
+	public void testCheckedExceptionWrapped() {
 		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> exceptionClient.getCheckedException());
 	}
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerWithNoFallbackTests.java

@@ -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 {
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java

@@ -18,7 +18,8 @@ package org.springframework.cloud.openfeign.encoding;
 
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -48,15 +50,16 @@ 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" })
+@RunWith(SpringRunner.class)
 @DirtiesContext
-class FeignAcceptEncodingTests {
+public class FeignAcceptEncodingTests {
 
 	@Autowired
 	private InvoiceClient invoiceClient;
 
 	@Test
-	void compressedResponse() {
+	public void compressedResponse() {
 
 		// when
 		final ResponseEntity<List<Invoice>> invoices = this.invoiceClient.getInvoices();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java

@@ -18,7 +18,8 @@ package org.springframework.cloud.openfeign.encoding;
 
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -37,6 +38,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -47,14 +49,15 @@ 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" })
-class FeignContentEncodingTests {
+		value = { "feign.compression.request.enabled=true", "ribbon.OkToRetryOnAllOperations=false" })
+@RunWith(SpringJUnit4ClassRunner.class)
+public class FeignContentEncodingTests {
 
 	@Autowired
 	private InvoiceClient invoiceClient;
 
 	@Test
-	void compressedResponse() {
+	public void compressedResponse() {
 
 		// given
 		final List<Invoice> invoices = Invoices.createInvoiceList(50);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java

@@ -19,7 +19,8 @@ package org.springframework.cloud.openfeign.encoding;
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -44,6 +45,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -55,15 +57,15 @@ 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" })
-class FeignPageableEncodingTests {
+		value = { "feign.compression.request.enabled=true", "feign.autoconfiguration.jackson.enabled=true" })
+@RunWith(SpringJUnit4ClassRunner.class)
+public class FeignPageableEncodingTests {
 
 	@Autowired
 	private InvoiceClient invoiceClient;
 
 	@Test
-	void testPageable() {
+	public void testPageable() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10, Sort.Direction.ASC, "sortProperty");
 
@@ -85,7 +87,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testPageableWithDescDirection() {
+	public void testPageableWithDescDirection() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10, Sort.Direction.DESC, "sortProperty");
 
@@ -111,7 +113,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testPageableWithMultipleSort() {
+	public void testPageableWithMultipleSort() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2")));
@@ -141,7 +143,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testPageableWithoutSort() {
+	public void testPageableWithoutSort() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10);
 
@@ -160,7 +162,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testPageableWithoutSortWithBody() {
+	public void testPageableWithoutSortWithBody() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10);
 
@@ -182,7 +184,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testPageableWithBody() {
+	public void testPageableWithBody() {
 		// given
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2")));
@@ -219,7 +221,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testUnpagedWithBody() {
+	public void testUnpagedWithBody() {
 		// given
 		Pageable unpaged = Pageable.unpaged();
 
@@ -240,7 +242,7 @@ class FeignPageableEncodingTests {
 	}
 
 	@Test
-	void testSortWithBody() {
+	public void testSortWithBody() {
 		// given
 		Sort sort = Sort.by(Sort.Order.desc("amount"));
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/proto/ProtobufNotInClasspathTest.java

@@ -17,12 +17,14 @@
 package org.springframework.cloud.openfeign.encoding.proto;
 
 import feign.RequestTemplate;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.http.converter.StringHttpMessageConverter;
 
 import static feign.Request.HttpMethod.POST;
@@ -32,11 +34,12 @@ import static feign.Request.HttpMethod.POST;
  *
  * @author ScienJus
  */
+@RunWith(ModifiedClassPathRunner.class)
 @ClassPathExclusions("protobuf-*.jar")
-class ProtobufNotInClasspathTest {
+public class ProtobufNotInClasspathTest {
 
 	@Test
-	void testEncodeWhenProtobufNotInClasspath() {
+	public void testEncodeWhenProtobufNotInClasspath() {
 		ObjectFactory<HttpMessageConverters> converters = () -> new HttpMessageConverters(
 				new StringHttpMessageConverter());
 		RequestTemplate requestTemplate = new RequestTemplate();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/proto/ProtobufSpringEncoderTest.java

@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign.encoding.proto;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,12 +35,12 @@ import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicStatusLine;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.BDDMockito;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 import org.springframework.beans.factory.ObjectFactory;
@@ -57,8 +58,8 @@ import static org.assertj.core.api.Assertions.fail;
  *
  * @author ScienJus
  */
-@ExtendWith(MockitoExtension.class)
-class ProtobufSpringEncoderTest {
+@RunWith(MockitoJUnitRunner.class)
+public class ProtobufSpringEncoderTest {
 
 	@Mock
 	private HttpClient httpClient;
@@ -69,7 +70,7 @@ class ProtobufSpringEncoderTest {
 			.setMsg("Erlang/OTP 最初是爱立信为开发电信设备系统设计的编程语言平台，" + "电信设备(路由器、接入网关、…)典型设计是通过背板连接主控板卡与多块业务板卡的分布式系统。").build();
 
 	@Test
-	void testProtobuf() throws IOException {
+	public void testProtobuf() throws IOException {
 		// protobuf convert to request by feign and ProtobufHttpMessageConverter
 		RequestTemplate requestTemplate = newRequestTemplate();
 		newEncoder().encode(this.request, Request.class, requestTemplate);
@@ -83,7 +84,7 @@ class ProtobufSpringEncoderTest {
 	}
 
 	@Test
-	void testProtobufWithCharsetWillFail() throws IOException {
+	public void testProtobufWithCharsetWillFail() throws IOException, URISyntaxException {
 		// protobuf convert to request by feign and ProtobufHttpMessageConverter
 		RequestTemplate requestTemplate = newRequestTemplate();
 		newEncoder().encode(this.request, Request.class, requestTemplate);

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.cloud.openfeign.hateoas;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
@@ -27,20 +27,19 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
-import org.springframework.hateoas.config.WebConverters;
+import org.springframework.hateoas.RepresentationModel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Hector Espert
- * @author Olga Maciaszek-Sharma
  */
-class FeignHalAutoConfigurationContextTests {
+public class FeignHalAutoConfigurationContextTests {
 
 	private WebApplicationContextRunner contextRunner;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public void setUp() {
 		contextRunner = new WebApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
 						HttpMessageConvertersAutoConfiguration.class, HypermediaAutoConfiguration.class,
@@ -49,18 +48,23 @@ class FeignHalAutoConfigurationContextTests {
 	}
 
 	@Test
-	void shouldNotLoadWebConvertersCustomizerWhenNotWebConvertersNotInClasspath() {
+	public void testHalJacksonHttpMessageConverterIsNotLoaded() {
 		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class,
-				WebConverters.class);
+				RepresentationModel.class);
 		contextRunner.withClassLoader(filteredClassLoader)
-				.run(context -> assertThat(context).doesNotHaveBean("webConvertersCustomizer"));
+				.run(context -> assertThat(context).doesNotHaveBean("halJacksonHttpMessageConverter"));
 	}
 
 	@Test
-	void shouldLoadWebConvertersCustomizer() {
+	public void testHalJacksonHttpMessageConverterIsLoaded() {
 		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class);
 		contextRunner.withClassLoader(filteredClassLoader)
-				.run(context -> assertThat(context).hasBean("webConvertersCustomizer"));
+				.run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
+	}
+
+	@Test
+	public void testHalJacksonHttpMessageConverterIsNotLoadedUseRestDataMessageConverterInstead() {
+		contextRunner.run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
 	}
 
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas;
+
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.server.LinkRelationProvider;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
+
+/**
+ * @author Hector Espert
+ * @author Olga Maciaszek-Sharma
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class FeignHalAutoConfigurationTests {
+
+	@Mock
+	private ObjectProvider<HalConfiguration> halConfiguration;
+
+	@Mock
+	private ObjectProvider<ObjectMapper> objectMapper;
+
+	@Mock
+	private LinkRelationProvider relProvider;
+
+	@Mock
+	private ObjectProvider<CurieProvider> curieProvider;
+
+	@Mock
+	private MessageResolver messageResolver;
+
+	@InjectMocks
+	private FeignHalAutoConfiguration feignHalAutoConfiguration;
+
+	@Test
+	public void halJacksonHttpMessageConverter() {
+		ObjectMapper mapper = new ObjectMapper();
+		when(objectMapper.getIfAvailable(any())).thenReturn(mapper);
+
+		when(halConfiguration.getIfAvailable(any())).thenReturn(mock(HalConfiguration.class));
+		when(curieProvider.getIfAvailable(any())).thenReturn(mock(CurieProvider.class));
+
+		HalMediaTypeConfiguration halMediaTypeConfiguration = new HalMediaTypeConfiguration(relProvider, curieProvider,
+				halConfiguration, messageResolver, new DefaultListableBeanFactory());
+
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = feignHalAutoConfiguration
+				.halJacksonHttpMessageConverter(objectMapper, halMediaTypeConfiguration);
+
+		assertThat(converter).isNotNull();
+		assertThat(converter.getObjectMapper()).isNotNull();
+		assertThat(converter.getSupportedMediaTypes()).isEqualTo(Collections.singletonList(HAL_JSON));
+
+		assertThat(Jackson2HalModule.isAlreadyRegisteredIn(converter.getObjectMapper())).isTrue();
+	}
+
+}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalTests.java

@@ -18,7 +18,8 @@ package org.springframework.cloud.openfeign.hateoas;
 
 import java.util.Collection;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,6 +31,7 @@ import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.PagedModel;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -40,14 +42,15 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * @author Hector Espert
  */
 @SpringBootTest(classes = FeignHalApplication.class, webEnvironment = RANDOM_PORT, value = "debug=true")
+@RunWith(SpringRunner.class)
 @DirtiesContext
-class FeignHalTests {
+public class FeignHalTests {
 
 	@Autowired
 	private FeignHalClient feignHalClient;
 
 	@Test
-	void testEntityModel() {
+	public void testEntityModel() {
 		EntityModel<MarsRover> entity = feignHalClient.entity();
 		assertThat(entity).isNotNull();
 
@@ -62,7 +65,7 @@ class FeignHalTests {
 	}
 
 	@Test
-	void testCollectionModel() {
+	public void testCollectionModel() {
 		CollectionModel<MarsRover> collectionModel = feignHalClient.collection();
 		assertThat(collectionModel).isNotNull();
 		assertThat(collectionModel).isNotEmpty();
@@ -81,7 +84,7 @@ class FeignHalTests {
 	}
 
 	@Test
-	void testPagedModel() {
+	public void testPagedModel() {
 		PagedModel<MarsRover> paged = feignHalClient.paged();
 		assertThat(paged).isNotNull();
 		assertThat(paged).isNotEmpty();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/app/FeignHalController.java

@@ -35,25 +35,25 @@ public class FeignHalController {
 	public EntityModel<MarsRover> getEntity() {
 		MarsRover marsRover = new MarsRover();
 		marsRover.setName("Sojourner");
-		Link link = Link.of("/entity", "self");
-		return EntityModel.of(marsRover, link);
+		Link link = new Link("/entity", "self");
+		return new EntityModel<>(marsRover, link);
 	}
 
 	@GetMapping("/collection")
 	public CollectionModel<MarsRover> getCollection() {
 		MarsRover marsRover = new MarsRover();
 		marsRover.setName("Opportunity");
-		Link link = Link.of("/collection", "self");
-		return CollectionModel.of(Collections.singleton(marsRover), link);
+		Link link = new Link("/collection", "self");
+		return new CollectionModel<>(Collections.singleton(marsRover), link);
 	}
 
 	@GetMapping("/paged")
 	public CollectionModel<MarsRover> getPaged() {
 		MarsRover marsRover = new MarsRover();
 		marsRover.setName("Curiosity");
-		Link link = Link.of("/paged", "self");
+		Link link = new Link("/paged", "self");
 		PagedModel.PageMetadata metadata = new PagedModel.PageMetadata(1, 1, 1);
-		return PagedModel.of(Collections.singleton(marsRover), metadata, link);
+		return new PagedModel<>(Collections.singleton(marsRover), metadata, link);
 	}
 
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/app/FeignHalRibbonConfiguration.java

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 /**
  * @author Hector Espert
  */
-public class FeignHalConfiguration {
+public class FeignHalRibbonConfiguration {
 
 	@Value("${local.server.port}")
 	private int serverPort = 0;

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java

@@ -16,7 +16,9 @@
 
 package org.springframework.cloud.openfeign.invalid;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
@@ -29,16 +31,17 @@ import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Dave Syer
- * @author Szymon Linowski
  */
-class FeignClientValidationTests {
+public class FeignClientValidationTests {
+
+	@Rule
+	public ExpectedException expected = ExpectedException.none();
 
 	@Test
-	void testServiceIdAndValue() {
+	public void testServiceIdAndValue() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				LoadBalancerAutoConfiguration.class, NameAndServiceIdConfiguration.class);
 		assertThat(context.getBean(NameAndServiceIdConfiguration.Client.class)).isNotNull();
@@ -46,7 +49,7 @@ class FeignClientValidationTests {
 	}
 
 	@Test
-	void testDuplicatedClientNames() {
+	public void testDuplicatedClientNames() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.setAllowBeanDefinitionOverriding(false);
 		context.register(LoadBalancerAutoConfiguration.class, DuplicatedFeignClientNamesConfiguration.class);
@@ -57,10 +60,9 @@ class FeignClientValidationTests {
 	}
 
 	@Test
-	void testNotLegalHostname() {
-		assertThatExceptionOfType(IllegalStateException.class)
-				.isThrownBy(() -> new AnnotationConfigApplicationContext(BadHostnameConfiguration.class))
-				.withMessage("Service id not legal hostname (foo_bar)");
+	public void testNotLegalHostname() {
+		this.expected.expectMessage("not legal hostname (foo_bar)");
+		new AnnotationConfigApplicationContext(BadHostnameConfiguration.class);
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java

@@ -16,9 +16,7 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
@@ -31,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import feign.Client;
 import feign.Request;
 import feign.Response;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -65,28 +62,23 @@ 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
  * @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 {
 
-	private final Client delegate = mock(Client.class);
+	private Client delegate = mock(Client.class);
 
-	private final BlockingLoadBalancerClient loadBalancerClient = mock(BlockingLoadBalancerClient.class);
+	private BlockingLoadBalancerClient loadBalancerClient = mock(BlockingLoadBalancerClient.class);
 
 	private final LoadBalancerClientFactory loadBalancerClientFactory = mock(LoadBalancerClientFactory.class);
 
 	private final LoadBalancerProperties loadBalancerProperties = new LoadBalancerProperties();
 
-	private final FeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new FeignBlockingLoadBalancerClient(
-			delegate, loadBalancerClient, loadBalancerClientFactory);
-
-	@BeforeEach
-	void setUp() {
-		when(loadBalancerClientFactory.getProperties(any(String.class))).thenReturn(loadBalancerProperties);
-	}
+	private FeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new FeignBlockingLoadBalancerClient(
+			delegate, loadBalancerClient, loadBalancerProperties, loadBalancerClientFactory);
 
 	@Test
 	void shouldExtractServiceIdFromRequestUrl() throws IOException {
@@ -113,7 +105,8 @@ class FeignBlockingLoadBalancerClientTests {
 		Response response = feignBlockingLoadBalancerClient.execute(request, new Request.Options());
 
 		assertThat(response.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.value());
-		assertThat(read(response)).isEqualTo("Load balancer does not contain an instance for the service test");
+		assertThat(response.body().toString())
+				.isEqualTo("Load balancer does not contain an instance for the service test");
 	}
 
 	@Test
@@ -167,24 +160,11 @@ class FeignBlockingLoadBalancerClientTests {
 				.get("anotherLoadBalancerLifecycle")).getCompleteLog().values();
 		assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
 				.contains(callbackTestHint);
-		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext()
-				.getHint())
-			.contains(callbackTestHint);
+		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
+				.contains(callbackTestHint);
 		assertThat(anotherLifecycleLogRequests)
-			.extracting(completionContext -> completionContext.getClientResponse()
-				.getHttpStatus())
-			.contains(HttpStatus.OK.value());
-	}
-
-	private String read(Response response) throws IOException {
-		BufferedReader reader = new BufferedReader(
-				new InputStreamReader(response.body().asInputStream(), StandardCharsets.UTF_8));
-		String outputString = "";
-		String line;
-		while ((line = reader.readLine()) != null) {
-			outputString += line;
-		}
-		return outputString;
+				.extracting(completionContext -> completionContext.getClientResponse().getHttpStatus())
+				.contains(HttpStatus.OK);
 	}
 
 	private Request testRequest() {

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java

@@ -33,7 +33,6 @@ import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfigurati
 import org.springframework.context.ConfigurableApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.util.ReflectionTestUtils.getField;
 
 /**
  * @author Olga Maciaszek-Sharma
@@ -43,7 +42,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,25 +57,16 @@ 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");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		Map<String, FeignBlockingLoadBalancerClient> beans = context
-				.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);
-		OkHttpClient okHttpClient = (OkHttpClient) client;
-		okhttp3.OkHttpClient httpClient = (okhttp3.OkHttpClient) getField(okHttpClient, "delegate");
-		assertThat(httpClient.readTimeoutMillis()).isEqualTo(9000);
-
+		assertLoadBalanced(context, OkHttpClient.class);
 	}
 
 	@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 +74,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 +83,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 +97,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);
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java

@@ -69,31 +69,30 @@ 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
  * @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 {
 
-	private final Client delegate = mock(Client.class);
+	private Client delegate = mock(Client.class);
 
-	private final LoadBalancedRetryFactory retryFactory = mock(LoadBalancedRetryFactory.class);
+	private LoadBalancedRetryFactory retryFactory = mock(LoadBalancedRetryFactory.class);
 
-	private final BlockingLoadBalancerClient loadBalancerClient = mock(BlockingLoadBalancerClient.class);
+	private BlockingLoadBalancerClient loadBalancerClient = mock(BlockingLoadBalancerClient.class);
 
 	private final LoadBalancerClientFactory loadBalancerClientFactory = mock(LoadBalancerClientFactory.class);
 
-	private final LoadBalancerProperties properties = new LoadBalancerProperties();
+	private LoadBalancerProperties properties = new LoadBalancerProperties();
 
-	private final RetryableFeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableFeignBlockingLoadBalancerClient(
+	private RetryableFeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableFeignBlockingLoadBalancerClient(
 			delegate, loadBalancerClient, retryFactory, properties, loadBalancerClientFactory);
 
-	private final ServiceInstance serviceInstance = new DefaultServiceInstance("test-a", "test", "testhost", 80, false);
+	private ServiceInstance serviceInstance = new DefaultServiceInstance("test-a", "test", "testhost", 80, false);
 
 	@BeforeEach
 	void setUp() {
-		when(loadBalancerClientFactory.getProperties(any(String.class))).thenReturn(properties);
 		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
 				.thenReturn(new BlockingLoadBalancedRetryPolicy(properties));
 		when(loadBalancerClient.choose(eq("test"), any())).thenReturn(serviceInstance);
@@ -232,13 +231,11 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 				.get("anotherLoadBalancerLifecycle")).getCompleteLog().values();
 		assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
 				.contains(callbackTestHint);
-		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext()
-				.getHint())
-			.contains(callbackTestHint);
+		assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint())
+				.contains(callbackTestHint);
 		assertThat(anotherLifecycleLogRequests)
-			.extracting(completionContext -> completionContext.getClientResponse()
-				.getHttpStatus())
-			.contains(HttpStatus.OK.value());
+				.extracting(completionContext -> completionContext.getClientResponse().getHttpStatus())
+				.contains(HttpStatus.OK);
 	}
 
 	private Request testRequest() {

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/AccessTokenProviderWithLoadBalancerInterceptorTests.java

@@ -1,94 +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.security;
-
-import jakarta.servlet.http.HttpServletRequest;
-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.context.assertj.AssertableApplicationContext;
-import org.springframework.cloud.client.loadbalancer.RetryLoadBalancerInterceptor;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.FeignContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * @author Wojciech Mąka
- */
-@SpringBootTest(classes = AccessTokenProviderWithLoadBalancerInterceptorTests.Application.class,
-		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" })
-@DirtiesContext
-public class AccessTokenProviderWithLoadBalancerInterceptorTests {
-
-	@Autowired
-	FeignContext context;
-
-	@Autowired
-	private ConfigurableApplicationContext applicationContext;
-
-	@Test
-	void testOAuth2RequestInterceptorIsLoadBalanced() {
-		AssertableApplicationContext assertableContext = AssertableApplicationContext.get(() -> applicationContext);
-		assertThat(assertableContext).hasSingleBean(Application.SampleClient.class);
-		assertThat(assertableContext).hasSingleBean(OAuth2FeignRequestInterceptor.class);
-		assertThat(assertableContext).getBean(OAuth2FeignRequestInterceptor.class).extracting("accessTokenProvider")
-				.extracting("interceptors").asList()
-				.filteredOn(obj -> RetryLoadBalancerInterceptor.class.equals(obj.getClass())).hasSize(1);
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@EnableFeignClients(
-			clients = { AccessTokenProviderWithLoadBalancerInterceptorTests.Application.SampleClient.class })
-	protected static class Application {
-
-		@GetMapping("/foo")
-		public String foo(HttpServletRequest request) throws IllegalAccessException {
-			if ("Foo".equals(request.getHeader("Foo")) && "Bar".equals(request.getHeader("Bar"))) {
-				return "OK";
-			}
-			else {
-				throw new IllegalAccessException("It should has Foo and Bar header");
-			}
-		}
-
-		@FeignClient(name = "sampleClient")
-		protected interface SampleClient {
-
-			@GetMapping("/foo")
-			String foo();
-
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/AccessTokenProviderWithoutLoadBalancerInterceptorTests.java

@@ -1,94 +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.security;
-
-import jakarta.servlet.http.HttpServletRequest;
-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.context.assertj.AssertableApplicationContext;
-import org.springframework.cloud.client.loadbalancer.RetryLoadBalancerInterceptor;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.FeignContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * @author Wojciech Mąka
- */
-@SpringBootTest(classes = AccessTokenProviderWithoutLoadBalancerInterceptorTests.Application.class,
-		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" })
-@DirtiesContext
-public class AccessTokenProviderWithoutLoadBalancerInterceptorTests {
-
-	@Autowired
-	FeignContext context;
-
-	@Autowired
-	private ConfigurableApplicationContext applicationContext;
-
-	@Test
-	void testOAuth2RequestInterceptorIsNotLoadBalanced() {
-		AssertableApplicationContext assertableContext = AssertableApplicationContext.get(() -> applicationContext);
-		assertThat(assertableContext)
-				.hasSingleBean(AccessTokenProviderWithoutLoadBalancerInterceptorTests.Application.SampleClient.class);
-		assertThat(assertableContext).hasSingleBean(OAuth2FeignRequestInterceptor.class);
-		assertThat(assertableContext).getBean(OAuth2FeignRequestInterceptor.class).extracting("accessTokenProvider")
-				.extracting("interceptors").asList()
-				.filteredOn(obj -> RetryLoadBalancerInterceptor.class.equals(obj.getClass())).isEmpty();
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@EnableFeignClients(
-			clients = { AccessTokenProviderWithoutLoadBalancerInterceptorTests.Application.SampleClient.class })
-	protected static class Application {
-
-		@GetMapping("/foo")
-		public String foo(HttpServletRequest request) throws IllegalAccessException {
-			if ("Foo".equals(request.getHeader("Foo")) && "Bar".equals(request.getHeader("Bar"))) {
-				return "OK";
-			}
-			else {
-				throw new IllegalAccessException("It should has Foo and Bar header");
-			}
-		}
-
-		@FeignClient(name = "sampleClient")
-		protected interface SampleClient {
-
-			@GetMapping("/foo")
-			String foo();
-
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/MockOAuth2ClientContext.java

@@ -29,7 +29,7 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken;
  *
  * @author João Pedro Evangelista
  */
-public final class MockOAuth2ClientContext implements OAuth2ClientContext {
+final class MockOAuth2ClientContext implements OAuth2ClientContext {
 
 	private final String value;
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptorTests.java

@@ -21,9 +21,9 @@ import java.util.Map;
 
 import feign.Request.HttpMethod;
 import feign.RequestTemplate;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
@@ -32,60 +32,55 @@ import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedExc
 import org.springframework.security.oauth2.client.token.AccessTokenRequest;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 /**
  * @author João Pedro Evangelista
  * @author Tim Ysewyn
- * @author Szymon Linowski
  */
-class OAuth2FeignRequestInterceptorTests {
+public class OAuth2FeignRequestInterceptorTests {
 
 	private OAuth2FeignRequestInterceptor oAuth2FeignRequestInterceptor;
 
 	private RequestTemplate requestTemplate;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public void setUp() {
 		oAuth2FeignRequestInterceptor = new OAuth2FeignRequestInterceptor(new MockOAuth2ClientContext("Fancy"),
 				new BaseOAuth2ProtectedResourceDetails());
 		requestTemplate = new RequestTemplate().method(HttpMethod.GET);
 	}
 
 	@Test
-	void applyAuthorizationHeader() {
+	public void applyAuthorizationHeader() {
 		oAuth2FeignRequestInterceptor.apply(requestTemplate);
 		Map<String, Collection<String>> headers = requestTemplate.headers();
-
-		assertThat(headers.containsKey("Authorization")).describedAs("RequestTemplate must have a Authorization header")
-				.isTrue();
-		Assertions.assertThat(headers.get("Authorization")).describedAs("Authorization must have a extract of Fancy")
-				.contains("Bearer Fancy");
+		Assert.assertTrue("RequestTemplate must have a Authorization header", headers.containsKey("Authorization"));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"),
+				contains("Bearer Fancy"));
 	}
 
-	@Test
-	void tryToAcquireToken() {
+	@Test(expected = OAuth2AccessDeniedException.class)
+	public void tryToAcquireToken() {
 		oAuth2FeignRequestInterceptor = new OAuth2FeignRequestInterceptor(new DefaultOAuth2ClientContext(),
 				new BaseOAuth2ProtectedResourceDetails());
-
-		Assertions.assertThatExceptionOfType(OAuth2AccessDeniedException.class)
-				.isThrownBy(() -> oAuth2FeignRequestInterceptor.getToken()).withMessage(
-						"Unable to obtain a new access token for resource 'null'. The provider manager is not configured to support it.");
+		OAuth2AccessToken oAuth2AccessToken = oAuth2FeignRequestInterceptor.getToken();
+		Assert.assertTrue(oAuth2AccessToken.getValue() + " Must be null", oAuth2AccessToken.getValue() == null);
 	}
 
 	@Test
-	void configureAccessTokenProvider() {
+	public void configureAccessTokenProvider() {
 		OAuth2AccessToken mockedToken = new MockOAuth2AccessToken("MOCKED_TOKEN");
 		oAuth2FeignRequestInterceptor.setAccessTokenProvider(new MockAccessTokenProvider(mockedToken));
-
-		assertThat(oAuth2FeignRequestInterceptor.acquireAccessToken())
-				.describedAs("Should return same mocked token instance").isEqualTo(mockedToken);
+		Assert.assertEquals("Should return same mocked token instance", mockedToken,
+				oAuth2FeignRequestInterceptor.acquireAccessToken());
 	}
 
 	@Test
-	void applyAuthorizationHeaderOnlyOnce() {
+	public void applyAuthorizationHeaderOnlyOnce() {
 		OAuth2ClientContext oAuth2ClientContext = mock(OAuth2ClientContext.class);
 		when(oAuth2ClientContext.getAccessToken()).thenReturn(new MockOAuth2AccessToken("MOCKED_TOKEN"));
 
@@ -108,11 +103,10 @@ class OAuth2FeignRequestInterceptorTests {
 		oAuth2FeignRequestInterceptor.apply(requestTemplate);
 
 		Map<String, Collection<String>> headers = requestTemplate.headers();
-		assertThat(headers.containsKey("Authorization")).describedAs("RequestTemplate must have a Authorization header")
-				.isTrue();
-		assertThat(headers.get("Authorization")).describedAs("Authorization must have a extract of Fancy").hasSize(1);
-		assertThat(headers.get("Authorization")).describedAs("Authorization must have a extract of Fancy")
-				.contains("Bearer Fancy");
+		Assert.assertTrue("RequestTemplate must have a Authorization header", headers.containsKey("Authorization"));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"), hasSize(1));
+		Assert.assertThat("Authorization must have a extract of Fancy", headers.get("Authorization"),
+				contains("Bearer Fancy"));
 	}
 
 }