Update SNAPSHOT to 3.0.0-M2

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

.gitignore

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

README.adoc

@@ -4,7 +4,6 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////
 
-
 image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]
 
 image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
@@ -28,8 +27,6 @@ image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a648
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}
 
-:core_path: {project-root}/spring-cloud-openfeign-core
-
 This project provides OpenFeign integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms.
 
@@ -315,8 +312,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
 
-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
-
-== License
-
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.7.RELEASE</version>
+		<version>3.0.0-M2</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -15,6 +15,7 @@
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 	</properties>
@@ -24,6 +25,16 @@
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
@@ -34,9 +45,11 @@
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
@@ -48,6 +61,7 @@
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>

docs/src/main/asciidoc/README.adoc

@@ -19,7 +19,3 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste
 == Contributing
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
-
-== License
-
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here].

docs/src/main/asciidoc/_attributes.adoc

@@ -14,5 +14,3 @@
 :sc-ext: java
 :project-full-name: Spring Cloud OpenFeign
 :all: {asterisk}{asterisk}
-
-:core_path: {project-root}/spring-cloud-openfeign-core

docs/src/main/asciidoc/_configprops.adoc

@@ -1,27 +1,24 @@
 |===
 |Name | Default | Description
 
-|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
-|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
-|feign.client.config |  | 
-|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
-|feign.client.default-config | `default` | 
-|feign.client.default-to-properties | `true` | 
-|feign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed.
-|feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
-|feign.compression.request.min-request-size | `2048` | The minimum threshold content size.
-|feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
-|feign.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used.
-|feign.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.max-connections | `200` | 
-|feign.httpclient.max-connections-per-route | `50` | 
-|feign.httpclient.time-to-live | `900` | 
-|feign.httpclient.time-to-live-unit |  | 
-|feign.hystrix.enabled | `false` | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
-|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
+|feign.client.config |  | null
+|feign.client.default-config | default | null
+|feign.client.default-to-properties | true | null
+|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.httpclient.connection-timeout | 2000 | null
+|feign.httpclient.connection-timer-repeat | 3000 | null
+|feign.httpclient.disable-ssl-validation | false | null
+|feign.httpclient.enabled | true | Enables the use of the Apache HTTP Client by Feign.
+|feign.httpclient.follow-redirects | true | null
+|feign.httpclient.max-connections | 200 | null
+|feign.httpclient.max-connections-per-route | 50 | null
+|feign.httpclient.time-to-live | 900 | null
+|feign.httpclient.time-to-live-unit |  | null
+|feign.hystrix.enabled | false | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
+|feign.okhttp.enabled | false | Enables the use of the OK HTTP Client by Feign.
 
 |===

docs/src/main/asciidoc/sagan-index.adoc

@@ -24,18 +24,3 @@ public class WebApplication {
 }
 
 ```
-
-## Contributing
-
-We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-openfeign/blob/master/README.adoc#3-contributing[here].
-
-## Community Support
-
-* You can report issues through https://github.com/spring-cloud/spring-cloud-openfeign/issues[Github].
-* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-feign` tag.
-* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter].
-
-## Commercial Support
-
-Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering.
-

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

@@ -15,7 +15,7 @@ To use Feign create an interface and annotate it.
 It has pluggable annotation support including Feign annotations and JAX-RS annotations.
 Feign also supports pluggable encoders and decoders.
 Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
-Spring Cloud integrates Ribbon and Eureka, Spring Cloud CircuitBreaker, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
+Spring Cloud integrates Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
 
 [[netflix-feign-starter]]
 === How to Include Feign
@@ -55,7 +55,7 @@ public interface StoreClient {
 }
 ----
 
-In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create either a https://github.com/Netflix/ribbon[Ribbon] load-balancer (see <<spring-cloud-ribbon,below for details of Ribbon support>> and <<spring-cloud-circuitbreaker,below for details of Spring Cloud CircuitBreaker support>>) or https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java[Spring Cloud LoadBalancer].
+In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create a https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java[Spring Cloud LoadBalancer client].
 You can also specify a URL using the `url` attribute
 (absolute value or just a hostname). The name of the bean in the
 application context is the fully qualified name of the interface.
@@ -68,10 +68,6 @@ it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
 in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
 
-WARNING: In order to maintain backward compatibility, is used as the default load-balancer implementation.
-However, Spring Cloud Netflix Ribbon is now in maintenance mode, so we recommend using Spring Cloud LoadBalancer instead.
-To do this, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false`.
-
 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
 
@@ -119,12 +115,9 @@ Spring Cloud OpenFeign provides the following beans by default for feign (`BeanT
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
-* `Client` feignClient: if Ribbon is in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
+* `Client` feignClient: if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
 If none of them is in the classpath, the default feign client is used.
 
-NOTE: `spring-cloud-starter-openfeign` supports both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`. However, as they are optional dependencies, you need to make sure the one you want to use has been added to your project.
-
 The OkHttpClient and ApacheHttpClient feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` to `true`, respectively, and having them on the classpath.
 You can customize the HTTP client used by providing a bean of either `org.apache.http.impl.client.CloseableHttpClient` when using Apache or `okhttp3.OkHttpClient` when using OK HTTP.
 
@@ -138,10 +131,6 @@ Spring Cloud OpenFeign _does not_ provide the following beans by default for fei
 * `SetterFactory`
 * `QueryMapEncoder`
 
-A bean of `Retryer.NEVER_RETRY` with the type `Retryer` is created by default, which will disable retrying.
-Notice this retrying behavior is different from the Feign default one, where it will automatically retry IOExceptions,
-treating them as transient network related exceptions, and any RetryableException thrown from an ErrorDecoder.
-
 Creating a bean of one of those type and placing it in a `@FeignClient` configuration (such as `FooConfiguration` above) allows you to override each one of the beans described.  Example:
 
 [source,java,indent=0]
@@ -176,10 +165,6 @@ feign:
         loggerLevel: full
         errorDecoder: com.example.SimpleErrorDecoder
         retryer: com.example.SimpleRetryer
-       defaultQueryParameters:
-          query: queryValue
-        defaultRequestHeaders:
-          header: headerValue
         requestInterceptors:
           - com.example.FooRequestInterceptor
           - com.example.BarRequestInterceptor
@@ -193,8 +178,6 @@ Default configurations can be specified in the `@EnableFeignClients` attribute `
 
 If you prefer using configuration properties to configured all `@FeignClient`, you can create configuration properties with `default` feign name.
 
-You can use `feign.client.config.feignName.defaultQueryParameters` and `feign.client.config.feignName.defaultRequestHeaders` to specify query parameters and headers that will be sent with every request of the client named `feignName`.
-
 application.yml
 [source,yaml]
 ----
@@ -275,44 +258,6 @@ public FeignClientConfigurer feignClientConfigurer() {
 }
 ----
 
-TIP: By default, Feign clients do not encode slash `/` characters. You can change this behaviour, by setting the value of `feign.client.decodeSlash` to `false`.
-
-[[timeout-handling]]
-=== Timeout Handling
-
-We can configure timeouts on both the default and the named client. OpenFeign works with two timeout parameters:
-
-- `connectTimeout` prevents blocking the caller due to the long server processing time.
-- `readTimeout` is applied from the time of connection establishment and is triggered when returning the response takes too long.
-
-NOTE: In case the server is not running or available a packet results in _connection refused_. The communication ends either with an error message or in a fallback. This can happen _before_ the `connectTimeout` if it is set very low. The time taken to perform a lookup and to receive such a packet causes a significant part of this delay. It is subject to change based on the remote host that involves a DNS lookup.
-
-When Hystrix <<spring-cloud-openfeign#spring-cloud-feign-hystrix,is enabled>>, its timeout configuration link:https://github.com/Netflix/Hystrix/wiki/Configuration#execution.isolation.thread.timeoutInMilliseconds[defaults] to 1000 milliseconds. Hence, it might occur before the client timeout that we configured earlier. Increasing this timeout prevents it from happening.
-
-[source,yaml]
-----
-feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-  hystrix:
-    enabled: true
-
-hystrix:
-  command:
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          thread:
-            timeoutInMilliseconds: 60000
-----
-
-NOTE: When the Hystrix timeout is enabled and its timeout is set longer than that of a feign client, `HystrixTimeoutException` wraps a feign exception. Otherwise, the only difference is the cause of the exception. The purpose of `HystrixTimeoutException` is to wrap any runtime exception that occurs first and throw an instance of itself.
-
 === Creating Feign Clients Manually
 
 In some cases it might be necessary to customize your Feign Clients in a way that is not
@@ -350,7 +295,7 @@ class FooController {
 ----
 
 NOTE: In the above example `FeignClientsConfiguration.class` is the default configuration
-provided by Spring Cloud OpenFeign.
+provided by Spring Cloud Netflix.
 
 NOTE: `PROD-SVC` is the name of the service the Clients will be making requests to.
 
@@ -431,47 +376,9 @@ static class HystrixClientFallbackFactory implements FallbackFactory<HystrixClie
 
 WARNING: There is a limitation with the implementation of fallbacks in Feign and how Hystrix fallbacks work. Fallbacks are currently not supported for methods that return `com.netflix.hystrix.HystrixCommand` and `rx.Observable`.
 
-[[spring-cloud-feign-circuitbreaker]]
-=== Feign Spring Cloud CircuitBreaker Support
-
-If Spring Cloud CircuitBreaker is on the classpath and `feign.circuitbreaker.enabled=true`, Feign will wrap all methods with a circuit breaker.
-
-To disable Spring Cloud CircuitBreaker support on a per-client basis create a vanilla `Feign.Builder` with the "prototype" scope, e.g.:
-
-[source,java,indent=0]
-----
-@Configuration
-public class FooConfiguration {
-    	@Bean
-	@Scope("prototype")
-	public Feign.Builder feignBuilder() {
-		return Feign.builder();
-	}
-}
-----
-
-The circuit breaker name follows this pattern `<feignClientName>_<calledMethod>`. When calling a `@FeignClient` with name `foo` and the called interface method is `bar` then the circuit breaker name will be `foo_bar`.
-
-[[spring-cloud-feign-circuitbreaker-fallback]]
-=== Feign Spring Cloud CircuitBreaker Fallbacks
-
-Spring Cloud CircuitBreaker supports the notion of a fallback: a default code path that is executed when they circuit is open or there is an error. To enable fallbacks for a given `@FeignClient` set the `fallback` attribute to the class name that implements the fallback. You also need to declare your implementation as a Spring bean.
-
-[source,java,indent=0]
-----
-include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback, indent=0]
-----
-
-If one needs access to the cause that made the fallback trigger, one can use the `fallbackFactory` attribute inside `@FeignClient`.
-
-[source,java,indent=0]
-----
-include::{core_path}/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java[tags=client_with_fallback_factory, indent=0]
-----
-
 === Feign and `@Primary`
 
-When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud OpenFeign marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
+When using Feign with Hystrix fallbacks, there are multiple beans in the `ApplicationContext` of the same type. This will cause `@Autowired` to not work because there isn't exactly one bean, or one marked as primary. To work around this, Spring Cloud Netflix marks all Feign instances as `@Primary`, so Spring Framework will know which bean to inject. In some cases, this may not be desirable. To turn off this behavior set the `primary` attribute of `@FeignClient` to false.
 
 [source,java,indent=0]
 ----
@@ -648,7 +555,7 @@ If a map is passed as the method argument, the `@MatrixVariable` path segment is
 If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is
 joined with the provided method argument using `=`.
 
-IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Spring Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name.
+IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Sprig Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name.
 
 For example:
 
@@ -669,25 +576,6 @@ public interface DemoTemplate {
 }
 ----
 
-=== Feign `CollectionFormat` support
-We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation. You can annotate a Feign client method with it by passing the desired `feign.CollectionFormat` as annotation value.
-
-In the following example, the `CSV` format is used instead of the default `EXPLODED` to process the method.
-
-[source,java,indent=0]
-----
-@FeignClient(name = "demo")
-	protected interface PageableFeignClient {
-
-		@CollectionFormat(feign.CollectionFormat.CSV)
-		@GetMapping(path = "/page")
-		ResponseEntity performRequest(Pageable page);
-
-	}
-----
-
-TIP: Set the `CSV` format while sending `Pageable` as a query parameter in order for it to be encoded correctly.
-
 === Reactive Support
 As the https://github.com/OpenFeign/feign[OpenFeign project] does not currently support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], neither does Spring Cloud OpenFeign. We will add support for it here as soon as it becomes available in the core project.
 
@@ -704,14 +592,6 @@ To work around this problem you can use an `ObjectProvider` when autowiring your
 ObjectProvider<TestFeginClient> testFeginClient;
 ----
 
-=== Spring Data Support
-You may consider enabling Jackson Modules for the support `org.springframework.data.domain.Page` and `org.springframework.data.domain.Sort` decoding.
-
-[source,java]
-----
-feign.autoconfiguration.jackson.enabled=true
-----
-
 == Configuration properties
 
 To see the list of all Sleuth related configuration properties please check link:appendix.html[the Appendix page].

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>2.2.7.RELEASE</version>
+	<version>3.0.0-M2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.2.RELEASE</version>
+		<version>3.0.0-M2</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -25,11 +25,11 @@
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
-		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.2.7.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.7.RELEASE</spring-cloud-netflix.version>
+		<jackson.version>2.7.3</jackson.version>
+		<spring-cloud-commons.version>3.0.0-M2</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
+		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- Sonar -->
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
@@ -67,6 +67,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -94,13 +95,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-dependencies</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-commons-dependencies</artifactId>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.7.RELEASE</version>
+		<version>3.0.0-M2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -21,10 +21,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-ribbon</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -89,11 +85,6 @@
 			<artifactId>spring-cloud-context</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-core</artifactId>
@@ -113,46 +104,11 @@
 			<artifactId>feign-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-hystrix</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-serialization</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-metrics-event-stream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-javanica</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
@@ -193,16 +149,6 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -217,13 +163,13 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.14.0</version>
+			<version>3.4.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.vavr</groupId>
 			<artifactId>vavr</artifactId>
-			<version>0.10.3</version>
+			<version>0.10.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -231,6 +177,12 @@
 			<artifactId>spring-cloud-loadbalancer</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>pl.pragmatists</groupId>
+			<artifactId>JUnitParams</artifactId>
+			<version>1.1.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>

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

@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates which collection format should be used while processing the annotated method.
- *
- * @author Olga Maciaszek-Sharma
- * @see feign.CollectionFormat
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CollectionFormat {
-
-	/**
-	 * Allows setting the {@link feign.CollectionFormat} to be used while processing the
-	 * annotated method.
-	 * @return the {@link feign.CollectionFormat} to be used
-	 */
-	feign.CollectionFormat value();
-
-}

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

@@ -1,87 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import static feign.Util.checkNotNull;
-
-/**
- * Used to control the fallback given its cause.
- *
- * Ex.
- *
- * <pre>
- * {@code
- * // This instance will be invoked if there are errors of any kind.
- * FallbackFactory<GitHub> fallbackFactory = cause -> (owner, repo) -> {
- *   if (cause instanceof FeignException && ((FeignException) cause).status() == 403) {
- *     return Collections.emptyList();
- *   } else {
- *     return Arrays.asList("yogi");
- *   }
- * };
- *
- * GitHub github = FeignCircuitBreaker.builder()
- *                             ...
- *                             .target(GitHub.class, "https://api.github.com", fallbackFactory);
- * }
- * </pre>
- *
- * @param <T> the feign interface type
- */
-public interface FallbackFactory<T> {
-
-	/**
-	 * Returns an instance of the fallback appropriate for the given cause.
-	 * @param cause cause of an exception.
-	 * @return fallback
-	 */
-	T create(Throwable cause);
-
-	final class Default<T> implements FallbackFactory<T> {
-
-		final Log logger;
-
-		final T constant;
-
-		public Default(T constant) {
-			this(constant, LogFactory.getLog(Default.class));
-		}
-
-		Default(T constant, Log logger) {
-			this.constant = checkNotNull(constant, "fallback");
-			this.logger = checkNotNull(logger, "logger");
-		}
-
-		@Override
-		public T create(Throwable cause) {
-			if (logger.isTraceEnabled()) {
-				logger.trace("fallback due to: " + cause.getMessage(), cause);
-			}
-			return constant;
-		}
-
-		@Override
-		public String toString() {
-			return constant.toString();
-		}
-
-	}
-
-}

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

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.openfeign;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
@@ -25,14 +24,11 @@ import java.util.concurrent.TimeUnit;
 
 import javax.annotation.PreDestroy;
 
-import com.fasterxml.jackson.databind.Module;
 import feign.Client;
 import feign.Feign;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
 import okhttp3.ConnectionPool;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
@@ -40,34 +36,24 @@ import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.cloud.openfeign.support.PageJacksonModule;
-import org.springframework.cloud.openfeign.support.SortJacksonModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
 
 /**
  * @author Spencer Gibb
  * @author Julien Roy
- * @author Grzegorz Poznachowski
- * @author Nikita Konev
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Feign.class)
@@ -76,8 +62,6 @@ import org.springframework.data.domain.Sort;
 @Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {
 
-	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);
-
 	@Autowired(required = false)
 	private List<FeignClientSpecification> configurations = new ArrayList<>();
 
@@ -94,28 +78,6 @@ public class FeignAutoConfiguration {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass({ Module.class, Page.class, Sort.class })
-	@ConditionalOnProperty(value = "feign.autoconfiguration.jackson.enabled",
-			havingValue = "true")
-	protected static class FeignJacksonConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean(PageJacksonModule.class)
-		public PageJacksonModule pageJacksonModule() {
-			return new PageJacksonModule();
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(SortJacksonModule.class)
-		public SortJacksonModule sortModule() {
-			return new SortJacksonModule();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnMissingClass({ "feign.hystrix.HystrixFeign",
-			"org.springframework.cloud.client.circuitbreaker.CircuitBreaker" })
 	protected static class DefaultFeignTargeterConfiguration {
 
 		@Bean
@@ -126,46 +88,12 @@ public class FeignAutoConfiguration {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
-	protected static class HystrixFeignTargeterConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean
-		public Targeter feignTargeter() {
-			return new HystrixTargeter();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty("feign.circuitbreaker.enabled")
-	protected static class CircuitBreakerPresentFeignTargeterConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean(CircuitBreakerFactory.class)
-		public Targeter defaultFeignTargeter() {
-			return new DefaultTargeter();
-		}
-
-		@Bean
-		@ConditionalOnMissingBean
-		@ConditionalOnBean(CircuitBreakerFactory.class)
-		public Targeter circuitBreakerFeignTargeter(
-				CircuitBreakerFactory circuitBreakerFactory) {
-			return new FeignCircuitBreakerTargeter(circuitBreakerFactory);
-		}
-
-	}
-
 	// the following configuration is for alternate feign clients if
-	// ribbon is not on the class path.
+	// SC loadbalancer is not on the class path.
 	// see corresponding configurations in FeignRibbonClientAutoConfiguration
-	// for load balanced ribbon clients.
+	// for load-balanced clients.
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 	protected static class HttpClientFeignConfiguration {
@@ -220,17 +148,10 @@ public class FeignAutoConfiguration {
 		}
 
 		@PreDestroy
-		public void destroy() {
+		public void destroy() throws Exception {
 			this.connectionManagerTimer.cancel();
 			if (this.httpClient != null) {
-				try {
-					this.httpClient.close();
-				}
-				catch (IOException e) {
-					if (LOG.isErrorEnabled()) {
-						LOG.error("Could not correctly close httpClient.");
-					}
-				}
+				this.httpClient.close();
 			}
 		}
 
@@ -238,7 +159,6 @@ public class FeignAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {

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

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

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

@@ -1,89 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.Feign;
-import feign.Target;
-
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-
-/**
- * Allows Feign interfaces to work with {@link CircuitBreaker}.
- *
- * @author Marcin Grzejszczak
- * @since 3.0.0
- */
-public final class FeignCircuitBreaker {
-
-	private FeignCircuitBreaker() {
-		throw new IllegalStateException("Don't instantiate a utility class");
-	}
-
-	/**
-	 * @return builder for Feign CircuitBreaker integration
-	 */
-	public static Builder builder() {
-		return new Builder();
-	}
-
-	/**
-	 * Builder for Feign CircuitBreaker integration.
-	 */
-	public static final class Builder extends Feign.Builder {
-
-		private CircuitBreakerFactory circuitBreakerFactory;
-
-		private String feignClientName;
-
-		Builder circuitBreakerFactory(CircuitBreakerFactory circuitBreakerFactory) {
-			this.circuitBreakerFactory = circuitBreakerFactory;
-			return this;
-		}
-
-		Builder feignClientName(String feignClientName) {
-			this.feignClientName = feignClientName;
-			return this;
-		}
-
-		public <T> T target(Target<T> target, T fallback) {
-			return build(
-					fallback != null ? new FallbackFactory.Default<T>(fallback) : null)
-							.newInstance(target);
-		}
-
-		public <T> T target(Target<T> target,
-				FallbackFactory<? extends T> fallbackFactory) {
-			return build(fallbackFactory).newInstance(target);
-		}
-
-		@Override
-		public <T> T target(Target<T> target) {
-			return build(null).newInstance(target);
-		}
-
-		public Feign build(final FallbackFactory<?> nullableFallbackFactory) {
-			super.invocationHandlerFactory(
-					(target, dispatch) -> new FeignCircuitBreakerInvocationHandler(
-							circuitBreakerFactory, feignClientName, target, dispatch,
-							nullableFallbackFactory));
-			return super.build();
-		}
-
-	}
-
-}

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

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

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

@@ -1,152 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import feign.InvocationHandlerFactory;
-import feign.Target;
-
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-
-import static feign.Util.checkNotNull;
-
-class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
-
-	private final CircuitBreakerFactory factory;
-
-	private final String feignClientName;
-
-	private final Target<?> target;
-
-	private final Map<Method, InvocationHandlerFactory.MethodHandler> dispatch;
-
-	private final FallbackFactory<?> nullableFallbackFactory;
-
-	private final Map<Method, Method> fallbackMethodMap;
-
-	FeignCircuitBreakerInvocationHandler(CircuitBreakerFactory factory,
-			String feignClientName, Target<?> target,
-			Map<Method, InvocationHandlerFactory.MethodHandler> dispatch,
-			FallbackFactory<?> nullableFallbackFactory) {
-		this.factory = factory;
-		this.feignClientName = feignClientName;
-		this.target = checkNotNull(target, "target");
-		this.dispatch = checkNotNull(dispatch, "dispatch");
-		this.fallbackMethodMap = toFallbackMethod(dispatch);
-		this.nullableFallbackFactory = nullableFallbackFactory;
-	}
-
-	@Override
-	public Object invoke(final Object proxy, final Method method, final Object[] args)
-			throws Throwable {
-		// early exit if the invoked method is from java.lang.Object
-		// code is the same as ReflectiveFeign.FeignInvocationHandler
-		if ("equals".equals(method.getName())) {
-			try {
-				Object otherHandler = args.length > 0 && args[0] != null
-						? Proxy.getInvocationHandler(args[0]) : null;
-				return equals(otherHandler);
-			}
-			catch (IllegalArgumentException e) {
-				return false;
-			}
-		}
-		else if ("hashCode".equals(method.getName())) {
-			return hashCode();
-		}
-		else if ("toString".equals(method.getName())) {
-			return toString();
-		}
-		String circuitName = this.feignClientName + "_" + method.getName();
-		CircuitBreaker circuitBreaker = this.factory.create(circuitName);
-		Supplier<Object> supplier = asSupplier(method, args);
-		if (this.nullableFallbackFactory != null) {
-			Function<Throwable, Object> fallbackFunction = throwable -> {
-				Object fallback = this.nullableFallbackFactory.create(throwable);
-				try {
-					return this.fallbackMethodMap.get(method).invoke(fallback, args);
-				}
-				catch (Exception e) {
-					throw new IllegalStateException(e);
-				}
-			};
-			return circuitBreaker.run(supplier, fallbackFunction);
-		}
-		return circuitBreaker.run(supplier);
-	}
-
-	private Supplier<Object> asSupplier(final Method method, final Object[] args) {
-		return () -> {
-			try {
-				return this.dispatch.get(method).invoke(args);
-			}
-			catch (RuntimeException throwable) {
-				throw throwable;
-			}
-			catch (Throwable throwable) {
-				throw new RuntimeException(throwable);
-			}
-		};
-	}
-
-	/**
-	 * If the method param of InvocationHandler.invoke is not accessible, i.e in a
-	 * package-private interface, the fallback call will cause of access restrictions. But
-	 * methods in dispatch are copied methods. So setting access to dispatch method
-	 * doesn't take effect to the method in InvocationHandler.invoke. Use map to store a
-	 * copy of method to invoke the fallback to bypass this and reducing the count of
-	 * reflection calls.
-	 * @return cached methods map for fallback invoking
-	 */
-	static Map<Method, Method> toFallbackMethod(
-			Map<Method, InvocationHandlerFactory.MethodHandler> dispatch) {
-		Map<Method, Method> result = new LinkedHashMap<Method, Method>();
-		for (Method method : dispatch.keySet()) {
-			method.setAccessible(true);
-			result.put(method, method);
-		}
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof FeignCircuitBreakerInvocationHandler) {
-			FeignCircuitBreakerInvocationHandler other = (FeignCircuitBreakerInvocationHandler) obj;
-			return this.target.equals(other.target);
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.target.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return this.target.toString();
-	}
-
-}

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

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

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

@@ -18,7 +18,6 @@ package org.springframework.cloud.openfeign;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -27,9 +26,9 @@ import org.springframework.core.annotation.AliasFor;
 
 /**
  * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If ribbon is available it will be
- * used to load balance the backend requests, and the load balancer can be configured
- * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
+ * created (e.g. for autowiring into another component). If SC LoadBalancer is available
+ * it will be used to load balance the backend requests, and the load balancer can be
+ * configured using the same name (i.e. value) as the feign client.
  *
  * @author Spencer Gibb
  * @author Venil Noronha
@@ -37,7 +36,6 @@ import org.springframework.core.annotation.AliasFor;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 public @interface FeignClient {
 
 	/**
@@ -109,14 +107,12 @@ public @interface FeignClient {
 	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring bean.
 	 *
 	 * @see feign.hystrix.FallbackFactory for details.
-	 * @see FallbackFactory for details.
 	 * @return fallback factory for the specified Feign client interface
 	 */
 	Class<?> fallbackFactory() default void.class;
 
 	/**
-	 * @return path prefix to be used by all method-level mappings. Can be used with or
-	 * without <code>@RibbonClient</code>.
+	 * @return path prefix to be used by all method-level mappings.
 	 */
 	String path() default "";
 

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

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.openfeign;
 
-import feign.hystrix.FallbackFactory;
-
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -41,6 +39,11 @@ public class FeignClientBuilder {
 		return new Builder<>(this.applicationContext, type, name);
 	}
 
+	public <T> Builder<T> forType(final Class<T> type,
+			final FeignClientFactoryBean clientFactoryBean, final String name) {
+		return new Builder<>(this.applicationContext, clientFactoryBean, type, name);
+	}
+
 	/**
 	 * Builder of feign targets.
 	 *
@@ -52,7 +55,13 @@ public class FeignClientBuilder {
 
 		private Builder(final ApplicationContext applicationContext, final Class<T> type,
 				final String name) {
-			this.feignClientFactoryBean = new FeignClientFactoryBean();
+			this(applicationContext, new FeignClientFactoryBean(), type, name);
+		}
+
+		private Builder(final ApplicationContext applicationContext,
+				final FeignClientFactoryBean clientFactoryBean, final Class<T> type,
+				final String name) {
+			this.feignClientFactoryBean = clientFactoryBean;
 
 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
@@ -95,13 +104,6 @@ public class FeignClientBuilder {
 			return this;
 		}
 
-		public Builder<T> fallbackFactory(
-				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
-			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
-			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
-			return this;
-		}
-
 		/**
 		 * @return the created Feign client
 		 */

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

@@ -16,11 +16,8 @@
 
 package org.springframework.cloud.openfeign;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 import feign.Client;
 import feign.Contract;
@@ -38,14 +35,11 @@ import feign.codec.ErrorDecoder;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -58,12 +52,9 @@ import org.springframework.util.StringUtils;
  * @author Eko Kurniawan Khannedy
  * @author Gregor Zurowski
  * @author Matt King
- * @author Olga Maciaszek-Sharma
- * @author Ilia Ilinykh
- * @author Marcin Grzejszczak
  */
-public class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
-		ApplicationContextAware, BeanFactoryAware {
+public class FeignClientFactoryBean
+		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware {
 
 	/***********************************
 	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some
@@ -86,25 +77,19 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 
 	private ApplicationContext applicationContext;
 
-	private BeanFactory beanFactory;
-
 	private Class<?> fallback = void.class;
 
 	private Class<?> fallbackFactory = void.class;
 
-	private int readTimeoutMillis = new Request.Options().readTimeoutMillis();
-
-	private int connectTimeoutMillis = new Request.Options().connectTimeoutMillis();
-
 	@Override
 	public void afterPropertiesSet() {
-		Assert.hasText(contextId, "Context id must be set");
-		Assert.hasText(name, "Name must be set");
+		Assert.hasText(this.contextId, "Context id must be set");
+		Assert.hasText(this.name, "Name must be set");
 	}
 
 	protected Feign.Builder feign(FeignContext context) {
 		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
-		Logger logger = loggerFactory.create(type);
+		Logger logger = loggerFactory.create(this.type);
 
 		// @formatter:off
 		Feign.Builder builder = get(context, Feign.Builder.class)
@@ -134,9 +119,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	protected void configureFeign(FeignContext context, Feign.Builder builder) {
-		FeignClientProperties properties = beanFactory != null
-				? beanFactory.getBean(FeignClientProperties.class)
-				: applicationContext.getBean(FeignClientProperties.class);
+		FeignClientProperties properties = this.applicationContext
+				.getBean(FeignClientProperties.class);
 
 		FeignClientConfigurer feignClientConfigurer = getOptional(context,
 				FeignClientConfigurer.class);
@@ -148,13 +132,15 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 				configureUsingProperties(
 						properties.getConfig().get(properties.getDefaultConfig()),
 						builder);
-				configureUsingProperties(properties.getConfig().get(contextId), builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId),
+						builder);
 			}
 			else {
 				configureUsingProperties(
 						properties.getConfig().get(properties.getDefaultConfig()),
 						builder);
-				configureUsingProperties(properties.getConfig().get(contextId), builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId),
+						builder);
 				configureUsingConfiguration(context, builder);
 			}
 		}
@@ -182,7 +168,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
 					FeignErrorDecoderFactory.class);
 			if (errorDecoderFactory != null) {
-				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(type);
+				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(this.type);
 				builder.errorDecoder(factoryErrorDecoder);
 			}
 		}
@@ -190,23 +176,18 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 				Request.Options.class);
 		if (options != null) {
 			builder.options(options);
-			readTimeoutMillis = options.readTimeoutMillis();
-			connectTimeoutMillis = options.connectTimeoutMillis();
 		}
 		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(
 				context, RequestInterceptor.class);
 		if (requestInterceptors != null) {
-			List<RequestInterceptor> interceptors = new ArrayList<>(
-					requestInterceptors.values());
-			AnnotationAwareOrderComparator.sort(interceptors);
-			builder.requestInterceptors(interceptors);
+			builder.requestInterceptors(requestInterceptors.values());
 		}
 		QueryMapEncoder queryMapEncoder = getInheritedAwareOptional(context,
 				QueryMapEncoder.class);
 		if (queryMapEncoder != null) {
 			builder.queryMapEncoder(queryMapEncoder);
 		}
-		if (decode404) {
+		if (this.decode404) {
 			builder.decode404();
 		}
 		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(
@@ -227,13 +208,10 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			builder.logLevel(config.getLoggerLevel());
 		}
 
-		connectTimeoutMillis = config.getConnectTimeout() != null
-				? config.getConnectTimeout() : connectTimeoutMillis;
-		readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout()
-				: readTimeoutMillis;
-
-		builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS,
-				readTimeoutMillis, TimeUnit.MILLISECONDS, true));
+		if (config.getConnectTimeout() != null && config.getReadTimeout() != null) {
+			builder.options(new Request.Options(config.getConnectTimeout(),
+					config.getReadTimeout()));
+		}
 
 		if (config.getRetryer() != null) {
 			Retryer retryer = getOrInstantiate(config.getRetryer());
@@ -264,16 +242,6 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			builder.encoder(getOrInstantiate(config.getEncoder()));
 		}
 
-		if (Objects.nonNull(config.getDefaultRequestHeaders())) {
-			builder.requestInterceptor(requestTemplate -> requestTemplate
-					.headers(config.getDefaultRequestHeaders()));
-		}
-
-		if (Objects.nonNull(config.getDefaultQueryParameters())) {
-			builder.requestInterceptor(requestTemplate -> requestTemplate
-					.queries(config.getDefaultQueryParameters()));
-		}
-
 		if (Objects.nonNull(config.getDecoder())) {
 			builder.decoder(getOrInstantiate(config.getDecoder()));
 		}
@@ -289,8 +257,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 
 	private <T> T getOrInstantiate(Class<T> tClass) {
 		try {
-			return beanFactory != null ? beanFactory.getBean(tClass)
-					: applicationContext.getBean(tClass);
+			return this.applicationContext.getBean(tClass);
 		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
@@ -298,16 +265,16 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(contextId, type);
+		T instance = context.getInstance(this.contextId, type);
 		if (instance == null) {
 			throw new IllegalStateException(
-					"No bean found of type " + type + " for " + contextId);
+					"No bean found of type " + type + " for " + this.contextId);
 		}
 		return instance;
 	}
 
 	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(contextId, type);
+		return context.getInstance(this.contextId, type);
 	}
 
 	protected <T> T getInheritedAwareOptional(FeignContext context, Class<T> type) {
@@ -315,17 +282,17 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			return getOptional(context, type);
 		}
 		else {
-			return context.getInstanceWithoutAncestors(contextId, type);
+			return context.getInstanceWithoutAncestors(this.contextId, type);
 		}
 	}
 
 	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context,
 			Class<T> type) {
 		if (inheritParentContext) {
-			return context.getInstances(contextId, type);
+			return context.getInstances(this.contextId, type);
 		}
 		else {
-			return context.getInstancesWithoutAncestors(contextId, type);
+			return context.getInstancesWithoutAncestors(this.contextId, type);
 		}
 	}
 
@@ -339,7 +306,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}
 
 		throw new IllegalStateException(
-				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon?");
+				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-loadbalancer?");
 	}
 
 	@Override
@@ -353,33 +320,26 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = beanFactory != null
-				? beanFactory.getBean(FeignContext.class)
-				: applicationContext.getBean(FeignContext.class);
+		FeignContext context = this.applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);
 
-		if (!StringUtils.hasText(url)) {
-			if (!name.startsWith("http")) {
-				url = "http://" + name;
+		if (!StringUtils.hasText(this.url)) {
+			if (!this.name.startsWith("http")) {
+				this.url = "http://" + this.name;
 			}
 			else {
-				url = name;
+				this.url = this.name;
 			}
-			url += cleanPath();
+			this.url += cleanPath();
 			return (T) loadBalance(builder, context,
-					new HardCodedTarget<>(type, name, url));
+					new HardCodedTarget<>(this.type, this.name, this.url));
 		}
-		if (StringUtils.hasText(url) && !url.startsWith("http")) {
-			url = "http://" + url;
+		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
+			this.url = "http://" + this.url;
 		}
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
-			if (client instanceof LoadBalancerFeignClient) {
-				// not load balancing because we have a url,
-				// but ribbon is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient) client).getDelegate();
-			}
 			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
@@ -389,7 +349,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		}
 		Targeter targeter = get(context, Targeter.class);
 		return (T) targeter.target(this, builder, context,
-				new HardCodedTarget<>(type, name, url));
+				new HardCodedTarget<>(this.type, this.name, url));
 	}
 
 	private String cleanPath() {
@@ -407,7 +367,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 
 	@Override
 	public Class<?> getObjectType() {
-		return type;
+		return this.type;
 	}
 
 	@Override
@@ -416,7 +376,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public Class<?> getType() {
-		return type;
+		return this.type;
 	}
 
 	public void setType(Class<?> type) {
@@ -424,7 +384,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setName(String name) {
@@ -432,7 +392,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public String getContextId() {
-		return contextId;
+		return this.contextId;
 	}
 
 	public void setContextId(String contextId) {
@@ -440,7 +400,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public String getUrl() {
-		return url;
+		return this.url;
 	}
 
 	public void setUrl(String url) {
@@ -448,7 +408,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public String getPath() {
-		return path;
+		return this.path;
 	}
 
 	public void setPath(String path) {
@@ -456,7 +416,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public boolean isDecode404() {
-		return decode404;
+		return this.decode404;
 	}
 
 	public void setDecode404(boolean decode404) {
@@ -472,17 +432,16 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public ApplicationContext getApplicationContext() {
-		return applicationContext;
+		return this.applicationContext;
 	}
 
 	@Override
 	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		applicationContext = context;
-		beanFactory = context;
+		this.applicationContext = context;
 	}
 
 	public Class<?> getFallback() {
-		return fallback;
+		return this.fallback;
 	}
 
 	public void setFallback(Class<?> fallback) {
@@ -490,7 +449,7 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 	}
 
 	public Class<?> getFallbackFactory() {
-		return fallbackFactory;
+		return this.fallbackFactory;
 	}
 
 	public void setFallbackFactory(Class<?> fallbackFactory) {
@@ -506,39 +465,36 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 			return false;
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(applicationContext, that.applicationContext)
-				&& Objects.equals(beanFactory, that.beanFactory)
-				&& decode404 == that.decode404
-				&& inheritParentContext == that.inheritParentContext
-				&& Objects.equals(fallback, that.fallback)
-				&& Objects.equals(fallbackFactory, that.fallbackFactory)
-				&& Objects.equals(name, that.name) && Objects.equals(path, that.path)
-				&& Objects.equals(type, that.type) && Objects.equals(url, that.url);
+		return Objects.equals(this.applicationContext, that.applicationContext)
+				&& this.decode404 == that.decode404
+				&& this.inheritParentContext == that.inheritParentContext
+				&& Objects.equals(this.fallback, that.fallback)
+				&& Objects.equals(this.fallbackFactory, that.fallbackFactory)
+				&& Objects.equals(this.name, that.name)
+				&& Objects.equals(this.path, that.path)
+				&& Objects.equals(this.type, that.type)
+				&& Objects.equals(this.url, that.url);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(applicationContext, beanFactory, decode404,
-				inheritParentContext, fallback, fallbackFactory, name, path, type, url);
+		return Objects.hash(this.applicationContext, this.decode404,
+				this.inheritParentContext, this.fallback, this.fallbackFactory, this.name,
+				this.path, this.type, this.url);
 	}
 
 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type)
-				.append(", ").append("name='").append(name).append("', ").append("url='")
-				.append(url).append("', ").append("path='").append(path).append("', ")
-				.append("decode404=").append(decode404).append(", ")
-				.append("inheritParentContext=").append(inheritParentContext).append(", ")
-				.append("applicationContext=").append(applicationContext).append(", ")
-				.append("beanFactory=").append(beanFactory).append(", ")
-				.append("fallback=").append(fallback).append(", ")
-				.append("fallbackFactory=").append(fallbackFactory).append("}")
+		return new StringBuilder("FeignClientFactoryBean{").append("type=")
+				.append(this.type).append(", ").append("name='").append(this.name)
+				.append("', ").append("url='").append(this.url).append("', ")
+				.append("path='").append(this.path).append("', ").append("decode404=")
+				.append(this.decode404).append(", ").append("inheritParentContext=")
+				.append(this.inheritParentContext).append(", ")
+				.append("applicationContext=").append(this.applicationContext)
+				.append(", ").append("fallback=").append(this.fallback).append(", ")
+				.append("fallbackFactory=").append(this.fallbackFactory).append("}")
 				.toString();
 	}
 
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		this.beanFactory = beanFactory;
-	}
-
 }

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

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.openfeign;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +34,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * @author Eko Kurniawan Khannedy
- * @author Ilia Ilinykh
- * @author Ram Anaswara
  */
 @ConfigurationProperties("feign.client")
 public class FeignClientProperties {
@@ -47,14 +44,8 @@ public class FeignClientProperties {
 
 	private Map<String, FeignClientConfiguration> config = new HashMap<>();
 
-	/**
-	 * Feign clients do not encode slash `/` characters by default. To change this
-	 * behavior, set the `decodeSlash` to `false`.
-	 */
-	private boolean decodeSlash = true;
-
 	public boolean isDefaultToProperties() {
-		return defaultToProperties;
+		return this.defaultToProperties;
 	}
 
 	public void setDefaultToProperties(boolean defaultToProperties) {
@@ -62,7 +53,7 @@ public class FeignClientProperties {
 	}
 
 	public String getDefaultConfig() {
-		return defaultConfig;
+		return this.defaultConfig;
 	}
 
 	public void setDefaultConfig(String defaultConfig) {
@@ -70,21 +61,13 @@ public class FeignClientProperties {
 	}
 
 	public Map<String, FeignClientConfiguration> getConfig() {
-		return config;
+		return this.config;
 	}
 
 	public void setConfig(Map<String, FeignClientConfiguration> config) {
 		this.config = config;
 	}
 
-	public boolean isDecodeSlash() {
-		return decodeSlash;
-	}
-
-	public void setDecodeSlash(boolean decodeSlash) {
-		this.decodeSlash = decodeSlash;
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -94,15 +77,14 @@ public class FeignClientProperties {
 			return false;
 		}
 		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties
-				&& Objects.equals(defaultConfig, that.defaultConfig)
-				&& Objects.equals(config, that.config)
-				&& Objects.equals(decodeSlash, that.decodeSlash);
+		return this.defaultToProperties == that.defaultToProperties
+				&& Objects.equals(this.defaultConfig, that.defaultConfig)
+				&& Objects.equals(this.config, that.config);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(defaultToProperties, defaultConfig, config, decodeSlash);
+		return Objects.hash(this.defaultToProperties, this.defaultConfig, this.config);
 	}
 
 	/**
@@ -122,10 +104,6 @@ public class FeignClientProperties {
 
 		private List<Class<RequestInterceptor>> requestInterceptors;
 
-		private Map<String, Collection<String>> defaultRequestHeaders;
-
-		private Map<String, Collection<String>> defaultQueryParameters;
-
 		private Boolean decode404;
 
 		private Class<Decoder> decoder;
@@ -137,7 +115,7 @@ public class FeignClientProperties {
 		private ExceptionPropagationPolicy exceptionPropagationPolicy;
 
 		public Logger.Level getLoggerLevel() {
-			return loggerLevel;
+			return this.loggerLevel;
 		}
 
 		public void setLoggerLevel(Logger.Level loggerLevel) {
@@ -145,7 +123,7 @@ public class FeignClientProperties {
 		}
 
 		public Integer getConnectTimeout() {
-			return connectTimeout;
+			return this.connectTimeout;
 		}
 
 		public void setConnectTimeout(Integer connectTimeout) {
@@ -153,7 +131,7 @@ public class FeignClientProperties {
 		}
 
 		public Integer getReadTimeout() {
-			return readTimeout;
+			return this.readTimeout;
 		}
 
 		public void setReadTimeout(Integer readTimeout) {
@@ -161,7 +139,7 @@ public class FeignClientProperties {
 		}
 
 		public Class<Retryer> getRetryer() {
-			return retryer;
+			return this.retryer;
 		}
 
 		public void setRetryer(Class<Retryer> retryer) {
@@ -169,7 +147,7 @@ public class FeignClientProperties {
 		}
 
 		public Class<ErrorDecoder> getErrorDecoder() {
-			return errorDecoder;
+			return this.errorDecoder;
 		}
 
 		public void setErrorDecoder(Class<ErrorDecoder> errorDecoder) {
@@ -177,7 +155,7 @@ public class FeignClientProperties {
 		}
 
 		public List<Class<RequestInterceptor>> getRequestInterceptors() {
-			return requestInterceptors;
+			return this.requestInterceptors;
 		}
 
 		public void setRequestInterceptors(
@@ -185,26 +163,8 @@ public class FeignClientProperties {
 			this.requestInterceptors = requestInterceptors;
 		}
 
-		public Map<String, Collection<String>> getDefaultRequestHeaders() {
-			return defaultRequestHeaders;
-		}
-
-		public void setDefaultRequestHeaders(
-				Map<String, Collection<String>> defaultRequestHeaders) {
-			this.defaultRequestHeaders = defaultRequestHeaders;
-		}
-
-		public Map<String, Collection<String>> getDefaultQueryParameters() {
-			return defaultQueryParameters;
-		}
-
-		public void setDefaultQueryParameters(
-				Map<String, Collection<String>> defaultQueryParameters) {
-			this.defaultQueryParameters = defaultQueryParameters;
-		}
-
 		public Boolean getDecode404() {
-			return decode404;
+			return this.decode404;
 		}
 
 		public void setDecode404(Boolean decode404) {
@@ -212,7 +172,7 @@ public class FeignClientProperties {
 		}
 
 		public Class<Decoder> getDecoder() {
-			return decoder;
+			return this.decoder;
 		}
 
 		public void setDecoder(Class<Decoder> decoder) {
@@ -220,7 +180,7 @@ public class FeignClientProperties {
 		}
 
 		public Class<Encoder> getEncoder() {
-			return encoder;
+			return this.encoder;
 		}
 
 		public void setEncoder(Class<Encoder> encoder) {
@@ -228,7 +188,7 @@ public class FeignClientProperties {
 		}
 
 		public Class<Contract> getContract() {
-			return contract;
+			return this.contract;
 		}
 
 		public void setContract(Class<Contract> contract) {
@@ -253,29 +213,26 @@ public class FeignClientProperties {
 				return false;
 			}
 			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel
-					&& Objects.equals(connectTimeout, that.connectTimeout)
-					&& Objects.equals(readTimeout, that.readTimeout)
-					&& Objects.equals(retryer, that.retryer)
-					&& Objects.equals(errorDecoder, that.errorDecoder)
-					&& Objects.equals(requestInterceptors, that.requestInterceptors)
-					&& Objects.equals(decode404, that.decode404)
-					&& Objects.equals(encoder, that.encoder)
-					&& Objects.equals(decoder, that.decoder)
-					&& Objects.equals(contract, that.contract)
-					&& Objects.equals(exceptionPropagationPolicy,
-							that.exceptionPropagationPolicy)
-					&& Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders)
-					&& Objects.equals(defaultQueryParameters,
-							that.defaultQueryParameters);
+			return this.loggerLevel == that.loggerLevel
+					&& Objects.equals(this.connectTimeout, that.connectTimeout)
+					&& Objects.equals(this.readTimeout, that.readTimeout)
+					&& Objects.equals(this.retryer, that.retryer)
+					&& Objects.equals(this.errorDecoder, that.errorDecoder)
+					&& Objects.equals(this.requestInterceptors, that.requestInterceptors)
+					&& Objects.equals(this.decode404, that.decode404)
+					&& Objects.equals(this.encoder, that.encoder)
+					&& Objects.equals(this.decoder, that.decoder)
+					&& Objects.equals(this.contract, that.contract)
+					&& Objects.equals(this.exceptionPropagationPolicy,
+							that.exceptionPropagationPolicy);
 		}
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer,
-					errorDecoder, requestInterceptors, decode404, encoder, decoder,
-					contract, exceptionPropagationPolicy, defaultQueryParameters,
-					defaultRequestHeaders);
+			return Objects.hash(this.loggerLevel, this.connectTimeout, this.readTimeout,
+					this.retryer, this.errorDecoder, this.requestInterceptors,
+					this.decode404, this.encoder, this.decoder, this.contract,
+					this.exceptionPropagationPolicy);
 		}
 
 	}

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

@@ -19,7 +19,7 @@ package org.springframework.cloud.openfeign;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.netflix.hystrix.HystrixCommand;
+import com.fasterxml.jackson.databind.Module;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
@@ -28,25 +28,22 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.form.MultipartFormContentProcessor;
 import feign.form.spring.SpringFormEncoder;
-import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.support.AbstractFormWriter;
+import org.springframework.cloud.openfeign.support.PageJacksonModule;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
+import org.springframework.cloud.openfeign.support.SortJacksonModule;
 import org.springframework.cloud.openfeign.support.SpringDecoder;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
@@ -82,9 +79,6 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private SpringDataWebProperties springDataWebProperties;
 
-	@Autowired(required = false)
-	private FeignClientProperties feignClientProperties;
-
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
@@ -121,10 +115,7 @@ public class FeignClientsConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
-		boolean decodeSlash = feignClientProperties == null
-				|| feignClientProperties.isDecodeSlash();
-		return new SpringMvcContract(this.parameterProcessors, feignConversionService,
-				decodeSlash);
+		return new SpringMvcContract(this.parameterProcessors, feignConversionService);
 	}
 
 	@Bean
@@ -155,6 +146,18 @@ public class FeignClientsConfiguration {
 		return new DefaultFeignLoggerFactory(this.logger);
 	}
 
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Page")
+	public Module pageJacksonModule() {
+		return new PageJacksonModule();
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.data.domain.Page")
+	public Module sortModule() {
+		return new SortJacksonModule();
+	}
+
 	@Bean
 	@ConditionalOnMissingBean(FeignClientConfigurer.class)
 	public FeignClientConfigurer feignClientConfigurer() {
@@ -174,20 +177,6 @@ public class FeignClientsConfiguration {
 		}
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
-	protected static class HystrixFeignConfiguration {
-
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		@ConditionalOnProperty(name = "feign.hystrix.enabled")
-		public Feign.Builder feignHystrixBuilder() {
-			return HystrixFeign.builder();
-		}
-
-	}
-
 	private class SpringPojoFormEncoder extends SpringFormEncoder {
 
 		SpringPojoFormEncoder(AbstractFormWriter formWriter) {
@@ -200,26 +189,4 @@ public class FeignClientsConfiguration {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(CircuitBreaker.class)
-	@ConditionalOnProperty("feign.circuitbreaker.enabled")
-	protected static class CircuitBreakerPresentFeignBuilderConfiguration {
-
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean({ Feign.Builder.class, CircuitBreakerFactory.class })
-		public Feign.Builder defaultFeignBuilder(Retryer retryer) {
-			return Feign.builder().retryer(retryer);
-		}
-
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		@ConditionalOnBean(CircuitBreakerFactory.class)
-		public Feign.Builder circuitBreakerFeignBuilder() {
-			return FeignCircuitBreaker.builder();
-		}
-
-	}
-
 }

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

@@ -16,23 +16,21 @@
 
 package org.springframework.cloud.openfeign;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
-import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.config.BeanExpressionContext;
-import org.springframework.beans.factory.config.BeanExpressionResolver;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
@@ -45,7 +43,12 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
+import org.springframework.core.type.filter.AbstractClassTestingTypeFilter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
@@ -55,8 +58,6 @@ import org.springframework.util.StringUtils;
  * @author Jakub Narloch
  * @author Venil Noronha
  * @author Gang Li
- * @author Michal Domagala
- * @author Marcin Grzejszczak
  */
 class FeignClientsRegistrar
 		implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {
@@ -164,43 +165,60 @@ class FeignClientsRegistrar
 
 	public void registerFeignClients(AnnotationMetadata metadata,
 			BeanDefinitionRegistry registry) {
+		ClassPathScanningCandidateComponentProvider scanner = getScanner();
+		scanner.setResourceLoader(this.resourceLoader);
+
+		Set<String> basePackages;
 
-		LinkedHashSet<BeanDefinition> candidateComponents = new LinkedHashSet<>();
 		Map<String, Object> attrs = metadata
 				.getAnnotationAttributes(EnableFeignClients.class.getName());
+		AnnotationTypeFilter annotationTypeFilter = new AnnotationTypeFilter(
+				FeignClient.class);
 		final Class<?>[] clients = attrs == null ? null
 				: (Class<?>[]) attrs.get("clients");
 		if (clients == null || clients.length == 0) {
-			ClassPathScanningCandidateComponentProvider scanner = getScanner();
-			scanner.setResourceLoader(this.resourceLoader);
-			scanner.addIncludeFilter(new AnnotationTypeFilter(FeignClient.class));
-			Set<String> basePackages = getBasePackages(metadata);
-			for (String basePackage : basePackages) {
-				candidateComponents.addAll(scanner.findCandidateComponents(basePackage));
-			}
+			scanner.addIncludeFilter(annotationTypeFilter);
+			basePackages = getBasePackages(metadata);
 		}
 		else {
+			final Set<String> clientClasses = new HashSet<>();
+			basePackages = new HashSet<>();
 			for (Class<?> clazz : clients) {
-				candidateComponents.add(new AnnotatedGenericBeanDefinition(clazz));
+				basePackages.add(ClassUtils.getPackageName(clazz));
+				clientClasses.add(clazz.getCanonicalName());
 			}
+			AbstractClassTestingTypeFilter filter = new AbstractClassTestingTypeFilter() {
+				@Override
+				protected boolean match(ClassMetadata metadata) {
+					String cleaned = metadata.getClassName().replaceAll("\\$", ".");
+					return clientClasses.contains(cleaned);
+				}
+			};
+			scanner.addIncludeFilter(
+					new AllTypeFilter(Arrays.asList(filter, annotationTypeFilter)));
 		}
 
-		for (BeanDefinition candidateComponent : candidateComponents) {
-			if (candidateComponent instanceof AnnotatedBeanDefinition) {
-				// verify annotated class is an interface
-				AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
-				AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
-				Assert.isTrue(annotationMetadata.isInterface(),
-						"@FeignClient can only be specified on an interface");
+		for (String basePackage : basePackages) {
+			Set<BeanDefinition> candidateComponents = scanner
+					.findCandidateComponents(basePackage);
+			for (BeanDefinition candidateComponent : candidateComponents) {
+				if (candidateComponent instanceof AnnotatedBeanDefinition) {
+					// verify annotated class is an interface
+					AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
+					AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
+					Assert.isTrue(annotationMetadata.isInterface(),
+							"@FeignClient can only be specified on an interface");
 
-				Map<String, Object> attributes = annotationMetadata
-						.getAnnotationAttributes(FeignClient.class.getCanonicalName());
+					Map<String, Object> attributes = annotationMetadata
+							.getAnnotationAttributes(
+									FeignClient.class.getCanonicalName());
 
-				String name = getClientName(attributes);
-				registerClientConfiguration(registry, name,
-						attributes.get("configuration"));
+					String name = getClientName(attributes);
+					registerClientConfiguration(registry, name,
+							attributes.get("configuration"));
 
-				registerFeignClient(registry, annotationMetadata, attributes);
+					registerFeignClient(registry, annotationMetadata, attributes);
+				}
 			}
 		}
 	}
@@ -208,45 +226,24 @@ class FeignClientsRegistrar
 	private void registerFeignClient(BeanDefinitionRegistry registry,
 			AnnotationMetadata annotationMetadata, Map<String, Object> attributes) {
 		String className = annotationMetadata.getClassName();
-		Class clazz = ClassUtils.resolveClassName(className, null);
-		ConfigurableBeanFactory beanFactory = registry instanceof ConfigurableBeanFactory
-				? (ConfigurableBeanFactory) registry : null;
-		String contextId = getContextId(beanFactory, attributes);
-		String name = getName(attributes);
-		FeignClientFactoryBean factoryBean = new FeignClientFactoryBean();
-		factoryBean.setBeanFactory(beanFactory);
-		factoryBean.setName(name);
-		factoryBean.setContextId(contextId);
-		factoryBean.setType(clazz);
 		BeanDefinitionBuilder definition = BeanDefinitionBuilder
-				.genericBeanDefinition(clazz, () -> {
-					factoryBean.setUrl(getUrl(beanFactory, attributes));
-					factoryBean.setPath(getPath(beanFactory, attributes));
-					factoryBean.setDecode404(Boolean
-							.parseBoolean(String.valueOf(attributes.get("decode404"))));
-					Object fallback = attributes.get("fallback");
-					if (fallback != null) {
-						factoryBean.setFallback(fallback instanceof Class
-								? (Class<?>) fallback
-								: ClassUtils.resolveClassName(fallback.toString(), null));
-					}
-					Object fallbackFactory = attributes.get("fallbackFactory");
-					if (fallbackFactory != null) {
-						factoryBean.setFallbackFactory(fallbackFactory instanceof Class
-								? (Class<?>) fallbackFactory
-								: ClassUtils.resolveClassName(fallbackFactory.toString(),
-										null));
-					}
-					return factoryBean.getObject();
-				});
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
-		definition.setLazyInit(true);
+				.genericBeanDefinition(FeignClientFactoryBean.class);
 		validate(attributes);
+		definition.addPropertyValue("url", getUrl(attributes));
+		definition.addPropertyValue("path", getPath(attributes));
+		String name = getName(attributes);
+		definition.addPropertyValue("name", name);
+		String contextId = getContextId(attributes);
+		definition.addPropertyValue("contextId", contextId);
+		definition.addPropertyValue("type", className);
+		definition.addPropertyValue("decode404", attributes.get("decode404"));
+		definition.addPropertyValue("fallback", attributes.get("fallback"));
+		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
+		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 
 		String alias = contextId + "FeignClient";
 		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();
 		beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, className);
-		beanDefinition.setAttribute("feignClientsRegistrarFactoryBean", factoryBean);
 
 		// has a default, won't be null
 		boolean primary = (Boolean) attributes.get("primary");
@@ -272,10 +269,6 @@ class FeignClientsRegistrar
 	}
 
 	/* for testing */ String getName(Map<String, Object> attributes) {
-		return getName(null, attributes);
-	}
-
-	String getName(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
 		String name = (String) attributes.get("serviceId");
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("name");
@@ -283,46 +276,34 @@ class FeignClientsRegistrar
 		if (!StringUtils.hasText(name)) {
 			name = (String) attributes.get("value");
 		}
-		name = resolve(beanFactory, name);
+		name = resolve(name);
 		return getName(name);
 	}
 
-	private String getContextId(ConfigurableBeanFactory beanFactory,
-			Map<String, Object> attributes) {
+	private String getContextId(Map<String, Object> attributes) {
 		String contextId = (String) attributes.get("contextId");
 		if (!StringUtils.hasText(contextId)) {
 			return getName(attributes);
 		}
 
-		contextId = resolve(beanFactory, contextId);
+		contextId = resolve(contextId);
 		return getName(contextId);
 	}
 
-	private String resolve(ConfigurableBeanFactory beanFactory, String value) {
+	private String resolve(String value) {
 		if (StringUtils.hasText(value)) {
-			if (beanFactory == null) {
-				return this.environment.resolvePlaceholders(value);
-			}
-			BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver();
-			String resolved = beanFactory.resolveEmbeddedValue(value);
-			if (resolver == null) {
-				return resolved;
-			}
-			return String.valueOf(resolver.evaluate(resolved,
-					new BeanExpressionContext(beanFactory, null)));
+			return this.environment.resolvePlaceholders(value);
 		}
 		return value;
 	}
 
-	private String getUrl(ConfigurableBeanFactory beanFactory,
-			Map<String, Object> attributes) {
-		String url = resolve(beanFactory, (String) attributes.get("url"));
+	private String getUrl(Map<String, Object> attributes) {
+		String url = resolve((String) attributes.get("url"));
 		return getUrl(url);
 	}
 
-	private String getPath(ConfigurableBeanFactory beanFactory,
-			Map<String, Object> attributes) {
-		String path = resolve(beanFactory, (String) attributes.get("path"));
+	private String getPath(Map<String, Object> attributes) {
+		String path = resolve((String) attributes.get("path"));
 		return getPath(path);
 	}
 
@@ -417,4 +398,38 @@ class FeignClientsRegistrar
 		this.environment = environment;
 	}
 
+	/**
+	 * Helper class to create a {@link TypeFilter} that matches if all the delegates
+	 * match.
+	 *
+	 * @author Oliver Gierke
+	 */
+	private static class AllTypeFilter implements TypeFilter {
+
+		private final List<TypeFilter> delegates;
+
+		/**
+		 * Creates a new {@link AllTypeFilter} to match if all the given delegates match.
+		 * @param delegates must not be {@literal null}.
+		 */
+		AllTypeFilter(List<TypeFilter> delegates) {
+			Assert.notNull(delegates, "This argument is required, it must not be null");
+			this.delegates = delegates;
+		}
+
+		@Override
+		public boolean match(MetadataReader metadataReader,
+				MetadataReaderFactory metadataReaderFactory) throws IOException {
+
+			for (TypeFilter filter : this.delegates) {
+				if (!filter.match(metadataReader, metadataReaderFactory)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+	}
+
 }

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

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

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

@@ -22,7 +22,7 @@ import feign.Target;
 /**
  * @author Spencer Gibb
  */
-interface Targeter {
+public interface Targeter {
 
 	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
 			FeignContext context, Target.HardCodedTarget<T> target);

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

@@ -16,14 +16,11 @@
 
 package org.springframework.cloud.openfeign.clientconfig;
 
-import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;
 
 import javax.annotation.PreDestroy;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
@@ -51,8 +48,6 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnMissingBean(CloseableHttpClient.class)
 public class HttpClientFeignConfiguration {
 
-	private static final Log LOG = LogFactory.getLog(HttpClientFeignConfiguration.class);
-
 	private final Timer connectionManagerTimer = new Timer(
 			"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
 
@@ -118,17 +113,10 @@ public class HttpClientFeignConfiguration {
 	}
 
 	@PreDestroy
-	public void destroy() {
+	public void destroy() throws Exception {
 		this.connectionManagerTimer.cancel();
 		if (this.httpClient != null) {
-			try {
-				this.httpClient.close();
-			}
-			catch (IOException e) {
-				if (LOG.isErrorEnabled()) {
-					LOG.error("Could not correctly close httpClient.");
-				}
-			}
+			this.httpClient.close();
 		}
 	}
 

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

@@ -16,9 +16,11 @@
 
 package org.springframework.cloud.openfeign.encoding;
 
+import feign.Client;
 import feign.Feign;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -36,10 +38,12 @@ import org.springframework.context.annotation.Configuration;
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FeignClientEncodingProperties.class)
 @ConditionalOnClass(Feign.class)
+@ConditionalOnBean(Client.class)
 // The OK HTTP client uses "transparent" compression.
 // If the content-encoding header is present it disable transparent compression
 @ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty("feign.compression.request.enabled")
+@ConditionalOnProperty(value = "feign.compression.request.enabled",
+		matchIfMissing = false)
 @AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {
 

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

@@ -16,24 +16,16 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.util.List;
-
 import feign.Client;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link Client.Default} under the hood.
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * that uses {@link Client.Default} under the hood.
  *
  * @author Olga Maciaszek-Sharma
  * @since 2.2.0
@@ -43,24 +35,9 @@ class DefaultFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
+	public Client feignClient(LoadBalancerClient loadBalancerClient) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
 				loadBalancerClient);
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
-			havingValue = "true", matchIfMissing = true)
-	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
-		return new RetryableFeignBlockingLoadBalancerClient(
-				new Client.Default(null, null), loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
-	}
-
 }

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

@@ -27,13 +27,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;
 
 /**
- * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} to select
- * a {@link ServiceInstance} to use while resolving the request host.
+ * A {@link Client} implementation that uses {@link LoadBalancerClient} to select a
+ * {@link ServiceInstance} to use while resolving the request host.
  *
  * @author Olga Maciaszek-Sharma
  * @since 2.2.0
@@ -45,10 +45,10 @@ public class FeignBlockingLoadBalancerClient implements Client {
 
 	private final Client delegate;
 
-	private final BlockingLoadBalancerClient loadBalancerClient;
+	private final LoadBalancerClient loadBalancerClient;
 
 	public FeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient) {
+			LoadBalancerClient loadBalancerClient) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 	}
@@ -72,15 +72,12 @@ public class FeignBlockingLoadBalancerClient implements Client {
 		}
 		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
 				.toString();
-		Request newRequest = buildRequest(request, reconstructedUrl);
+		Request newRequest = Request.create(request.httpMethod(), reconstructedUrl,
+				request.headers(), request.body(), request.charset(),
+				request.requestTemplate());
 		return delegate.execute(newRequest, options);
 	}
 
-	protected Request buildRequest(Request request, String reconstructedUrl) {
-		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(),
-				request.body(), request.charset(), request.requestTemplate());
-	}
-
 	// Visible for Sleuth instrumentation
 	public Client getDelegate() {
 		return delegate;

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

@@ -19,31 +19,26 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Client;
 import feign.Feign;
 
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
- * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
- * implementations of {@link Client}. In order to use this load-balancing mechanism, the
- * Ribbon-based implementation has to be disabled by setting
- * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
+ * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
+ * of {@link Client}.
  *
  * @author Olga Maciaszek-Sharma
  * @since 2.2.0
  */
 @ConditionalOnClass(Feign.class)
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean(LoadBalancerClient.class)
 @AutoConfigureBefore(FeignAutoConfiguration.class)
-@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class)
 @EnableConfigurationProperties(FeignHttpClientProperties.class)
 @Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional

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

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.util.List;
-
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import org.apache.http.client.HttpClient;
@@ -26,51 +24,32 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link ApacheHttpClient} under the hood.
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * that uses {@link ApacheHttpClient} under the hood.
  *
  * @author Olga Maciaszek-Sharma
  * @since 2.2.0
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean(LoadBalancerClient.class)
 @ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 @Import(HttpClientFeignConfiguration.class)
 class HttpClientFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@Conditional(OnRetryNotEnabledCondition.class)
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+	public Client feignClient(LoadBalancerClient loadBalancerClient,
 			HttpClient httpClient) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
-			havingValue = "true", matchIfMissing = true)
-	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
-			HttpClient httpClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
-		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
-	}
-
 }

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

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.util.List;
-
 import feign.Client;
 import feign.okhttp.OkHttpClient;
 
@@ -25,18 +23,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
- * object that uses {@link OkHttpClient} under the hood.
+ * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
+ * that uses {@link OkHttpClient} under the hood.
  *
  * @author Olga Maciaszek-Sharma
  * @since 2.2.0
@@ -44,32 +39,16 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(OkHttpClient.class)
 @ConditionalOnProperty("feign.okhttp.enabled")
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean(LoadBalancerClient.class)
 @Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@Conditional(OnRetryNotEnabledCondition.class)
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
-			BlockingLoadBalancerClient loadBalancerClient) {
+			LoadBalancerClient loadBalancerClient) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	@ConditionalOnBean(LoadBalancedRetryFactory.class)
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
-			havingValue = "true", matchIfMissing = true)
-	public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
-			okhttp3.OkHttpClient okHttpClient,
-			List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
-		AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
-		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
-				loadBalancedRetryFactories.get(0));
-	}
-
 }

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.retry.support.RetryTemplate;
-
-/**
- * A condition that verifies that {@link RetryTemplate} is on the classpath, a
- * {@link LoadBalancedRetryFactory} bean is present and
- * <code>spring.cloud.loadbalancer.retry.enabled</code> is not set to <code>false</code>.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.6
- */
-public class OnRetryNotEnabledCondition extends AnyNestedCondition {
-
-	public OnRetryNotEnabledCondition() {
-		super(ConfigurationPhase.REGISTER_BEAN);
-	}
-
-	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
-	static class OnNoRetryTemplateCondition {
-
-	}
-
-	@ConditionalOnMissingBean(LoadBalancedRetryFactory.class)
-	static class OnRetryFactoryCondition {
-
-	}
-
-	@ConditionalOnProperty(value = "spring.cloud.loadbalancer.retry.enabled",
-			havingValue = "false")
-	static class OnLoadBalancerRetryEnabledCondition {
-
-	}
-
-}

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

@@ -1,188 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.backoff.BackOffPolicy;
-import org.springframework.retry.backoff.NoBackOffPolicy;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-
-/**
- * A {@link Client} implementation that provides Spring Retry support for requests
- * load-balanced with Spring Cloud LoadBalancer.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.6
- */
-public class RetryableFeignBlockingLoadBalancerClient implements Client {
-
-	private static final Log LOG = LogFactory
-			.getLog(FeignBlockingLoadBalancerClient.class);
-
-	private final Client delegate;
-
-	private final BlockingLoadBalancerClient loadBalancerClient;
-
-	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
-
-	public RetryableFeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient,
-			LoadBalancedRetryFactory loadBalancedRetryFactory) {
-		this.delegate = delegate;
-		this.loadBalancerClient = loadBalancerClient;
-		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
-	}
-
-	@Override
-	public Response execute(Request request, Request.Options options) throws IOException {
-		final URI originalUri = URI.create(request.url());
-		String serviceId = originalUri.getHost();
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryFactory
-				.createRetryPolicy(serviceId, loadBalancerClient);
-		RetryTemplate retryTemplate = buildRetryTemplate(serviceId, request, retryPolicy);
-		return retryTemplate.execute(context -> {
-			Request feignRequest = null;
-			// On retries the policy will choose the server and set it in the context
-			// and extract the server and update the request being made
-			if (context instanceof LoadBalancedRetryContext) {
-				ServiceInstance serviceInstance = ((LoadBalancedRetryContext) context)
-						.getServiceInstance();
-				if (serviceInstance != null) {
-					if (LOG.isDebugEnabled()) {
-						LOG.debug(String.format(
-								"Using service instance from LoadBalancedRetryContext: %s",
-								serviceInstance));
-					}
-					String reconstructedUrl = loadBalancerClient
-							.reconstructURI(serviceInstance, originalUri).toString();
-					feignRequest = buildRequest(request, reconstructedUrl);
-				}
-			}
-			if (feignRequest == null) {
-				if (LOG.isWarnEnabled()) {
-					LOG.warn(
-							"Service instance was not resolved, executing the original request");
-				}
-				feignRequest = request;
-			}
-			Response response = delegate.execute(feignRequest, options);
-			int responseStatus = response.status();
-			if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug(
-							String.format("Retrying on status code: %d", responseStatus));
-				}
-				response.close();
-				throw new RetryableStatusCodeException(serviceId, responseStatus,
-						response, URI.create(request.url()));
-			}
-			return response;
-		}, new LoadBalancedRecoveryCallback<Response, Response>() {
-			@Override
-			protected Response createResponse(Response response, URI uri) {
-				return response;
-			}
-		});
-	}
-
-	protected Request buildRequest(Request request, String reconstructedUrl) {
-		return Request.create(request.httpMethod(), reconstructedUrl, request.headers(),
-				request.body(), request.charset(), request.requestTemplate());
-	}
-
-	private RetryTemplate buildRetryTemplate(String serviceId, Request request,
-			LoadBalancedRetryPolicy retryPolicy) {
-		RetryTemplate retryTemplate = new RetryTemplate();
-		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory
-				.createBackOffPolicy(serviceId);
-		retryTemplate.setBackOffPolicy(
-				backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
-		RetryListener[] retryListeners = this.loadBalancedRetryFactory
-				.createRetryListeners(serviceId);
-		if (retryListeners != null && retryListeners.length != 0) {
-			retryTemplate.setListeners(retryListeners);
-		}
-
-		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
-				: new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy,
-						loadBalancerClient, serviceId));
-		return retryTemplate;
-	}
-
-	// Visible for Sleuth instrumentation
-	public Client getDelegate() {
-		return delegate;
-	}
-
-	private HttpRequest toHttpRequest(Request request) {
-		return new HttpRequest() {
-			@Override
-			public HttpMethod getMethod() {
-				return HttpMethod.resolve(request.httpMethod().name());
-			}
-
-			@Override
-			public String getMethodValue() {
-				return getMethod().name();
-			}
-
-			@Override
-			public URI getURI() {
-				return URI.create(request.url());
-			}
-
-			@Override
-			public HttpHeaders getHeaders() {
-				Map<String, List<String>> headers = new HashMap<>();
-				Map<String, Collection<String>> feignHeaders = request.headers();
-				for (String key : feignHeaders.keySet()) {
-					headers.put(key, new ArrayList<>(feignHeaders.get(key)));
-				}
-				HttpHeaders httpHeaders = new HttpHeaders();
-				httpHeaders.putAll(headers);
-				return httpHeaders;
-			}
-		};
-	}
-
-}

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

@@ -1,72 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.util.Map;
-
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-/**
- * Factory for SpringLoadBalancer instances that caches the entries created.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @author Ryan Baxter
- * @author Gang Li
- */
-public class CachingSpringLoadBalancerFactory {
-
-	protected final SpringClientFactory factory;
-
-	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;
-
-	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory) {
-		this.factory = factory;
-	}
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
-			LoadBalancedRetryFactory loadBalancedRetryPolicyFactory) {
-		this.factory = factory;
-		this.loadBalancedRetryFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	public FeignLoadBalancer create(String clientName) {
-		FeignLoadBalancer client = this.cache.get(clientName);
-		if (client != null) {
-			return client;
-		}
-		IClientConfig config = this.factory.getClientConfig(clientName);
-		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
-		ServerIntrospector serverIntrospector = this.factory.getInstance(clientName,
-				ServerIntrospector.class);
-		client = this.loadBalancedRetryFactory != null
-				? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
-						this.loadBalancedRetryFactory)
-				: new FeignLoadBalancer(lb, config, serverIntrospector);
-		this.cache.put(clientName, client);
-		return client;
-	}
-
-}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import feign.Client;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-class DefaultFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory) {
-		return new LoadBalancerFeignClient(new Client.Default(null, null), cachingFactory,
-				clientFactory);
-	}
-
-}

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

@@ -1,245 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.netflix.client.AbstractLoadBalancerAwareClient;
-import com.netflix.client.ClientRequest;
-import com.netflix.client.IResponse;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-
-import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecureConnectionIfNeeded;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Ryan Baxter
- * @author Tim Ysewyn
- * @author Olga Maciaszek-Sharma
- */
-public class FeignLoadBalancer extends
-		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
-
-	private final RibbonProperties ribbon;
-
-	protected int connectTimeout;
-
-	protected int readTimeout;
-
-	protected IClientConfig clientConfig;
-
-	protected ServerIntrospector serverIntrospector;
-
-	public FeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-			ServerIntrospector serverIntrospector) {
-		super(lb, clientConfig);
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		this.clientConfig = clientConfig;
-		this.ribbon = RibbonProperties.from(clientConfig);
-		RibbonProperties ribbon = this.ribbon;
-		this.connectTimeout = ribbon.getConnectTimeout();
-		this.readTimeout = ribbon.getReadTimeout();
-		this.serverIntrospector = serverIntrospector;
-	}
-
-	@Override
-	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
-			throws IOException {
-		Request.Options options;
-		if (configOverride != null) {
-			RibbonProperties override = RibbonProperties.from(configOverride);
-			options = new Request.Options(override.connectTimeout(this.connectTimeout),
-					override.readTimeout(this.readTimeout));
-		}
-		else {
-			options = new Request.Options(this.connectTimeout, this.readTimeout);
-		}
-		Response response = request.client().execute(request.toRequest(), options);
-		return new RibbonResponse(request.getUri(), response);
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			RibbonRequest request, IClientConfig requestConfig) {
-		if (this.ribbon.isOkToRetryOnAllOperations()) {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-		if (!request.toRequest().httpMethod().name().equals("GET")) {
-			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
-					requestConfig);
-		}
-		else {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-	}
-
-	@Override
-	public URI reconstructURIWithServer(Server server, URI original) {
-		URI uri = updateToSecureConnectionIfNeeded(original, this.clientConfig,
-				this.serverIntrospector, server);
-		return super.reconstructURIWithServer(server, uri);
-	}
-
-	protected static class RibbonRequest extends ClientRequest implements Cloneable {
-
-		private final Request request;
-
-		private final Client client;
-
-		protected RibbonRequest(Client client, Request request, URI uri) {
-			this.client = client;
-			setUri(uri);
-			this.request = toRequest(request);
-		}
-
-		private Request toRequest(Request request) {
-			Map<String, Collection<String>> headers = new LinkedHashMap<>(
-					request.headers());
-			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
-					request.body(), request.charset(), request.requestTemplate());
-		}
-
-		Request toRequest() {
-			return toRequest(this.request);
-		}
-
-		Client client() {
-			return this.client;
-		}
-
-		HttpRequest toHttpRequest() {
-			return new HttpRequest() {
-				@Override
-				public HttpMethod getMethod() {
-					return HttpMethod
-							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
-				}
-
-				@Override
-				public String getMethodValue() {
-					return getMethod().name();
-				}
-
-				@Override
-				public URI getURI() {
-					return RibbonRequest.this.getUri();
-				}
-
-				@Override
-				public HttpHeaders getHeaders() {
-					Map<String, List<String>> headers = new HashMap<>();
-					Map<String, Collection<String>> feignHeaders = RibbonRequest.this
-							.toRequest().headers();
-					for (String key : feignHeaders.keySet()) {
-						headers.put(key, new ArrayList<>(feignHeaders.get(key)));
-					}
-					HttpHeaders httpHeaders = new HttpHeaders();
-					httpHeaders.putAll(headers);
-					return httpHeaders;
-
-				}
-			};
-		}
-
-		public Request getRequest() {
-			return this.request;
-		}
-
-		public Client getClient() {
-			return this.client;
-		}
-
-		@Override
-		public Object clone() {
-			return new RibbonRequest(this.client, this.request, getUri());
-		}
-
-	}
-
-	protected static class RibbonResponse implements IResponse {
-
-		private final URI uri;
-
-		private final Response response;
-
-		protected RibbonResponse(URI uri, Response response) {
-			this.uri = uri;
-			this.response = response;
-		}
-
-		@Override
-		public Object getPayload() {
-			return this.response.body();
-		}
-
-		@Override
-		public boolean hasPayload() {
-			return this.response.body() != null;
-		}
-
-		@Override
-		public boolean isSuccess() {
-			return this.response.status() == 200;
-		}
-
-		@Override
-		public URI getRequestedURI() {
-			return this.uri;
-		}
-
-		@Override
-		public Map<String, Collection<String>> getHeaders() {
-			return this.response.headers();
-		}
-
-		Response toResponse() {
-			return this.response;
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (this.response != null && this.response.body() != null) {
-				this.response.body().close();
-			}
-		}
-
-	}
-
-}

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

@@ -1,129 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryContext;
-
-/**
- * @author Ryan Baxter
- */
-public class FeignRetryPolicy extends InterceptorRetryPolicy {
-
-	private HttpRequest request;
-
-	private String serviceId;
-
-	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
-			ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
-		super(request, policy, serviceInstanceChooser, serviceName);
-		this.request = request;
-		this.serviceId = serviceName;
-	}
-
-	@Override
-	public boolean canRetry(RetryContext context) {
-		/*
-		 * In InterceptorRetryPolicy.canRetry we ask the LoadBalancer to choose a server
-		 * if one is not set in the retry context and then return true. RetryTemplat calls
-		 * the canRetry method of the policy even on its first execution. So the fact that
-		 * we didnt have a service instance set in the RetryContext signaled that it was
-		 * the first execution and we should return true.
-		 *
-		 * In the Feign scenario, Feign as actually already queried the load balancer for
-		 * a service instance and we set that service instance in the context when we call
-		 * the open method of the policy. So in the Feign case we just return true if the
-		 * retry count is 0 indicating we haven't yet made a failed request.
-		 */
-		if (context.getRetryCount() == 0) {
-			return true;
-		}
-		return super.canRetry(context);
-	}
-
-	@Override
-	public RetryContext open(RetryContext parent) {
-		/*
-		 * With Feign (unlike Ribbon) the request already has the URI for the service
-		 * instance we are going to make the request to, so extract that information and
-		 * set the service instance in the context. In the Ribbon scenario the URI in the
-		 * request object still has the service id so we choose and set the service
-		 * instance later on.
-		 */
-		LoadBalancedRetryContext context = new LoadBalancedRetryContext(parent,
-				this.request);
-		context.setServiceInstance(
-				new FeignRetryPolicyServiceInstance(this.serviceId, this.request));
-		return context;
-	}
-
-	class FeignRetryPolicyServiceInstance implements ServiceInstance {
-
-		private String serviceId;
-
-		private HttpRequest request;
-
-		private Map<String, String> metadata;
-
-		FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) {
-			this.serviceId = serviceId;
-			this.request = request;
-			this.metadata = new HashMap<>();
-		}
-
-		@Override
-		public String getServiceId() {
-			return this.serviceId;
-		}
-
-		@Override
-		public String getHost() {
-			return this.request.getURI().getHost();
-		}
-
-		@Override
-		public int getPort() {
-			return this.request.getURI().getPort();
-		}
-
-		@Override
-		public boolean isSecure() {
-			return "https".equals(this.request.getURI().getScheme());
-		}
-
-		@Override
-		public URI getUri() {
-			return this.request.getURI();
-		}
-
-		@Override
-		public Map<String, String> getMetadata() {
-			return this.metadata;
-		}
-
-	}
-
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import com.netflix.loadbalancer.ILoadBalancer;
-import feign.Feign;
-import feign.Request;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-
-/**
- * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
- * load balancer.
- *
- * @author Dave Syer
- * @author Olga Maciaszek-Sharma
- */
-@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
-@ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled",
-		matchIfMissing = true)
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-@EnableConfigurationProperties({ FeignHttpClientProperties.class })
-// Order is important here, last should be the default, first should be optional
-// see
-// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ HttpClientFeignLoadBalancedConfiguration.class,
-		OkHttpFeignLoadBalancedConfiguration.class,
-		DefaultFeignLoadBalancedConfiguration.class })
-public class FeignRibbonClientAutoConfiguration {
-
-	@Bean
-	@Primary
-	@ConditionalOnMissingBean
-	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
-			SpringClientFactory factory) {
-		return new CachingSpringLoadBalancerFactory(factory);
-	}
-
-	@Bean
-	@Primary
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
-			SpringClientFactory factory, LoadBalancedRetryFactory retryFactory) {
-		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Request.Options feignRequestOptions() {
-		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
-	}
-
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-import org.apache.http.client.HttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-@Import(HttpClientFeignConfiguration.class)
-class HttpClientFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory, HttpClient httpClient) {
-		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-
-}

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

@@ -1,143 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-
-import com.netflix.client.ClientException;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
-/**
- * @author Dave Syer
- *
- */
-public class LoadBalancerFeignClient implements Client {
-
-	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
-
-	private final Client delegate;
-
-	private CachingSpringLoadBalancerFactory lbClientFactory;
-
-	private SpringClientFactory clientFactory;
-
-	public LoadBalancerFeignClient(Client delegate,
-			CachingSpringLoadBalancerFactory lbClientFactory,
-			SpringClientFactory clientFactory) {
-		this.delegate = delegate;
-		this.lbClientFactory = lbClientFactory;
-		this.clientFactory = clientFactory;
-	}
-
-	static URI cleanUrl(String originalUrl, String host) {
-		String newUrl = originalUrl;
-		if (originalUrl.startsWith("https://")) {
-			newUrl = originalUrl.substring(0, 8)
-					+ originalUrl.substring(8 + host.length());
-		}
-		else if (originalUrl.startsWith("http")) {
-			newUrl = originalUrl.substring(0, 7)
-					+ originalUrl.substring(7 + host.length());
-		}
-		StringBuffer buffer = new StringBuffer(newUrl);
-		if ((newUrl.startsWith("https://") && newUrl.length() == 8)
-				|| (newUrl.startsWith("http://") && newUrl.length() == 7)) {
-			buffer.append("/");
-		}
-		return URI.create(buffer.toString());
-	}
-
-	@Override
-	public Response execute(Request request, Request.Options options) throws IOException {
-		try {
-			URI asUri = URI.create(request.url());
-			String clientName = asUri.getHost();
-			URI uriWithoutHost = cleanUrl(request.url(), clientName);
-			FeignLoadBalancer.RibbonRequest ribbonRequest = new FeignLoadBalancer.RibbonRequest(
-					this.delegate, request, uriWithoutHost);
-
-			IClientConfig requestConfig = getClientConfig(options, clientName);
-			return lbClient(clientName)
-					.executeWithLoadBalancer(ribbonRequest, requestConfig).toResponse();
-		}
-		catch (ClientException e) {
-			IOException io = findIOException(e);
-			if (io != null) {
-				throw io;
-			}
-			throw new RuntimeException(e);
-		}
-	}
-
-	IClientConfig getClientConfig(Request.Options options, String clientName) {
-		IClientConfig requestConfig;
-		if (options == DEFAULT_OPTIONS) {
-			requestConfig = this.clientFactory.getClientConfig(clientName);
-		}
-		else {
-			requestConfig = new FeignOptionsClientConfig(options);
-		}
-		return requestConfig;
-	}
-
-	protected IOException findIOException(Throwable t) {
-		if (t == null) {
-			return null;
-		}
-		if (t instanceof IOException) {
-			return (IOException) t;
-		}
-		return findIOException(t.getCause());
-	}
-
-	public Client getDelegate() {
-		return this.delegate;
-	}
-
-	private FeignLoadBalancer lbClient(String clientName) {
-		return this.lbClientFactory.create(clientName);
-	}
-
-	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
-
-		FeignOptionsClientConfig(Request.Options options) {
-			setProperty(CommonClientConfigKey.ConnectTimeout,
-					options.connectTimeoutMillis());
-			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
-		}
-
-		@Override
-		public void loadProperties(String clientName) {
-
-		}
-
-		@Override
-		public void loadDefaultValues() {
-
-		}
-
-	}
-
-}

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

@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import feign.Client;
-import feign.okhttp.OkHttpClient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty("feign.okhttp.enabled")
-@Import(OkHttpFeignConfiguration.class)
-class OkHttpFeignLoadBalancedConfiguration {
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-			SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
-		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-
-}

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

@@ -1,141 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-
-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.backoff.BackOffPolicy;
-import org.springframework.retry.backoff.NoBackOffPolicy;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.StreamUtils;
-
-/**
- * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
- *
- * @author Ryan Baxter
- * @author Gang Li
- */
-public class RetryableFeignLoadBalancer extends FeignLoadBalancer
-		implements ServiceInstanceChooser {
-
-	private final LoadBalancedRetryFactory loadBalancedRetryFactory;
-
-	public RetryableFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-			ServerIntrospector serverIntrospector,
-			LoadBalancedRetryFactory loadBalancedRetryFactory) {
-		super(lb, clientConfig, serverIntrospector);
-		this.loadBalancedRetryFactory = loadBalancedRetryFactory;
-		this.setRetryHandler(new DefaultLoadBalancerRetryHandler(clientConfig));
-	}
-
-	@Override
-	public RibbonResponse execute(final RibbonRequest request,
-			IClientConfig configOverride) throws IOException {
-		final Request.Options options;
-		if (configOverride != null) {
-			RibbonProperties ribbon = RibbonProperties.from(configOverride);
-			options = new Request.Options(ribbon.connectTimeout(this.connectTimeout),
-					ribbon.readTimeout(this.readTimeout));
-		}
-		else {
-			options = new Request.Options(this.connectTimeout, this.readTimeout);
-		}
-		final LoadBalancedRetryPolicy retryPolicy = this.loadBalancedRetryFactory
-				.createRetryPolicy(this.getClientName(), this);
-		RetryTemplate retryTemplate = new RetryTemplate();
-		BackOffPolicy backOffPolicy = this.loadBalancedRetryFactory
-				.createBackOffPolicy(this.getClientName());
-		retryTemplate.setBackOffPolicy(
-				backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy);
-		RetryListener[] retryListeners = this.loadBalancedRetryFactory
-				.createRetryListeners(this.getClientName());
-		if (retryListeners != null && retryListeners.length != 0) {
-			retryTemplate.setListeners(retryListeners);
-		}
-		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
-				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this,
-						this.getClientName()));
-		return retryTemplate.execute(retryContext -> {
-			Request feignRequest = null;
-			// on retries the policy will choose the server and set it in the context
-			// extract the server and update the request being made
-			if (retryContext instanceof LoadBalancedRetryContext) {
-				ServiceInstance service = ((LoadBalancedRetryContext) retryContext)
-						.getServiceInstance();
-				if (service != null) {
-					feignRequest = ((RibbonRequest) request
-							.replaceUri(reconstructURIWithServer(
-									new Server(service.getHost(), service.getPort()),
-									request.getUri()))).toRequest();
-				}
-			}
-			if (feignRequest == null) {
-				feignRequest = request.toRequest();
-			}
-			Response response = request.client().execute(feignRequest, options);
-			if (retryPolicy != null
-					&& retryPolicy.retryableStatusCode(response.status())) {
-				byte[] byteArray = response.body() == null ? new byte[] {}
-						: StreamUtils.copyToByteArray(response.body().asInputStream());
-				response.close();
-				throw new RibbonResponseStatusCodeException(
-						RetryableFeignLoadBalancer.this.clientName, response, byteArray,
-						request.getUri());
-			}
-			return new RibbonResponse(request.getUri(), response);
-		}, new LoadBalancedRecoveryCallback<RibbonResponse, Response>() {
-			@Override
-			protected RibbonResponse createResponse(Response response, URI uri) {
-				return new RibbonResponse(uri, response);
-			}
-		});
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(),
-				requestConfig);
-	}
-
-	@Override
-	public ServiceInstance choose(String serviceId) {
-		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
-				this.getLoadBalancer().chooseServer(serviceId));
-	}
-
-}

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

@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.io.ByteArrayInputStream;
-import java.net.URI;
-
-import feign.Response;
-
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-
-/**
- * A {@link RetryableStatusCodeException} for {@link Response}s.
- *
- * @author Ryan Baxter
- */
-public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
-
-	private final Response response;
-
-	public RibbonResponseStatusCodeException(String serviceId, Response response,
-			byte[] body, URI uri) {
-		super(serviceId, response.status(), response, uri);
-		this.response = Response.builder()
-				.body(new ByteArrayInputStream(body), body.length)
-				.headers(response.headers()).reason(response.reason())
-				.status(response.status()).request(response.request()).build();
-	}
-
-	@Override
-	public Response getResponse() {
-		return this.response;
-	}
-
-}

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

@@ -29,7 +29,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
 import static feign.form.ContentProcessor.CRLF;
-import static feign.form.util.PojoUtil.isUserPojo;
 
 /**
  * @author Darren Foong

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

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

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

@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.Version;
@@ -37,7 +36,6 @@ import org.springframework.data.domain.Sort;
  * This Jackson module provides support to deserialize Spring {@link Page} objects.
  *
  * @author Pascal Büttiker
- * @author Olga Maciaszek-Sharma
  */
 public class PageJacksonModule extends Module {
 
@@ -67,9 +65,7 @@ public class PageJacksonModule extends Module {
 
 		SimplePageImpl(@JsonProperty("content") List<T> content,
 				@JsonProperty("number") int number, @JsonProperty("size") int size,
-				@JsonProperty("totalElements") @JsonAlias({ "total-elements",
-						"total_elements", "totalelements",
-						"TotalElements" }) long totalElements,
+				@JsonProperty("totalElements") long totalElements,
 				@JsonProperty("sort") Sort sort) {
 			PageRequest pageRequest;
 			if (sort != null) {

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

@@ -120,7 +120,7 @@ public class PageableSpringEncoder implements Encoder {
 			}
 		}
 		for (Sort.Order order : sort) {
-			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
+			sortQueries.add(order.getProperty() + "," + order.getDirection());
 		}
 		if (!sortQueries.isEmpty()) {
 			template.query(sortParameter, sortQueries);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,16 @@ import feign.Response;
 import feign.codec.Decoder;
 
 import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 /**
  * Decoder adds compatibility for Spring MVC's ResponseEntity to any other decoder via
  * composition.
  *
  * @author chad jaros
- * @author Olga Maciaszek-Sharma
  */
 public class ResponseEntityDecoder implements Decoder {
 
@@ -81,7 +81,7 @@ public class ResponseEntityDecoder implements Decoder {
 	@SuppressWarnings("unchecked")
 	private <T> ResponseEntity<T> createResponse(Object instance, Response response) {
 
-		HttpHeaders headers = new HttpHeaders();
+		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
 		for (String key : response.headers().keySet()) {
 			headers.put(key, new LinkedList<>(response.headers().get(key)));
 		}

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

@@ -37,7 +37,6 @@ import feign.Param;
 import feign.Request;
 
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.cloud.openfeign.CollectionFormat;
 import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
@@ -57,7 +56,6 @@ import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -78,7 +76,6 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
  * @author Aaron Whiteside
  * @author Artyom Romanenko
  * @author Darren Foong
- * @author Ram Anaswara
  */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -105,8 +102,6 @@ public class SpringMvcContract extends Contract.BaseContract
 
 	private ResourceLoader resourceLoader = new DefaultResourceLoader();
 
-	private boolean decodeSlash;
-
 	public SpringMvcContract() {
 		this(Collections.emptyList());
 	}
@@ -119,12 +114,6 @@ public class SpringMvcContract extends Contract.BaseContract
 	public SpringMvcContract(
 			List<AnnotatedParameterProcessor> annotatedParameterProcessors,
 			ConversionService conversionService) {
-		this(annotatedParameterProcessors, conversionService, true);
-	}
-
-	public SpringMvcContract(
-			List<AnnotatedParameterProcessor> annotatedParameterProcessors,
-			ConversionService conversionService, boolean decodeSlash) {
 		Assert.notNull(annotatedParameterProcessors,
 				"Parameter processors can not be null.");
 		Assert.notNull(conversionService, "ConversionService can not be null.");
@@ -132,10 +121,9 @@ public class SpringMvcContract extends Contract.BaseContract
 		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
 		processors.addAll(annotatedParameterProcessors);
 
-		annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
+		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
-		convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
-		this.decodeSlash = decodeSlash;
+		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
 	}
 
 	private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) {
@@ -184,17 +172,13 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (clz.getInterfaces().length == 0) {
 			RequestMapping classAnnotation = findMergedAnnotation(clz,
 					RequestMapping.class);
-			if (classAnnotation != null) {
+			if (classAnnotation != null && classAnnotation.value().length > 0) {
 				// Prepend path from class annotation if specified
-				if (classAnnotation.value().length > 0) {
-					String pathValue = emptyToNull(classAnnotation.value()[0]);
+				String pathValue = emptyToNull(classAnnotation.value()[0]);
+				if (pathValue != null) {
 					pathValue = resolve(pathValue);
-					if (!pathValue.startsWith("/")) {
-						pathValue = "/" + pathValue;
-					}
-					data.template().uri(pathValue);
-					if (data.template().decodeSlash() != decodeSlash) {
-						data.template().decodeSlash(decodeSlash);
+					if (!pathValue.equals("/")) {
+						data.template().uri(pathValue);
 					}
 				}
 			}
@@ -203,7 +187,7 @@ public class SpringMvcContract extends Contract.BaseContract
 
 	@Override
 	public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
-		processedMethods.put(Feign.configKey(targetType, method), method);
+		this.processedMethods.put(Feign.configKey(targetType, method), method);
 		MethodMetadata md = super.parseAndValidateMetadata(targetType, method);
 
 		RequestMapping classAnnotation = findMergedAnnotation(targetType,
@@ -229,12 +213,6 @@ public class SpringMvcContract extends Contract.BaseContract
 	@Override
 	protected void processAnnotationOnMethod(MethodMetadata data,
 			Annotation methodAnnotation, Method method) {
-		if (CollectionFormat.class.isInstance(methodAnnotation)) {
-			CollectionFormat collectionFormat = findMergedAnnotation(method,
-					CollectionFormat.class);
-			data.template().collectionFormat(collectionFormat.value());
-		}
-
 		if (!RequestMapping.class.isInstance(methodAnnotation) && !methodAnnotation
 				.annotationType().isAnnotationPresent(RequestMapping.class)) {
 			return;
@@ -255,13 +233,8 @@ public class SpringMvcContract extends Contract.BaseContract
 			String pathValue = emptyToNull(methodMapping.value()[0]);
 			if (pathValue != null) {
 				pathValue = resolve(pathValue);
-				// Append path from @RequestMapping if value is present on method
-				if (!pathValue.startsWith("/") && !data.template().path().endsWith("/")) {
-					pathValue = "/" + pathValue;
-				}
-				data.template().uri(pathValue, true);
-				if (data.template().decodeSlash() != decodeSlash) {
-					data.template().decodeSlash(decodeSlash);
+				if (!pathValue.equals("/")) {
+					data.template().uri(pathValue, true);
 				}
 			}
 		}
@@ -275,13 +248,13 @@ public class SpringMvcContract extends Contract.BaseContract
 		// headers
 		parseHeaders(data, method, methodMapping);
 
-		data.indexToExpander(new LinkedHashMap<>());
+		data.indexToExpander(new LinkedHashMap<Integer, Param.Expander>());
 	}
 
 	private String resolve(String value) {
 		if (StringUtils.hasText(value)
-				&& resourceLoader instanceof ConfigurableApplicationContext) {
-			return ((ConfigurableApplicationContext) resourceLoader).getEnvironment()
+				&& this.resourceLoader instanceof ConfigurableApplicationContext) {
+			return ((ConfigurableApplicationContext) this.resourceLoader).getEnvironment()
 					.resolvePlaceholders(value);
 		}
 		return value;
@@ -307,9 +280,9 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		AnnotatedParameterProcessor.AnnotatedParameterContext context = new SimpleAnnotatedParameterContext(
 				data, paramIndex);
-		Method method = processedMethods.get(data.configKey());
+		Method method = this.processedMethods.get(data.configKey());
 		for (Annotation parameterAnnotation : annotations) {
-			AnnotatedParameterProcessor processor = annotatedArgumentProcessors
+			AnnotatedParameterProcessor processor = this.annotatedArgumentProcessors
 					.get(parameterAnnotation.annotationType());
 			if (processor != null) {
 				Annotation processParameterAnnotation;
@@ -325,8 +298,9 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (!isMultipartFormData(data) && isHttpAnnotation
 				&& data.indexToExpander().get(paramIndex) == null) {
 			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
-			if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) {
-				Param.Expander expander = convertingExpanderFactory
+			if (this.conversionService.canConvert(typeDescriptor,
+					STRING_TYPE_DESCRIPTOR)) {
+				Param.Expander expander = this.convertingExpanderFactory
 						.getExpander(typeDescriptor);
 				if (expander != null) {
 					data.indexToExpander().put(paramIndex, expander);
@@ -425,13 +399,7 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		if (contentTypes != null && !contentTypes.isEmpty()) {
 			String type = contentTypes.iterator().next();
-			try {
-				return Objects.equals(MediaType.valueOf(type),
-						MediaType.MULTIPART_FORM_DATA);
-			}
-			catch (InvalidMediaTypeException ignored) {
-				return false;
-			}
+			return Objects.equals(MediaType.valueOf(type), MediaType.MULTIPART_FORM_DATA);
 		}
 
 		return false;
@@ -451,7 +419,7 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		@Override
 		public String expand(Object value) {
-			return conversionService.convert(value, String.class);
+			return this.conversionService.convert(value, String.class);
 		}
 
 	}
@@ -466,7 +434,7 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		Param.Expander getExpander(TypeDescriptor typeDescriptor) {
 			return value -> {
-				Object converted = conversionService.convert(value, typeDescriptor,
+				Object converted = this.conversionService.convert(value, typeDescriptor,
 						STRING_TYPE_DESCRIPTOR);
 				return (String) converted;
 			};
@@ -489,17 +457,17 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		@Override
 		public MethodMetadata getMethodMetadata() {
-			return methodMetadata;
+			return this.methodMetadata;
 		}
 
 		@Override
 		public int getParameterIndex() {
-			return parameterIndex;
+			return this.parameterIndex;
 		}
 
 		@Override
 		public void setParameterName(String name) {
-			nameParam(methodMetadata, name, parameterIndex);
+			nameParam(this.methodMetadata, name, this.parameterIndex);
 		}
 
 		@Override

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

@@ -8,18 +8,6 @@
 			"description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
 			"defaultValue": "false"
 		},
-		{
-			"name": "feign.autoconfiguration.jackson.enabled",
-			"type": "java.lang.Boolean",
-			"description": "If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.",
-			"defaultValue": "false"
-		},
-		{
-			"name": "feign.circuitbreaker.enabled",
-			"type": "java.lang.Boolean",
-			"description": "If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.",
-			"defaultValue": "false"
-		},
 		{
 			"name": "feign.httpclient.enabled",
 			"type": "java.lang.Boolean",

spring-cloud-openfeign-core/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration,\
 org.springframework.cloud.openfeign.hateoas.FeignHalAutoConfiguration,\
 org.springframework.cloud.openfeign.FeignAutoConfiguration,\
 org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\

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

@@ -21,12 +21,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -49,8 +47,7 @@ public class EnableFeignClientsSpringDataTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			FeignAutoConfiguration.class })
+	@EnableAutoConfiguration
 	protected static class PlainConfiguration {
 
 	}

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

@@ -30,7 +30,6 @@ import org.junit.runner.RunWith;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.cloud.test.ClassPathExclusions;
@@ -88,7 +87,7 @@ public class EnableFeignClientsTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class })
+	@Import({ FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {
 
 	}

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

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

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

@@ -24,7 +24,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import feign.hystrix.FallbackFactory;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
@@ -109,7 +108,6 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "type", TestFeignClient.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
 		assertFactoryBeanField(builder, "contextId", "TestClient");
-		assertFactoryBeanField(builder, "inheritParentContext", true);
 
 		// and:
 		assertFactoryBeanField(builder, "url",
@@ -128,10 +126,29 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").inheritParentContext(false)
-				.fallback(TestFeignClientFallback.class)
-				.fallbackFactory(TestFeignClientFallbackFactory.class).decode404(true)
-				.url("Url/").path("/Path").contextId("TestContext");
+				.forType(TestFeignClient.class, "TestClient").decode404(true).url("Url/")
+				.path("/Path").contextId("TestContext");
+
+		// then:
+		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
+		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "name", "TestClient");
+		assertFactoryBeanField(builder, "contextId", "TestContext");
+
+		// and:
+		assertFactoryBeanField(builder, "url", "http://Url/");
+		assertFactoryBeanField(builder, "path", "/Path");
+		assertFactoryBeanField(builder, "decode404", true);
+
+	}
+
+	@Test
+	public void forType_clientFactoryBeanProvided() {
+		// when:
+		final FeignClientBuilder.Builder builder = this.feignClientBuilder
+				.forType(TestFeignClient.class, new FeignClientFactoryBean(),
+						"TestClient")
+				.decode404(true).path("Path/").url("Url/").contextId("TestContext");
 
 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
@@ -143,10 +160,6 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "url", "http://Url/");
 		assertFactoryBeanField(builder, "path", "/Path");
 		assertFactoryBeanField(builder, "decode404", true);
-		assertFactoryBeanField(builder, "inheritParentContext", false);
-		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
-		assertFactoryBeanField(builder, "fallbackFactory",
-				TestFeignClientFallbackFactory.class);
 	}
 
 	@Test
@@ -169,18 +182,4 @@ public class FeignClientBuilderTests {
 
 	}
 
-	private class TestFeignClientFallback implements TestFeignClient {
-
-	}
-
-	private class TestFeignClientFallbackFactory
-			implements FallbackFactory<TestFeignClient> {
-
-		@Override
-		public TestFeignClientFallback create(Throwable throwable) {
-			return new TestFeignClientFallback();
-		}
-
-	}
-
 }

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

@@ -18,33 +18,32 @@ package org.springframework.cloud.openfeign;
 
 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
-import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestLine;
+import feign.RequestTemplate;
 import feign.Retryer;
 import feign.auth.BasicAuthRequestInterceptor;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
 import feign.querymap.BeanQueryMapEncoder;
 import feign.slf4j.Slf4jLogger;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -53,9 +52,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Spencer Gibb
  */
+@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = FeignClientOverrideDefaultsTests.TestConfiguration.class)
 @DirtiesContext
-class FeignClientOverrideDefaultsTests {
+public class FeignClientOverrideDefaultsTests {
 
 	@Autowired
 	private FeignContext context;
@@ -67,89 +67,85 @@ class FeignClientOverrideDefaultsTests {
 	private BarClient bar;
 
 	@Test
-	void clientsAvailable() {
-		assertThat(foo).isNotNull();
-		assertThat(bar).isNotNull();
+	public void clientsAvailable() {
+		assertThat(this.foo).isNotNull();
+		assertThat(this.bar).isNotNull();
 	}
 
 	@Test
-	void overrideDecoder() {
-		Decoder.Default.class.cast(context.getInstance("foo", Decoder.class));
-		OptionalDecoder.class.cast(context.getInstance("bar", Decoder.class));
+	public void overrideDecoder() {
+		Decoder.Default.class.cast(this.context.getInstance("foo", Decoder.class));
+		OptionalDecoder.class.cast(this.context.getInstance("bar", Decoder.class));
 	}
 
 	@Test
-	void overrideEncoder() {
-		Encoder.Default.class.cast(context.getInstance("foo", Encoder.class));
-		PageableSpringEncoder.class.cast(context.getInstance("bar", Encoder.class));
+	public void overrideEncoder() {
+		Encoder.Default.class.cast(this.context.getInstance("foo", Encoder.class));
+		PageableSpringEncoder.class.cast(this.context.getInstance("bar", Encoder.class));
 	}
 
 	@Test
-	void overrideLogger() {
-		Logger.JavaLogger.class.cast(context.getInstance("foo", Logger.class));
-		Slf4jLogger.class.cast(context.getInstance("bar", Logger.class));
+	public void overrideLogger() {
+		Logger.JavaLogger.class.cast(this.context.getInstance("foo", Logger.class));
+		Slf4jLogger.class.cast(this.context.getInstance("bar", Logger.class));
 	}
 
 	@Test
-	void overrideContract() {
-		Contract.Default.class.cast(context.getInstance("foo", Contract.class));
-		SpringMvcContract.class.cast(context.getInstance("bar", Contract.class));
+	public void overrideContract() {
+		Contract.Default.class.cast(this.context.getInstance("foo", Contract.class));
+		SpringMvcContract.class.cast(this.context.getInstance("bar", Contract.class));
 	}
 
 	@Test
-	void overrideLoggerLevel() {
-		assertThat(context.getInstance("foo", Logger.Level.class)).isNull();
-		assertThat(context.getInstance("bar", Logger.Level.class))
+	public void overrideLoggerLevel() {
+		assertThat(this.context.getInstance("foo", Logger.Level.class)).isNull();
+		assertThat(this.context.getInstance("bar", Logger.Level.class))
 				.isEqualTo(Logger.Level.HEADERS);
 	}
 
 	@Test
-	void overrideRetryer() {
-		assertThat(context.getInstance("foo", Retryer.class))
+	public void overrideRetryer() {
+		assertThat(this.context.getInstance("foo", Retryer.class))
 				.isEqualTo(Retryer.NEVER_RETRY);
-		Retryer.Default.class.cast(context.getInstance("bar", Retryer.class));
+		Retryer.Default.class.cast(this.context.getInstance("bar", Retryer.class));
 	}
 
 	@Test
-	void overrideErrorDecoder() {
-		assertThat(context.getInstance("foo", ErrorDecoder.class)).isNull();
-		ErrorDecoder.Default.class.cast(context.getInstance("bar", ErrorDecoder.class));
+	public void overrideErrorDecoder() {
+		assertThat(this.context.getInstance("foo", ErrorDecoder.class)).isNull();
+		ErrorDecoder.Default.class
+				.cast(this.context.getInstance("bar", ErrorDecoder.class));
 	}
 
 	@Test
-	void overrideBuilder() {
-		HystrixFeign.Builder.class.cast(context.getInstance("foo", Feign.Builder.class));
-		Feign.Builder.class.cast(context.getInstance("bar", Feign.Builder.class));
-	}
-
-	@Test
-	void overrideRequestOptions() {
-		assertThat(context.getInstance("foo", Request.Options.class)).isNull();
-		Request.Options options = context.getInstance("bar", Request.Options.class);
+	public void overrideRequestOptions() {
+		assertThat(this.context.getInstance("foo", Request.Options.class)).isNull();
+		Request.Options options = this.context.getInstance("bar", Request.Options.class);
 		assertThat(options.connectTimeoutMillis()).isEqualTo(1);
 		assertThat(options.readTimeoutMillis()).isEqualTo(1);
 	}
 
 	@Test
-	void overrideQueryMapEncoder() {
+	public void overrideQueryMapEncoder() {
 		QueryMapEncoder.Default.class
-				.cast(context.getInstance("foo", QueryMapEncoder.class));
-		BeanQueryMapEncoder.class.cast(context.getInstance("bar", QueryMapEncoder.class));
+				.cast(this.context.getInstance("foo", QueryMapEncoder.class));
+		BeanQueryMapEncoder.class
+				.cast(this.context.getInstance("bar", QueryMapEncoder.class));
 	}
 
 	@Test
-	void addRequestInterceptor() {
-		assertThat(context.getInstances("foo", RequestInterceptor.class).size())
+	public void addRequestInterceptor() {
+		assertThat(this.context.getInstances("foo", RequestInterceptor.class).size())
 				.isEqualTo(1);
-		assertThat(context.getInstances("bar", RequestInterceptor.class).size())
+		assertThat(this.context.getInstances("bar", RequestInterceptor.class).size())
 				.isEqualTo(2);
 	}
 
 	@Test
-	void exceptionPropagationPolicy() {
-		assertThat(context.getInstances("foo", ExceptionPropagationPolicy.class))
-				.isEmpty();
-		assertThat(context.getInstances("bar", ExceptionPropagationPolicy.class))
+	public void exceptionPropagationPolicy() {
+		assertThat(this.context.getInstances("foo", ExceptionPropagationPolicy.class))
+				.isNull();
+		assertThat(this.context.getInstances("bar", ExceptionPropagationPolicy.class))
 				.containsValues(ExceptionPropagationPolicy.UNWRAP);
 	}
 
@@ -173,13 +169,15 @@ class FeignClientOverrideDefaultsTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			FeignAutoConfiguration.class })
+	@EnableAutoConfiguration
 	protected static class TestConfiguration {
 
 		@Bean
 		RequestInterceptor defaultRequestInterceptor() {
-			return template -> {
+			return new RequestInterceptor() {
+				@Override
+				public void apply(RequestTemplate template) {
+				}
 			};
 		}
 
@@ -207,11 +205,6 @@ class FeignClientOverrideDefaultsTests {
 			return new Contract.Default();
 		}
 
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new feign.QueryMapEncoder.Default();

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

@@ -26,10 +26,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
@@ -49,19 +49,18 @@ import static org.assertj.core.api.Assertions.assertThat;
 		"feign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
 public class FeignClientUsingConfigurerTest {
 
-	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
+	private static final String BEAN_NAME_PREFIX = "&org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
 
 	@Autowired
-	private ConfigurableListableBeanFactory beanFactory;
+	private ApplicationContext applicationContext;
 
 	@Autowired
 	private FeignContext context;
 
 	@Test
 	public void testFeignClient() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
-				.getBeanDefinition(BEAN_NAME_PREFIX + "TestFeignClient")
-				.getAttribute("feignClientsRegistrarFactoryBean");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "TestFeignClient");
 		Feign.Builder builder = factoryBean.feign(context);
 
 		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
@@ -80,9 +79,8 @@ public class FeignClientUsingConfigurerTest {
 
 	@Test
 	public void testNoInheritFeignClient() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
-				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
-				.getAttribute("feignClientsRegistrarFactoryBean");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
 		Feign.Builder builder = factoryBean.feign(context);
 
 		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder,
@@ -95,9 +93,8 @@ public class FeignClientUsingConfigurerTest {
 
 	@Test
 	public void testNoInheritFeignClient_ignoreProperties() {
-		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) beanFactory
-				.getBeanDefinition(BEAN_NAME_PREFIX + "NoInheritFeignClient")
-				.getAttribute("feignClientsRegistrarFactoryBean");
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
 		Feign.Builder builder = factoryBean.feign(context);
 
 		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set")

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

@@ -17,25 +17,13 @@
 package org.springframework.cloud.openfeign;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import feign.InvocationHandlerFactory;
-import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -59,13 +47,8 @@ import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -74,10 +57,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 
 /**
  * @author Eko Kurniawan Khannedy
- * @author Olga Maciaszek-Sharma
- * @author Ilia Ilinykh
  */
-@SuppressWarnings("FieldMayBeFinal")
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
 		webEnvironment = RANDOM_PORT)
@@ -102,62 +82,46 @@ public class FeignClientUsingPropertiesTests {
 
 	private FeignClientFactoryBean formFactoryBean;
 
-	private FeignClientFactoryBean defaultHeadersAndQuerySingleParamsFeignClientFactoryBean;
-
-	private FeignClientFactoryBean defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean;
-
 	public FeignClientUsingPropertiesTests() {
-		fooFactoryBean = new FeignClientFactoryBean();
-		fooFactoryBean.setContextId("foo");
-		fooFactoryBean.setType(FeignClientFactoryBean.class);
+		this.fooFactoryBean = new FeignClientFactoryBean();
+		this.fooFactoryBean.setContextId("foo");
+		this.fooFactoryBean.setType(FeignClientFactoryBean.class);
 
-		barFactoryBean = new FeignClientFactoryBean();
-		barFactoryBean.setContextId("bar");
-		barFactoryBean.setType(FeignClientFactoryBean.class);
+		this.barFactoryBean = new FeignClientFactoryBean();
+		this.barFactoryBean.setContextId("bar");
+		this.barFactoryBean.setType(FeignClientFactoryBean.class);
 
-		unwrapFactoryBean = new FeignClientFactoryBean();
-		unwrapFactoryBean.setContextId("unwrap");
-		unwrapFactoryBean.setType(FeignClientFactoryBean.class);
+		this.unwrapFactoryBean = new FeignClientFactoryBean();
+		this.unwrapFactoryBean.setContextId("unwrap");
+		this.unwrapFactoryBean.setType(FeignClientFactoryBean.class);
 
-		formFactoryBean = new FeignClientFactoryBean();
-		formFactoryBean.setContextId("form");
-		formFactoryBean.setType(FeignClientFactoryBean.class);
-
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean = new FeignClientFactoryBean();
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.setContextId("singleValue");
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.setType(FeignClientFactoryBean.class);
-
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean = new FeignClientFactoryBean();
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.setContextId("multipleValue");
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.setType(FeignClientFactoryBean.class);
+		this.formFactoryBean = new FeignClientFactoryBean();
+		this.formFactoryBean.setContextId("form");
+		this.formFactoryBean.setType(FeignClientFactoryBean.class);
 	}
 
 	public FooClient fooClient() {
-		fooFactoryBean.setApplicationContext(applicationContext);
-		return fooFactoryBean.feign(context).target(FooClient.class,
-				"http://localhost:" + port);
+		this.fooFactoryBean.setApplicationContext(this.applicationContext);
+		return this.fooFactoryBean.feign(this.context).target(FooClient.class,
+				"http://localhost:" + this.port);
 	}
 
 	public BarClient barClient() {
-		barFactoryBean.setApplicationContext(applicationContext);
-		return barFactoryBean.feign(context).target(BarClient.class,
-				"http://localhost:" + port);
+		this.barFactoryBean.setApplicationContext(this.applicationContext);
+		return this.barFactoryBean.feign(this.context).target(BarClient.class,
+				"http://localhost:" + this.port);
 	}
 
 	public UnwrapClient unwrapClient() {
-		unwrapFactoryBean.setApplicationContext(applicationContext);
-		return unwrapFactoryBean.feign(context).target(UnwrapClient.class,
-				"http://localhost:" + port);
+		this.unwrapFactoryBean.setApplicationContext(this.applicationContext);
+		return this.unwrapFactoryBean.feign(this.context).target(UnwrapClient.class,
+				"http://localhost:" + this.port);
 	}
 
 	public FormClient formClient() {
-		formFactoryBean.setApplicationContext(applicationContext);
-		return formFactoryBean.feign(context).target(FormClient.class,
-				"http://localhost:" + port);
+		this.formFactoryBean.setApplicationContext(this.applicationContext);
+		return this.formFactoryBean.feign(this.context).target(FormClient.class,
+				"http://localhost:" + this.port);
 	}
 
 	@Test
@@ -185,93 +149,23 @@ public class FeignClientUsingPropertiesTests {
 		assertThat(response).isEqualTo("Data");
 	}
 
-	@Test
-	public void testSingleValue() {
-		List<String> response = singleValueClient().singleValue();
-		assertThat(response).isEqualTo(Arrays.asList("header", "parameter"));
-	}
-
-	@Test
-	public void testMultipleValue() {
-		List<String> response = multipleValueClient().multipleValue();
-		assertThat(response).isEqualTo(
-				Arrays.asList("header1", "header2", "parameter1", "parameter2"));
-	}
-
-	public SingleValueClient singleValueClient() {
-		this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.setApplicationContext(this.applicationContext);
-		return this.defaultHeadersAndQuerySingleParamsFeignClientFactoryBean
-				.feign(this.context)
-				.target(SingleValueClient.class, "http://localhost:" + this.port);
-	}
-
-	public MultipleValueClient multipleValueClient() {
-		this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.setApplicationContext(this.applicationContext);
-		return this.defaultHeadersAndQueryMultipleParamsFeignClientFactoryBean
-				.feign(this.context)
-				.target(MultipleValueClient.class, "http://localhost:" + this.port);
-	}
-
-	@Test
-	public void readTimeoutShouldWorkWhenConnectTimeoutNotSet() {
-		FeignClientFactoryBean readTimeoutFactoryBean = new FeignClientFactoryBean();
-		readTimeoutFactoryBean.setContextId("readTimeout");
-		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
-		readTimeoutFactoryBean.setApplicationContext(applicationContext);
-
-		TimeoutClient client = readTimeoutFactoryBean.feign(context)
-				.target(TimeoutClient.class, "http://localhost:" + port);
-
-		Request.Options options = getRequestOptions((Proxy) client);
-
-		assertThat(options.readTimeoutMillis()).isEqualTo(1000);
-		assertThat(options.connectTimeoutMillis()).isEqualTo(5000);
-	}
-
-	@Test
-	public void connectTimeoutShouldWorkWhenReadTimeoutNotSet() {
-		FeignClientFactoryBean readTimeoutFactoryBean = new FeignClientFactoryBean();
-		readTimeoutFactoryBean.setContextId("connectTimeout");
-		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
-		readTimeoutFactoryBean.setApplicationContext(applicationContext);
-
-		TimeoutClient client = readTimeoutFactoryBean.feign(context)
-				.target(TimeoutClient.class, "http://localhost:" + port);
-
-		Request.Options options = getRequestOptions((Proxy) client);
-
-		assertThat(options.connectTimeoutMillis()).isEqualTo(1000);
-		assertThat(options.readTimeoutMillis()).isEqualTo(5000);
-	}
-
-	private Request.Options getRequestOptions(Proxy client) {
-		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
-		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
-				.getField(Objects.requireNonNull(invocationHandler), "dispatch");
-		Method key = new ArrayList<>(dispatch.keySet()).get(0);
-		return (Request.Options) ReflectionTestUtils.getField(dispatch.get(key),
-				"options");
-	}
-
 	protected interface FooClient {
 
-		@GetMapping(path = "/foo")
+		@RequestMapping(method = RequestMethod.GET, value = "/foo")
 		String foo();
 
 	}
 
 	protected interface BarClient {
 
-		@GetMapping(path = "/bar")
+		@RequestMapping(method = RequestMethod.GET, value = "/bar")
 		String bar();
 
 	}
 
 	protected interface UnwrapClient {
 
-		@GetMapping(path = "/bar") // intentionally /bar
+		@RequestMapping(method = RequestMethod.GET, value = "/bar") // intentionally /bar
 		String unwrap() throws IOException;
 
 	}
@@ -284,27 +178,6 @@ public class FeignClientUsingPropertiesTests {
 
 	}
 
-	protected interface SingleValueClient {
-
-		@GetMapping(path = "/singleValue")
-		List<String> singleValue();
-
-	}
-
-	protected interface MultipleValueClient {
-
-		@GetMapping(path = "/multipleValue")
-		List<String> multipleValue();
-
-	}
-
-	protected interface TimeoutClient {
-
-		@GetMapping("/timeouts")
-		String timeouts();
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
@@ -322,33 +195,18 @@ public class FeignClientUsingPropertiesTests {
 			}
 		}
 
-		@GetMapping(path = "/bar")
+		@RequestMapping(method = RequestMethod.GET, value = "/bar")
 		public String bar() throws InterruptedException {
-			TimeUnit.SECONDS.sleep(2);
+			Thread.sleep(2000L);
 			return "OK";
 		}
 
-		@PostMapping(path = "/form",
+		@RequestMapping(value = "/form", method = RequestMethod.POST,
 				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		public String form(HttpServletRequest request) {
 			return request.getParameter("form");
 		}
 
-		@GetMapping(path = "/singleValue")
-		public List<String> singleValue(@RequestHeader List<String> singleValueHeaders,
-				@RequestParam List<String> singleValueParameters) {
-			return Stream.of(singleValueHeaders, singleValueParameters)
-					.flatMap(Collection::stream).collect(Collectors.toList());
-		}
-
-		@GetMapping(path = "/multipleValue")
-		public List<String> multipleValue(
-				@RequestHeader List<String> multipleValueHeaders,
-				@RequestParam List<String> multipleValueParameters) {
-			return Stream.of(multipleValueHeaders, multipleValueParameters)
-					.flatMap(Collection::stream).collect(Collectors.toList());
-		}
-
 	}
 
 	public static class FooRequestInterceptor implements RequestInterceptor {

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

@@ -20,9 +20,7 @@ import java.util.Collections;
 
 import org.junit.Test;
 
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.openfeign.test.TestAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.env.MockEnvironment;
@@ -30,12 +28,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * @author Spencer Gibb
  * @author Gang Li
- * @author Michal Domagala
  */
 public class FeignClientsRegistrarTests {
 
@@ -93,18 +89,6 @@ public class FeignClientsRegistrarTests {
 		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}
 
-	@Test
-	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();
-
-	}
-
 	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/",
 			fallback = FallbackClient.class)
 	protected interface FallbackClient {
@@ -138,12 +122,4 @@ public class FeignClientsRegistrarTests {
 
 	}
 
-	@EnableFeignClients(clients = {
-			org.springframework.cloud.openfeign.feignclientsregistrar.TopLevelClient.class,
-			org.springframework.cloud.openfeign.feignclientsregistrar.sub.SubLevelClient.class })
-	@EnableAutoConfiguration(exclude = TestAutoConfiguration.class)
-	protected static class TopLevelSubLevelTestConfig {
-
-	}
-
 }

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

@@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration;
 import org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingInterceptor;
 import org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration;
@@ -54,8 +53,7 @@ public class FeignCompressionTests {
 				.withPropertyValues("feign.compression.response.enabled=true",
 						"feign.compression.request.enabled=true",
 						"feign.okhttp.enabled=false")
-				.withConfiguration(AutoConfigurations.of(ArchaiusAutoConfiguration.class,
-						FeignAutoConfiguration.class,
+				.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
 						FeignContentGzipEncodingAutoConfiguration.class,
 						FeignAcceptGzipEncodingAutoConfiguration.class,
 						HttpClientConfiguration.class, PlainConfig.class))

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,16 +25,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpHeaders;
 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;
@@ -47,7 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringDecoderTests.Application.class,
@@ -59,7 +56,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 	@Autowired
 	FeignContext context;
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	private int port = 0;
 
 	public SpringDecoderTests() {
@@ -155,14 +152,6 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 		assertThat(response.getBody()).as("response body was not null").isNull();
 	}
 
-	@Test
-	// Issue: https://github.com/spring-cloud/spring-cloud-openfeign/issues/456
-	public void testResponseEntityHeaders() {
-		ResponseEntity<String> response = testClient().getContentType();
-		assertThat(response.getHeaders().getContentType())
-				.isEqualTo(MediaType.APPLICATION_JSON);
-	}
-
 	protected interface TestClient {
 
 		@RequestMapping(method = RequestMethod.GET, value = "/helloresponse")
@@ -186,9 +175,6 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 		@GetMapping("/helloWildcard")
 		ResponseEntity<?> getWildcard();
 
-		@GetMapping(path = "/contentType", produces = MediaType.APPLICATION_JSON_VALUE)
-		ResponseEntity<String> getContentType();
-
 	}
 
 	public static class Hello {
@@ -276,13 +262,6 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 			return ResponseEntity.ok(new Hello("wildcard"));
 		}
 
-		@Override
-		public ResponseEntity<String> getContentType() {
-			return ResponseEntity.ok()
-					.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-					.body("test");
-		}
-
 	}
 
 }

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

@@ -1,77 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.util.Map;
-
-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.client.loadbalancer.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
-import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
-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;
-
-/**
- * @author Ryan Baxter
- */
-@RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" })
-public class SpringRetryDisabledTests {
-
-	private ConfigurableApplicationContext context;
-
-	@Before
-	public void setUp() {
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
-				.sources(RibbonAutoConfiguration.class,
-						LoadBalancerAutoConfiguration.class,
-						RibbonClientConfiguration.class,
-						FeignRibbonClientAutoConfiguration.class)
-				.run();
-	}
-
-	@After
-	public void tearDown() {
-		if (this.context != null) {
-			this.context.close();
-		}
-	}
-
-	@Test
-	public void testLoadBalancedRetryFactoryBean() throws Exception {
-		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
-				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
-		assertThat(lbFactorys.values()).hasSize(1);
-		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
-		assertThat(lb).isInstanceOf(FeignLoadBalancer.class);
-		assertThat(lb).isNotInstanceOf(RetryableFeignLoadBalancer.class);
-	}
-
-}

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

@@ -1,65 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.BeansException;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
-import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Ryan Baxter
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { RibbonAutoConfiguration.class,
-		RibbonClientConfiguration.class, LoadBalancerAutoConfiguration.class,
-		FeignRibbonClientAutoConfiguration.class, HttpClientConfiguration.class })
-public class SpringRetryEnabledTests implements ApplicationContextAware {
-
-	private ApplicationContext context;
-
-	@Test
-	public void testLoadBalancedRetryFactoryBean() throws Exception {
-		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
-				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
-		assertThat(lbFactorys.values()).hasSize(1);
-		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
-		assertThat(lb).isInstanceOf(RetryableFeignLoadBalancer.class);
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.context = context;
-	}
-
-}

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

@@ -47,15 +47,20 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Dave Syer
+ * @author Spencer Gibb
+ * @author Jakub Narloch
+ * @author Erik Kringen
+ * @author Halvdan Hoem Grelland
+ * @author Aaron Whiteside
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientTests.Application.class,
+@SpringBootTest(classes = BeansFeignClientTests.Application.class,
 		webEnvironment = WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=feignclienttest",
 				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
 @DirtiesContext
-public class FeignClientTests {
+public class BeansFeignClientTests {
 
 	@Value("${local.server.port}")
 	private int port = 0;

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

@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.beans;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-@SpringBootTest(classes = FeignClientMockBeanTests.Config.class)
-public class FeignClientMockBeanTests {
-
-	@MockBean
-	private RandomClient randomClient;
-
-	@Autowired
-	private TestService testService;
-
-	@Test
-	public void randomClientShouldBeMocked() {
-		String mockMessage = "Mocked Feign Client";
-		when(randomClient.getRandomString()).thenReturn(mockMessage);
-
-		String returnedMessage = testService.testMethod();
-
-		assertThat(returnedMessage).isEqualTo(mockMessage);
-	}
-
-	@FeignClient("random-test")
-	protected interface RandomClient {
-
-		@GetMapping("/random-test")
-		String getRandomString();
-
-	}
-
-	@Configuration
-	protected static class Config {
-
-		@Bean
-		TestService testService() {
-			return new TestService();
-		}
-
-	}
-
-}
-
-class TestService {
-
-	@Autowired
-	private FeignClientMockBeanTests.RandomClient randomClient;
-
-	public String testMethod() {
-		return randomClient.getRandomString();
-	}
-
-}

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

@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign.beans;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
+import org.springframework.cloud.openfeign.beans.BeansFeignClientTests.Hello;
 import org.springframework.context.annotation.Primary;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign.beans.extra;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
+import org.springframework.cloud.openfeign.beans.BeansFeignClientTests.Hello;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 

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

@@ -1,250 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.circuitbreaker;
-
-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.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import org.springframework.cloud.client.circuitbreaker.ConfigBuilder;
-import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.stereotype.Component;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.SocketUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-@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
-public class CircuitBreakerTests {
-
-	@Autowired
-	MyCircuitBreaker myCircuitBreaker;
-
-	@Autowired
-	TestClient testClient;
-
-	@Autowired
-	TestClientWithFactory testClientWithFactory;
-
-	@LocalServerPort
-	private int port = 0;
-
-	@BeforeAll
-	public static void beforeClass() {
-		System.setProperty("server.port",
-				String.valueOf(SocketUtils.findAvailableTcpPort()));
-	}
-
-	@AfterAll
-	public static void afterClass() {
-		System.clearProperty("server.port");
-	}
-
-	@Before
-	public void setup() {
-		this.myCircuitBreaker.clear();
-	}
-
-	@Test
-	public void testSimpleTypeWithFallback() {
-		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"));
-		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called")
-				.isTrue();
-	}
-
-	@Test
-	public void test404WithFallback() {
-		assertThat(testClient.getException()).isEqualTo("Fixed response");
-	}
-
-	@Test
-	public void testSimpleTypeWithFallbackFactory() {
-		Hello hello = testClientWithFactory.getHello();
-
-		assertThat(hello).as("hello was null").isNotNull();
-		assertThat(hello).as("first hello didn't match")
-				.isEqualTo(new Hello("hello world 1"));
-		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called")
-				.isTrue();
-	}
-
-	@Test
-	public void test404WithFallbackFactory() {
-		assertThat(testClientWithFactory.getException()).isEqualTo("Fixed response");
-	}
-
-	// tag::client_with_fallback[]
-	@FeignClient(name = "test", url = "http://localhost:${server.port}/",
-			fallback = Fallback.class)
-	protected interface TestClient {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
-		String getException();
-
-	}
-
-	@Component
-	static class Fallback implements TestClient {
-
-		@Override
-		public Hello getHello() {
-			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
-		}
-
-		@Override
-		public String getException() {
-			return "Fixed response";
-		}
-
-	}
-	// end::client_with_fallback[]
-
-	// tag::client_with_fallback_factory[]
-	@FeignClient(name = "testClientWithFactory", url = "http://localhost:${server.port}/",
-			fallbackFactory = TestFallbackFactory.class)
-	protected interface TestClientWithFactory {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
-		String getException();
-
-	}
-
-	@Component
-	static class TestFallbackFactory implements FallbackFactory<FallbackWithFactory> {
-
-		@Override
-		public FallbackWithFactory create(Throwable cause) {
-			return new FallbackWithFactory();
-		}
-
-	}
-
-	static class FallbackWithFactory implements TestClientWithFactory {
-
-		@Override
-		public Hello getHello() {
-			throw new NoFallbackAvailableException("Boom!", new RuntimeException());
-		}
-
-		@Override
-		public String getException() {
-			return "Fixed response";
-		}
-
-	}
-	// end::client_with_fallback_factory[]
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class })
-	@Import(NoSecurityConfiguration.class)
-	protected static class Application implements TestClient {
-
-		static final Log log = LogFactory.getLog(Application.class);
-
-		@Bean
-		MyCircuitBreaker myCircuitBreaker() {
-			return new MyCircuitBreaker();
-		}
-
-		@Bean
-		CircuitBreakerFactory circuitBreakerFactory(MyCircuitBreaker myCircuitBreaker) {
-			return new CircuitBreakerFactory() {
-				@Override
-				public CircuitBreaker create(String id) {
-					log.info("Creating a circuit breaker with id [" + id + "]");
-					return myCircuitBreaker;
-				}
-
-				@Override
-				protected ConfigBuilder configBuilder(String id) {
-					return Object::new;
-				}
-
-				@Override
-				public void configureDefault(Function defaultConfiguration) {
-
-				}
-			};
-		}
-
-		@Override
-		public Hello getHello() {
-			return new Hello("hello world 1");
-		}
-
-		@Override
-		public String getException() {
-			throw new IllegalStateException("BOOM!");
-		}
-
-		@Bean
-		Fallback fallback() {
-			return new Fallback();
-		}
-
-		@Bean
-		TestFallbackFactory testFallbackFactory() {
-			return new TestFallbackFactory();
-		}
-
-	}
-
-}

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

@@ -1,159 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.circuitbreaker;
-
-import java.util.function.Function;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import org.springframework.cloud.client.circuitbreaker.ConfigBuilder;
-import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.util.SocketUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * Tests for Feign calls with CircuitBreaker, without fallbacks.
- *
- * @author Olga Maciaszek-Sharma
- */
-@SpringBootTest(classes = CircuitBreakerWithNoFallbackTests.Application.class,
-		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
-		value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
-				"feign.circuitbreaker.enabled=true" })
-@DirtiesContext
-public class CircuitBreakerWithNoFallbackTests {
-
-	@Autowired
-	MyCircuitBreaker myCircuitBreaker;
-
-	@Autowired
-	CircuitBreakerTestClient testClient;
-
-	@BeforeAll
-	public static void beforeClass() {
-		System.setProperty("server.port",
-				String.valueOf(SocketUtils.findAvailableTcpPort()));
-	}
-
-	@AfterAll
-	public static void afterClass() {
-		System.clearProperty("server.port");
-	}
-
-	@BeforeEach
-	public void setup() {
-		this.myCircuitBreaker.clear();
-	}
-
-	@Test
-	public void testSimpleTypeWithFallback() {
-		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"));
-		assertThat(myCircuitBreaker.runWasCalled).as("Circuit Breaker was called")
-				.isTrue();
-	}
-
-	@Test
-	public void test404WithoutFallback() {
-		assertThatThrownBy(() -> testClient.getException())
-				.isInstanceOf(NoFallbackAvailableException.class);
-	}
-
-	@FeignClient(name = "test", url = "http://localhost:${server.port}/")
-	protected interface CircuitBreakerTestClient {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hellonotfound")
-		String getException();
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@EnableFeignClients(clients = { CircuitBreakerTestClient.class })
-	@Import(NoSecurityConfiguration.class)
-	protected static class Application implements CircuitBreakerTestClient {
-
-		static final Log log = LogFactory.getLog(Application.class);
-
-		@Bean
-		MyCircuitBreaker myCircuitBreaker() {
-			return new MyCircuitBreaker();
-		}
-
-		@Bean
-		CircuitBreakerFactory circuitBreakerFactory(MyCircuitBreaker myCircuitBreaker) {
-			return new CircuitBreakerFactory() {
-				@Override
-				public CircuitBreaker create(String id) {
-					log.info("Creating a circuit breaker with id [" + id + "]");
-					return myCircuitBreaker;
-				}
-
-				@Override
-				protected ConfigBuilder configBuilder(String id) {
-					return Object::new;
-				}
-
-				@Override
-				public void configureDefault(Function defaultConfiguration) {
-
-				}
-			};
-		}
-
-		@Override
-		public Hello getHello() {
-			return new Hello("hello world 1");
-		}
-
-		@Override
-		public String getException() {
-			throw new IllegalStateException("BOOM!");
-		}
-
-	}
-
-}

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

@@ -1,60 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.circuitbreaker;
-
-import java.util.Objects;
-
-/**
- * @author Marcin Grzejszczak
- */
-class Hello {
-
-	private String message;
-
-	public Hello() {
-	}
-
-	public Hello(String message) {
-		this.message = message;
-	}
-
-	public String getMessage() {
-		return this.message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Hello that = (Hello) o;
-		return Objects.equals(this.message, that.message);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(this.message);
-	}
-
-}

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

@@ -1,59 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.circuitbreaker;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
-import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
-
-/**
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- */
-class MyCircuitBreaker implements CircuitBreaker {
-
-	AtomicBoolean runWasCalled = new AtomicBoolean();
-
-	@Override
-	public <T> T run(Supplier<T> toRun) {
-		try {
-			this.runWasCalled.set(true);
-			return toRun.get();
-		}
-		catch (Throwable throwable) {
-			throw new NoFallbackAvailableException("No fallback available.", throwable);
-		}
-	}
-
-	@Override
-	public <T> T run(Supplier<T> toRun, Function<Throwable, T> fallback) {
-		try {
-			return run(toRun);
-		}
-		catch (Throwable throwable) {
-			return fallback.apply(throwable);
-		}
-	}
-
-	public void clear() {
-		this.runWasCalled.set(false);
-	}
-
-}

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

@@ -16,20 +16,17 @@
 
 package org.springframework.cloud.openfeign.encoding;
 
-import java.util.Collections;
 import java.util.List;
 
-import com.netflix.loadbalancer.BaseLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -37,6 +34,7 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -75,7 +73,7 @@ public class FeignAcceptEncodingTests {
 	}
 
 	@EnableFeignClients(clients = InvoiceClient.class)
-	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
@@ -84,17 +82,15 @@ public class FeignAcceptEncodingTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	static class LocalRibbonClientConfiguration {
+	static class LocalClientConfiguration {
 
-		@Value("${local.server.port}")
+		@LocalServerPort
 		private int port = 0;
 
 		@Bean
-		public ILoadBalancer ribbonLoadBalancer() {
-			BaseLoadBalancer balancer = new BaseLoadBalancer();
-			balancer.setServersList(
-					Collections.singletonList(new Server("localhost", this.port)));
-			return balancer;
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
+				Environment env) {
+			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
 		}
 
 	}

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

@@ -16,20 +16,17 @@
 
 package org.springframework.cloud.openfeign.encoding;
 
-import java.util.Collections;
 import java.util.List;
 
-import com.netflix.loadbalancer.BaseLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -37,6 +34,7 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -79,7 +77,7 @@ public class FeignContentEncodingTests {
 	}
 
 	@EnableFeignClients(clients = InvoiceClient.class)
-	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
@@ -88,17 +86,15 @@ public class FeignContentEncodingTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	static class LocalRibbonClientConfiguration {
+	static class LocalClientConfiguration {
 
-		@Value("${local.server.port}")
+		@LocalServerPort
 		private int port = 0;
 
 		@Bean
-		public ILoadBalancer ribbonLoadBalancer() {
-			BaseLoadBalancer balancer = new BaseLoadBalancer();
-			balancer.setServersList(
-					Collections.singletonList(new Server("localhost", this.port)));
-			return balancer;
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
+				Environment env) {
+			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
 		}
 
 	}

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

@@ -16,29 +16,27 @@
 
 package org.springframework.cloud.openfeign.encoding;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
-import com.netflix.loadbalancer.BaseLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -55,12 +53,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * Tests the pagination encoding.
  *
  * @author Charlie Mordant.
- * @author Hyeonmin Park
  */
 @SpringBootTest(classes = FeignPageableEncodingTests.Application.class,
 		webEnvironment = RANDOM_PORT,
 		value = { "feign.compression.request.enabled=true",
-				"feign.autoconfiguration.jackson.enabled=true",
 				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
 				"ribbon.OkToRetryOnAllOperations=false" })
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -95,89 +91,27 @@ public class FeignPageableEncodingTests {
 
 	}
 
-	@Test
-	public void testPageableWithDescDirection() {
-		// given
-		Pageable pageable = PageRequest.of(0, 10, Sort.Direction.DESC, "sortProperty");
-
-		// when
-		final ResponseEntity<Page<Invoice>> response = this.invoiceClient
-				.getInvoicesPaged(pageable);
-
-		// then
-		assertThat(response).isNotNull();
-		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(response.getBody()).isNotNull();
-		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
-
-		Sort sort = response.getBody().getPageable().getSort();
-		assertThat(sort).hasSize(1);
-		assertThat(sort.get()).hasSize(1);
-
-		Optional<Sort.Order> optionalOrder = sort.get().findFirst();
-		assertThat(optionalOrder.isPresent()).isTrue();
-
-		Sort.Order order = optionalOrder.get();
-		assertThat(order.getDirection()).isEqualTo(Sort.Direction.DESC);
-		assertThat(order.getProperty()).isEqualTo("sortProperty");
-
-	}
-
-	@Test
-	public void testPageableWithMultipleSort() {
-		// given
-		Pageable pageable = PageRequest.of(0, 10, Sort
-				.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2")));
-
-		// when
-		final ResponseEntity<Page<Invoice>> response = this.invoiceClient
-				.getInvoicesPaged(pageable);
-
-		// then
-		assertThat(response).isNotNull();
-		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(response.getBody()).isNotNull();
-		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
-
-		Sort sort = response.getBody().getPageable().getSort();
-		assertThat(sort).hasSize(2);
-
-		List<Sort.Order> orderList = sort.toList();
-		assertThat(orderList).hasSize(2);
-
-		Sort.Order firstOrder = orderList.get(0);
-		assertThat(firstOrder.getDirection()).isEqualTo(Sort.Direction.DESC);
-		assertThat(firstOrder.getProperty()).isEqualTo("sortProperty1");
-
-		Sort.Order secondOrder = orderList.get(1);
-		assertThat(secondOrder.getDirection()).isEqualTo(Sort.Direction.ASC);
-		assertThat(secondOrder.getProperty()).isEqualTo("sortProperty2");
-
-	}
-
 	@EnableFeignClients(clients = InvoiceClient.class)
-	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
+	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
 			exclude = { RepositoryRestMvcAutoConfiguration.class })
 	@EnableSpringDataWebSupport
-	@Import({ NoSecurityConfiguration.class })
+	@Import({ NoSecurityConfiguration.class, FeignClientsConfiguration.class })
 	public static class Application {
 
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	static class LocalRibbonClientConfiguration {
+	static class LocalClientConfiguration {
 
-		@Value("${local.server.port}")
+		@LocalServerPort
 		private int port = 0;
 
 		@Bean
-		public ILoadBalancer ribbonLoadBalancer() {
-			BaseLoadBalancer balancer = new BaseLoadBalancer();
-			balancer.setServersList(
-					Collections.singletonList(new Server("localhost", this.port)));
-			return balancer;
+		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
+				Environment env) {
+			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
 		}
 
 	}

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

@@ -1,28 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.feignclientsregistrar;
-
-import org.springframework.cloud.openfeign.FeignClient;
-
-/**
- * @author Michal Domagala
- */
-
-@FeignClient("top-level")
-public interface TopLevelClient {
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java

@@ -1,28 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.feignclientsregistrar.sub;
-
-import org.springframework.cloud.openfeign.FeignClient;
-
-/**
- * @author Michal Domagala
- */
-
-@FeignClient("sub-level")
-public interface SubLevelClient {
-
-}

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

@@ -18,10 +18,14 @@ package org.springframework.cloud.openfeign.hateoas.app;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.env.Environment;
 
 /**
  * Test HATEOAS application.
@@ -29,11 +33,26 @@ import org.springframework.context.annotation.Import;
  * @author Hector Espert
  */
 @EnableFeignClients(clients = FeignHalClient.class)
-@RibbonClient(name = "local", configuration = FeignHalRibbonConfiguration.class)
 @SpringBootApplication(
 		scanBasePackages = "org.springframework.cloud.openfeign.hateoas.app",
 		exclude = RepositoryRestMvcAutoConfiguration.class)
+@LoadBalancerClient(name = "local", configuration = LocalHalClientConfiguration.class)
 @Import(NoSecurityConfiguration.class)
 public class FeignHalApplication {
 
+	// Load balancer with fixed server list for "local" pointing to localhost
+
+}
+
+class LocalHalClientConfiguration {
+
+	@LocalServerPort
+	private int port = 0;
+
+	@Bean
+	public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
+			Environment env) {
+		return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+	}
+
 }

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

@@ -16,14 +16,7 @@
 
 package org.springframework.cloud.openfeign.hateoas.app;
 
-import java.util.Collections;
-
-import com.netflix.loadbalancer.BaseLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 
 /**
  * @author Hector Espert
@@ -33,12 +26,4 @@ public class FeignHalRibbonConfiguration {
 	@Value("${local.server.port}")
 	private int serverPort = 0;
 
-	@Bean
-	public ILoadBalancer ribbonLoadBalancer() {
-		Server server = new Server("localhost", serverPort);
-		BaseLoadBalancer balancer = new BaseLoadBalancer();
-		balancer.setServersList(Collections.singletonList(server));
-		return balancer;
-	}
-
 }

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

@@ -1,60 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
-import org.springframework.cloud.openfeign.hystrix.security.app.ProxyUsernameController;
-import org.springframework.cloud.openfeign.hystrix.security.app.TestInterceptor;
-import org.springframework.cloud.openfeign.hystrix.security.app.UsernameClient;
-import org.springframework.cloud.openfeign.hystrix.security.app.UsernameController;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Daniel Lavoie
- */
-@Configuration(proxyBeanMethods = false)
-@EnableAutoConfiguration
-@EnableFeignClients(clients = UsernameClient.class)
-@Import(NoSecurityConfiguration.class)
-public class HystrixSecurityApplication {
-
-	@Bean
-	public CustomConcurrenyStrategy customConcurrenyStrategy() {
-		return new CustomConcurrenyStrategy();
-	}
-
-	@Bean
-	public TestInterceptor testInterceptor() {
-		return new TestInterceptor();
-	}
-
-	@Bean
-	public ProxyUsernameController proxyUsernameController() {
-		return new ProxyUsernameController();
-	}
-
-	@Bean
-	public UsernameController usernameController() {
-		return new UsernameController();
-	}
-
-}

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

@@ -1,134 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security;
-
-import java.util.Base64;
-
-import com.netflix.hystrix.strategy.HystrixPlugins;
-import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurrencyStrategy;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.netflix.ribbon.StaticServerList;
-import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.client.RestTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests that a secured web service returning values using a feign client properly access
- * the security context from a hystrix command.
- *
- * @author Daniel Lavoie
- */
-@RunWith(SpringRunner.class)
-@DirtiesContext
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
-		properties = { "feign.hystrix.enabled=true" })
-@ActiveProfiles("proxysecurity")
-public class HystrixSecurityTests {
-
-	@Autowired
-	private CustomConcurrenyStrategy customConcurrenyStrategy;
-
-	@LocalServerPort
-	private String serverPort;
-
-	// TODO: move to constants in TestAutoConfiguration
-	private String username = "user";
-
-	private String password = "password";
-
-	public static HttpHeaders createBasicAuthHeader(final String username,
-			final String password) {
-		return new HttpHeaders() {
-			private static final long serialVersionUID = 1766341693637204893L;
-
-			{
-				String auth = username + ":" + password;
-				byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes());
-				String authHeader = "Basic " + new String(encodedAuth);
-				this.set("Authorization", authHeader);
-			}
-		};
-	}
-
-	@Test
-	public void testSecurityConcurrencyStrategyInstalled() {
-		HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance()
-				.getConcurrencyStrategy();
-		assertThat(concurrencyStrategy)
-				.isInstanceOf(SecurityContextConcurrencyStrategy.class);
-	}
-
-	@Test
-	public void testFeignHystrixSecurity() {
-		HttpHeaders headers = createBasicAuthHeader(this.username, this.password);
-
-		ResponseEntity<String> entity = new RestTemplate().exchange(
-				"http://localhost:" + this.serverPort + "/proxy-username", HttpMethod.GET,
-				new HttpEntity<Void>(headers), String.class);
-
-		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-
-		assertThat(entity.getBody())
-				.as("Username should have been intercepted by feign interceptor.")
-				.isEqualTo(this.username);
-
-		assertThat(this.customConcurrenyStrategy.isHookCalled())
-				.as("Custom hook should have been called.").isTrue();
-	}
-
-	@SpringBootConfiguration
-	@Import(HystrixSecurityApplication.class)
-	@RibbonClient(name = "username", configuration = LocalRibbonClientConfiguration.class)
-	protected static class TestConfig {
-
-	}
-
-	protected static class LocalRibbonClientConfiguration {
-
-		@LocalServerPort
-		private int port = 0;
-
-		@Bean
-		public ServerList<Server> ribbonServerList() {
-			return new StaticServerList<>(new Server("localhost", this.port));
-		}
-
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security.app;
-
-import java.util.concurrent.Callable;
-
-import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
-
-public class CustomConcurrenyStrategy extends HystrixConcurrencyStrategy {
-
-	private boolean hookCalled;
-
-	@Override
-	public <T> Callable<T> wrapCallable(Callable<T> callable) {
-		this.hookCalled = true;
-
-		return super.wrapCallable(callable);
-	}
-
-	public boolean isHookCalled() {
-		return this.hookCalled;
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/ProxyUsernameController.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security.app;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Daniel Lavoie
- */
-@RestController
-@RequestMapping("/proxy-username")
-public class ProxyUsernameController {
-
-	@Autowired
-	private UsernameClient usernameClient;
-
-	@RequestMapping
-	public String getUsername() {
-		return this.usernameClient.getUsername();
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java

@@ -1,40 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security.app;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * This interceptor should be called from an Hyxtrix command execution thread. It is
- * access the SecurityContext and settings an http header from the authentication details.
- *
- * @author Daniel Lavoie
- */
-public class TestInterceptor implements RequestInterceptor {
-
-	@Override
-	public void apply(RequestTemplate template) {
-		if (SecurityContextHolder.getContext().getAuthentication() != null) {
-			template.header("username",
-					SecurityContextHolder.getContext().getAuthentication().getName());
-		}
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameClient.java

@@ -1,31 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security.app;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author Daniel Lavoie
- */
-@FeignClient("username")
-public interface UsernameClient {
-
-	@RequestMapping("/username")
-	String getUsername();
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameController.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.hystrix.security.app;
-
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Daniel Lavoie
- */
-@RestController
-@RequestMapping("/username")
-public class UsernameController {
-
-	@RequestMapping
-	public String getUsername(@RequestHeader String username) {
-		return username;
-	}
-
-}

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

@@ -16,22 +16,16 @@
 
 package org.springframework.cloud.openfeign.invalid;
 
-import feign.Feign;
-import feign.hystrix.FallbackFactory;
-import feign.hystrix.HystrixFeign;
 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;
-import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 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.web.bind.annotation.RequestMapping;
@@ -50,9 +44,7 @@ public class FeignClientValidationTests {
 	@Test
 	public void testServiceIdAndValue() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				LoadBalancerAutoConfiguration.class, RibbonAutoConfiguration.class,
-				FeignRibbonClientAutoConfiguration.class,
-				NameAndServiceIdConfiguration.class);
+				LoadBalancerAutoConfiguration.class, NameAndServiceIdConfiguration.class);
 		assertThat(context.getBean(NameAndServiceIdConfiguration.Client.class))
 				.isNotNull();
 		context.close();
@@ -63,7 +55,6 @@ public class FeignClientValidationTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.setAllowBeanDefinitionOverriding(false);
 		context.register(LoadBalancerAutoConfiguration.class,
-				RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class,
 				DuplicatedFeignClientNamesConfiguration.class);
 		context.refresh();
 		assertThat(
@@ -81,47 +72,6 @@ public class FeignClientValidationTests {
 		new AnnotationConfigApplicationContext(BadHostnameConfiguration.class);
 	}
 
-	@Test
-	public void testMissingFallback() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				MissingFallbackConfiguration.class)) {
-			this.expected.expectMessage("No fallback instance of type");
-			assertThat(context.getBean(MissingFallbackConfiguration.Client.class))
-					.isNotNull();
-		}
-	}
-
-	@Test
-	public void testWrongFallbackType() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				WrongFallbackTypeConfiguration.class)) {
-			this.expected.expectMessage("Incompatible fallback instance");
-			assertThat(context.getBean(WrongFallbackTypeConfiguration.Client.class))
-					.isNotNull();
-		}
-	}
-
-	@Test
-	public void testMissingFallbackFactory() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				MissingFallbackFactoryConfiguration.class)) {
-			this.expected.expectMessage("No fallbackFactory instance of type");
-			assertThat(context.getBean(MissingFallbackFactoryConfiguration.Client.class))
-					.isNotNull();
-		}
-	}
-
-	@Test
-	public void testWrongFallbackFactoryType() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				WrongFallbackFactoryTypeConfiguration.class)) {
-			this.expected.expectMessage("Incompatible fallbackFactory instance");
-			assertThat(
-					context.getBean(WrongFallbackFactoryTypeConfiguration.Client.class))
-							.isNotNull();
-		}
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
@@ -177,123 +127,4 @@ public class FeignClientValidationTests {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = MissingFallbackConfiguration.Client.class)
-	protected static class MissingFallbackConfiguration {
-
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
-		@FeignClient(name = "foobar", url = "http://localhost",
-				fallback = ClientFallback.class)
-		interface Client {
-
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-
-		}
-
-		class ClientFallback implements Client {
-
-			@Override
-			public String get() {
-				return null;
-			}
-
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = WrongFallbackTypeConfiguration.Client.class)
-	protected static class WrongFallbackTypeConfiguration {
-
-		@Bean
-		Dummy dummy() {
-			return new Dummy();
-		}
-
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
-		@FeignClient(name = "foobar", url = "http://localhost", fallback = Dummy.class)
-		interface Client {
-
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-
-		}
-
-		class Dummy {
-
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = MissingFallbackFactoryConfiguration.Client.class)
-	protected static class MissingFallbackFactoryConfiguration {
-
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
-		@FeignClient(name = "foobar", url = "http://localhost",
-				fallbackFactory = ClientFallback.class)
-		interface Client {
-
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-
-		}
-
-		class ClientFallback implements FallbackFactory<Client> {
-
-			@Override
-			public Client create(Throwable cause) {
-				return null;
-			}
-
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = WrongFallbackFactoryTypeConfiguration.Client.class)
-	protected static class WrongFallbackFactoryTypeConfiguration {
-
-		@Bean
-		Dummy dummy() {
-			return new Dummy();
-		}
-
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
-		@FeignClient(name = "foobar", url = "http://localhost",
-				fallbackFactory = Dummy.class)
-		interface Client {
-
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-
-		}
-
-		class Dummy {
-
-		}
-
-	}
-
 }

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

@@ -21,7 +21,7 @@ import java.util.Map;
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -29,9 +29,6 @@ import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,86 +36,38 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Olga Maciaszek-Sharma
  */
-class FeignLoadBalancerAutoConfigurationTests {
+public class FeignLoadBalancerAutoConfigurationTests {
 
 	@Test
-	void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
+	public void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
 		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
-				"feign.httpclient.enabled=false",
-				"spring.cloud.loadbalancer.retry.enabled=false");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, Client.Default.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
-	}
-
-	@Test
-	void shouldInstantiateHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
-				"spring.cloud.loadbalancer.retry.enabled=false");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, ApacheHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
-	}
-
-	@Test
-	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true",
-				"spring.cloud.loadbalancer.retry.enabled=false");
-		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalanced(context, OkHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
-	}
-
-	@Test
-	void shouldInstantiateRetryableDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
 				"feign.httpclient.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalancedWithRetries(context, Client.Default.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
+		assertLoadBalanced(context, Client.Default.class);
 	}
 
 	@Test
-	void shouldInstantiateRetryableHttpFeignClientWhenEnabled() {
+	public void shouldInstantiateHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext(
 				"spring.cloud.loadbalancer.ribbon.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalancedWithRetries(context, ApacheHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
+		assertLoadBalanced(context, ApacheHttpClient.class);
 	}
 
 	@Test
-	void shouldInstantiateRetryableOkHttpFeignClientWhenEnabled() {
+	public void shouldInstantiateOkHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
-		assertLoadBalancedWithRetries(context, OkHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
-	}
-
-	@Test
-	void shouldNotProcessLoadBalancerConfigurationWhenRibbonEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=true",
-				"spring.cloud.loadbalancer.retry.enabled=false");
-		assertThatOneBeanPresent(context, LoadBalancerFeignClient.class);
-		assertThatBeanNotPresent(context, BlockingLoadBalancerClient.class);
-		assertThatBeanNotPresent(context, FeignBlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, OkHttpClient.class);
 	}
 
 	private ConfigurableApplicationContext initContext(String... properties) {
 		return new SpringApplicationBuilder().web(WebApplicationType.NONE)
 				.properties(properties)
-				.sources(HttpClientConfiguration.class, RibbonAutoConfiguration.class,
+				.sources(HttpClientConfiguration.class,
 						LoadBalancerAutoConfiguration.class,
 						BlockingLoadBalancerClientAutoConfiguration.class,
-						FeignRibbonClientAutoConfiguration.class,
 						FeignLoadBalancerAutoConfiguration.class)
 				.run();
 	}
@@ -126,33 +75,15 @@ class FeignLoadBalancerAutoConfigurationTests {
 	private void assertThatOneBeanPresent(ConfigurableApplicationContext context,
 			Class<?> beanClass) {
 		Map<String, ?> beans = context.getBeansOfType(beanClass);
-		assertThat(beans).hasSize(1);
+		assertThat(beans).as("Missing bean of type %s", beanClass).hasSize(1);
 	}
 
 	private void assertLoadBalanced(ConfigurableApplicationContext context,
 			Class delegateClass) {
 		Map<String, FeignBlockingLoadBalancerClient> beans = context
 				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans).as("Missing bean of type %s", delegateClass).hasSize(1);
 		assertThat(beans.get("feignClient").getDelegate()).isInstanceOf(delegateClass);
 	}
 
-	private void assertLoadBalancedWithRetries(ConfigurableApplicationContext context,
-			Class delegateClass) {
-		Map<String, RetryableFeignBlockingLoadBalancerClient> retryableBeans = context
-				.getBeansOfType(RetryableFeignBlockingLoadBalancerClient.class);
-		assertThat(retryableBeans).hasSize(1);
-		Map<String, FeignBlockingLoadBalancerClient> beans = context
-				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
-		assertThat(beans).isEmpty();
-		assertThat(retryableBeans.get("feignRetryClient").getDelegate())
-				.isInstanceOf(delegateClass);
-	}
-
-	private void assertThatBeanNotPresent(ConfigurableApplicationContext context,
-			Class<?> beanClass) {
-		Map<String, ?> beans = context.getBeansOfType(beanClass);
-		assertThat(beans).isEmpty();
-	}
-
 }

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

@@ -1,197 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.loadbalancer;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-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;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerRetryProperties;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.cloud.loadbalancer.blocking.retry.BlockingLoadBalancedRetryPolicy;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link RetryableFeignBlockingLoadBalancerClient}. Note: the underlying
- * {@link BlockingLoadBalancerClient} is already extensively tested in the Spring Cloud
- * Commons project, so here we are only testing the interactions between
- * {@link RetryableFeignBlockingLoadBalancerClient} and its delegates.
- *
- * @see <a href=
- * "https://github.com/spring-cloud/spring-cloud-commons/blob/master/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 Client delegate = mock(Client.class);
-
-	private LoadBalancedRetryFactory retryFactory = mock(LoadBalancedRetryFactory.class);
-
-	private BlockingLoadBalancerClient loadBalancerClient = mock(
-			BlockingLoadBalancerClient.class);
-
-	private LoadBalancerRetryProperties properties = new LoadBalancerRetryProperties();
-
-	private RetryableFeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableFeignBlockingLoadBalancerClient(
-			delegate, loadBalancerClient, retryFactory);
-
-	private ServiceInstance serviceInstance = new DefaultServiceInstance("test-a", "test",
-			"testhost", 80, false);
-
-	@BeforeEach
-	void setUp() {
-		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-						loadBalancerClient, properties));
-		when(loadBalancerClient.choose("test")).thenReturn(serviceInstance);
-	}
-
-	@Test
-	void shouldExtractServiceIdFromRequestUrl() throws IOException {
-		Request request = testRequest();
-		Response response = testResponse(200);
-		when(delegate.execute(any(), any())).thenReturn(response);
-		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-						loadBalancerClient, properties));
-		when(loadBalancerClient.reconstructURI(serviceInstance,
-				URI.create("http://test/path")))
-						.thenReturn(URI.create("http://testhost:80/path"));
-
-		feignBlockingLoadBalancerClient.execute(request, new Request.Options());
-
-		verify(loadBalancerClient).choose("test");
-		verify(loadBalancerClient).reconstructURI(serviceInstance,
-				URI.create("http://test/path"));
-
-		verify(delegate).execute(argThat((Request actualRequest) -> actualRequest.url()
-				.equals("http://testhost:80/path")), any());
-	}
-
-	private Response testResponse(int status) {
-		return Response.builder().request(testRequest()).status(status).build();
-	}
-
-	@Test
-	void shouldExecuteOriginalRequestIfInstanceNotFound() throws IOException {
-		Request request = testRequest();
-		Response response = testResponse(503);
-		when(loadBalancerClient.choose("test")).thenReturn(null);
-		when(delegate.execute(any(), any())).thenReturn(response);
-		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-						loadBalancerClient, properties));
-
-		feignBlockingLoadBalancerClient.execute(request, new Request.Options());
-
-		verify(delegate).execute(eq(request), any());
-	}
-
-	@Test
-	void shouldRetryOnRepeatableStatusCode() throws IOException {
-		properties.getRetryableStatusCodes().add(503);
-		Request request = testRequest();
-		Response response = testResponse(503);
-		when(delegate.execute(any(), any())).thenReturn(response);
-		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-						loadBalancerClient, properties));
-		when(loadBalancerClient.reconstructURI(serviceInstance,
-				URI.create("http://test/path")))
-						.thenReturn(URI.create("http://testhost:80/path"));
-
-		feignBlockingLoadBalancerClient.execute(request, new Request.Options());
-
-		verify(loadBalancerClient, times(2)).reconstructURI(serviceInstance,
-				URI.create("http://test/path"));
-		verify(delegate, times(2)).execute(any(), any());
-	}
-
-	@Test
-	void shouldPassCorrectRequestToDelegate() throws IOException {
-		Request request = testRequest();
-		Request.Options options = new Request.Options();
-		String url = "http://127.0.0.1/path";
-		ServiceInstance serviceInstance = new DefaultServiceInstance("test-1", "test",
-				"test-host", 8888, false);
-		when(loadBalancerClient.choose("test")).thenReturn(serviceInstance);
-		when(loadBalancerClient.reconstructURI(serviceInstance,
-				URI.create("http://test/path"))).thenReturn(URI.create(url));
-		Response response = testResponse(200);
-		when(delegate.execute(any(), any())).thenReturn(response);
-		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-						loadBalancerClient, properties));
-
-		feignBlockingLoadBalancerClient.execute(request, options);
-
-		ArgumentCaptor<Request> captor = ArgumentCaptor.forClass(Request.class);
-		verify(delegate, times(1)).execute(captor.capture(), eq(options));
-		Request actualRequest = captor.getValue();
-		assertThat(actualRequest.httpMethod()).isEqualTo(Request.HttpMethod.GET);
-		assertThat(actualRequest.url()).isEqualTo(url);
-		assertThat(actualRequest.headers()).hasSize(1);
-		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
-				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		assertThat(new String(actualRequest.body())).isEqualTo("hello");
-	}
-
-	private Request testRequest() {
-		return testRequest("test");
-	}
-
-	private Request testRequest(String host) {
-		return Request.create(Request.HttpMethod.GET, "http://" + host + "/path",
-				testHeaders(), "hello".getBytes(), StandardCharsets.UTF_8, null);
-	}
-
-	private Map<String, Collection<String>> testHeaders() {
-		Map<String, Collection<String>> feignHeaders = new HashMap<>();
-		feignHeaders.put(HttpHeaders.CONTENT_TYPE,
-				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		return feignHeaders;
-
-	}
-
-}

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

@@ -1,106 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Spencer Gibb
- */
-public class CachingSpringLoadBalancerFactoryTests {
-
-	@Mock
-	private SpringClientFactory delegate;
-
-	@Mock
-	private RibbonLoadBalancedRetryFactory loadBalancedRetryFactory;
-
-	private CachingSpringLoadBalancerFactory factory;
-
-	@Before
-	public void init() {
-		MockitoAnnotations.initMocks(this);
-
-		IClientConfig config = new DefaultClientConfigImpl();
-		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
-		config.set(CommonClientConfigKey.ReadTimeout, 500);
-
-		when(this.delegate.getClientConfig("client1")).thenReturn(config);
-		when(this.delegate.getClientConfig("client2")).thenReturn(config);
-
-		this.factory = new CachingSpringLoadBalancerFactory(this.delegate,
-				this.loadBalancedRetryFactory);
-	}
-
-	@Test
-	public void delegateCreatesWhenMissing() {
-		FeignLoadBalancer client = this.factory.create("client1");
-		assertThat(client).as("client was null").isNotNull();
-
-		verify(this.delegate, times(1)).getClientConfig("client1");
-	}
-
-	@Test
-	public void cacheWorks() {
-		FeignLoadBalancer client = this.factory.create("client2");
-		assertThat(client).as("client was null").isNotNull();
-
-		client = this.factory.create("client2");
-		assertThat(client).as("client was null").isNotNull();
-
-		verify(this.delegate, times(1)).getClientConfig("client2");
-	}
-
-	@Test
-	public void delegateCreatesWithNoRetry() {
-		IClientConfig config = new DefaultClientConfigImpl();
-		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
-		config.set(CommonClientConfigKey.ReadTimeout, 500);
-		when(this.delegate.getClientConfig("retry")).thenReturn(config);
-		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
-				this.delegate);
-		FeignLoadBalancer client = this.factory.create("retry");
-		assertThat(client).as("client was null").isNotNull();
-	}
-
-	@Test
-	public void delegateCreatesWithRetry() {
-		IClientConfig config = new DefaultClientConfigImpl();
-		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
-		config.set(CommonClientConfigKey.ReadTimeout, 500);
-		when(this.delegate.getClientConfig("retry")).thenReturn(config);
-		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
-				this.delegate, this.loadBalancedRetryFactory);
-		FeignLoadBalancer client = this.factory.create("retry");
-		assertThat(client).as("client was null").isNotNull();
-	}
-
-}

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

@@ -1,209 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.BaseLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.RoundRobinRule;
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
-import feign.Client;
-import feign.Request;
-import feign.Request.Options;
-import feign.RequestTemplate;
-import feign.Response;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonRequest;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonResponse;
-
-import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
-import static com.netflix.client.config.CommonClientConfigKey.IsSecure;
-import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
-import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
-import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOperations;
-import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
-import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
-import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
-import static feign.Request.HttpMethod.GET;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-public class FeignLoadBalancerTests {
-
-	@Mock
-	private Client delegate;
-
-	@Mock
-	private ILoadBalancer lb;
-
-	@Mock
-	private IClientConfig config;
-
-	private FeignLoadBalancer feignLoadBalancer;
-
-	private ServerIntrospector inspector = new DefaultServerIntrospector();
-
-	private Integer defaultConnectTimeout = 10000;
-
-	private Integer defaultReadTimeout = 10000;
-
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
-		when(this.config.get(MaxAutoRetries, DEFAULT_MAX_AUTO_RETRIES)).thenReturn(1);
-		when(this.config.get(MaxAutoRetriesNextServer,
-				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(1);
-		when(this.config.get(OkToRetryOnAllOperations, eq(anyBoolean())))
-				.thenReturn(true);
-		when(this.config.get(ConnectTimeout)).thenReturn(this.defaultConnectTimeout);
-		when(this.config.get(ReadTimeout)).thenReturn(this.defaultReadTimeout);
-		when(this.config.get(OkToRetryOnAllOperations, false)).thenReturn(true);
-	}
-
-	@Test
-	public void testUriInsecure() throws Exception {
-		when(this.config.get(IsSecure)).thenReturn(false);
-
-		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
-				this.inspector);
-		Request request = new RequestTemplate().method(GET).target("https://foo/")
-				.resolve(new HashMap<>()).request();
-		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
-				new URI(request.url()));
-
-		Response response = Response.builder().request(request).status(200).reason("Test")
-				.headers(Collections.emptyMap()).body(new byte[0]).build();
-		when(this.delegate.execute(any(Request.class), any(Options.class)))
-				.thenReturn(response);
-
-		RibbonResponse resp = this.feignLoadBalancer.execute(ribbonRequest, null);
-
-		assertThat(resp.getRequestedURI()).isEqualTo(new URI("https://foo"));
-	}
-
-	@Test
-	public void testSecureUriFromClientConfig() throws Exception {
-		when(this.config.get(IsSecure)).thenReturn(true);
-		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
-				this.inspector);
-		Server server = new Server("foo", 7777);
-		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("https://foo/"));
-		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
-	}
-
-	@Test
-	public void testInsecureUriFromInsecureClientConfigToSecureServerIntrospector()
-			throws Exception {
-		when(this.config.get(IsSecure)).thenReturn(false);
-		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
-				new ServerIntrospector() {
-					@Override
-					public boolean isSecure(Server server) {
-						return true;
-					}
-
-					@Override
-					public Map<String, String> getMetadata(Server server) {
-						return null;
-					}
-				});
-		Server server = new Server("foo", 7777);
-		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("https://foo/"));
-		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
-	}
-
-	@Test
-	public void testSecureUriFromClientConfigOverride() throws Exception {
-		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
-				this.inspector);
-		Server server = Mockito.mock(Server.class);
-		when(server.getPort()).thenReturn(443);
-		when(server.getHost()).thenReturn("foo");
-		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("https://bar/"));
-		assertThat(uri).isEqualTo(new URI("https://foo:443/"));
-	}
-
-	@Test
-	public void testRibbonRequestURLEncode() throws Exception {
-		String url = "https://foo/?name=%7bcookie"; // name={cookie
-		Request request = Request.create(GET, url, new HashMap<>(), null, null, null);
-
-		assertThat(request.url()).isEqualTo(url);
-
-		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
-				new URI(request.url()));
-
-		Request cloneRequest = ribbonRequest.toRequest();
-
-		assertThat(cloneRequest.url()).isEqualTo(url);
-
-	}
-
-	@Test
-	public void testOverrideFeignLoadBalancer() throws Exception {
-		when(this.config.get(IsSecure)).thenReturn(false);
-		Server server1 = new Server("foo", 6666);
-		Server server2 = new Server("foo", 7777);
-		BaseLoadBalancer baseLoadBalancer = new BaseLoadBalancer();
-		baseLoadBalancer.setRule(new RoundRobinRule() {
-			@Override
-			public Server choose(Object loadBalancerKey) {
-				return loadBalancerKey == null ? server2 : server1;
-			}
-		});
-
-		this.feignLoadBalancer = new FeignLoadBalancer(baseLoadBalancer, this.config,
-				this.inspector) {
-			protected void customizeLoadBalancerCommandBuilder(
-					final FeignLoadBalancer.RibbonRequest request,
-					final IClientConfig config,
-					final LoadBalancerCommand.Builder<FeignLoadBalancer.RibbonResponse> builder) {
-				builder.withServerLocator(request.getRequest().headers().get("c_ip"));
-			}
-		};
-		Request request = new RequestTemplate().method(GET).resolve(new HashMap<>())
-				.request();
-		RibbonResponse resp = this.feignLoadBalancer.executeWithLoadBalancer(
-				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
-		assertThat(resp.getRequestedURI().getPort()).isEqualTo(7777);
-		request = new RequestTemplate().method(GET).header("c_ip", "666")
-				.resolve(new HashMap<>()).request();
-		resp = this.feignLoadBalancer.executeWithLoadBalancer(
-				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
-		assertThat(resp.getRequestedURI().getPort()).isEqualTo(6666);
-	}
-
-}

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

@@ -1,193 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.ribbon.RibbonClients;
-import org.springframework.cloud.netflix.ribbon.StaticServerList;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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 Venil Noronha
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignribbonclientpathtest",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
-				"feign.hystrix.enabled=false", "test.path.prefix=/base/path" // For
-																				// pathWithPlaceholder
-																				// test
-		})
-@DirtiesContext
-public class FeignRibbonClientPathTests {
-
-	@Value("${local.server.port}")
-	private int port = 0;
-
-	@Autowired
-	private TestClient1 testClient1;
-
-	@Autowired
-	private TestClient2 testClient2;
-
-	@Autowired
-	private TestClient3 testClient3;
-
-	@Autowired
-	private TestClient4 testClient4;
-
-	@Autowired
-	private TestClient5 testClient5;
-
-	@Test
-	public void pathWithLeadingButNotTrailingSlash() {
-		testClientPath(this.testClient1);
-	}
-
-	@Test
-	public void pathWithoutLeadingAndTrailingSlash() {
-		testClientPath(this.testClient2);
-	}
-
-	@Test
-	public void pathWithoutLeadingButTrailingSlash() {
-		testClientPath(this.testClient3);
-	}
-
-	@Test
-	public void pathWithLeadingAndTrailingSlash() {
-		testClientPath(this.testClient4);
-	}
-
-	@Test
-	public void pathWithPlaceholder() {
-		testClientPath(this.testClient5);
-	}
-
-	private void testClientPath(TestClient testClient) {
-		Hello hello = testClient.getHello();
-		assertThat(hello).as("Object returned was null").isNotNull();
-		assertThat(hello.getMessage()).as("Response object value didn't match")
-				.isEqualTo("hello world");
-	}
-
-	protected interface TestClient {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-	}
-
-	@FeignClient(name = "localapp", path = "/base/path")
-	protected interface TestClient1 extends TestClient {
-
-	}
-
-	@FeignClient(name = "localapp1", path = "base/path")
-	protected interface TestClient2 extends TestClient {
-
-	}
-
-	@FeignClient(name = "localapp2", path = "base/path/")
-	protected interface TestClient3 extends TestClient {
-
-	}
-
-	@FeignClient(name = "localapp3", path = "/base/path/")
-	protected interface TestClient4 extends TestClient {
-
-	}
-
-	@FeignClient(name = "localapp4", path = "${test.path.prefix}")
-	protected interface TestClient5 extends TestClient {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@RequestMapping("/base/path")
-	@EnableFeignClients(clients = { TestClient1.class, TestClient2.class,
-			TestClient3.class, TestClient4.class, TestClient5.class })
-	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
-	public static class Application {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		public Hello getHello() {
-			return new Hello("hello world");
-		}
-
-	}
-
-	public static class Hello {
-
-		private String message;
-
-		public Hello() {
-		}
-
-		public Hello(String message) {
-			this.message = message;
-		}
-
-		public String getMessage() {
-			return this.message;
-		}
-
-		public void setMessage(String message) {
-			this.message = message;
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	public static class LocalRibbonClientConfiguration {
-
-		@Value("${local.server.port}")
-		private int port = 0;
-
-		@Bean
-		public ServerList<Server> ribbonServerList() {
-			return new StaticServerList<>(new Server("localhost", this.port));
-		}
-
-	}
-
-}

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

@@ -1,158 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.netflix.ribbon.StaticServerList;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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;
-
-/**
- * Tests the Feign Retryer, not ribbon retry.
- *
- * @author Spencer Gibb
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignclientretrytest",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
-				"feign.hystrix.enabled=false", "localapp.ribbon.MaxAutoRetries=2",
-				"localapp.ribbon.MaxAutoRetriesNextServer=3" })
-@DirtiesContext
-public class FeignRibbonClientRetryTests {
-
-	@Value("${local.server.port}")
-	private int port = 0;
-
-	@Autowired
-	private TestClient testClient;
-
-	@Test
-	public void testClient() {
-		assertThat(this.testClient).as("testClient was null").isNotNull();
-		assertThat(Proxy.isProxyClass(this.testClient.getClass()))
-				.as("testClient is not a java Proxy").isTrue();
-		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.testClient);
-		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
-	}
-
-	@Test
-	public void testRetries() {
-		int retryMe = this.testClient.retryMe();
-		assertThat(1).as("retryCount didn't match").isEqualTo(retryMe);
-		// TODO: not sure how to verify retry happens. Debugging through it, it works
-		// maybe the assertEquals above is enough because of the bogus servers
-	}
-
-	@FeignClient("localapp")
-	protected interface TestClient {
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
-		int retryMe();
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@RestController
-	@EnableFeignClients(clients = TestClient.class)
-	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
-	public static class Application {
-
-		private AtomicInteger retries = new AtomicInteger(1);
-
-		@RequestMapping(method = RequestMethod.GET, value = "/hello")
-		public Hello getHello() {
-			return new Hello("hello world 1");
-		}
-
-		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
-		public int retryMe() {
-			return this.retries.getAndIncrement();
-		}
-
-	}
-
-	public static class Hello {
-
-		private String message;
-
-		public Hello() {
-		}
-
-		public Hello(String message) {
-			this.message = message;
-		}
-
-		public String getMessage() {
-			return this.message;
-		}
-
-		public void setMessage(String message) {
-			this.message = message;
-		}
-
-	}
-
-}
-
-// Load balancer with fixed server list for "local" pointing to localhost
-// some bogus servers are thrown in to test retry
-@Configuration(proxyBeanMethods = false)
-class LocalRibbonClientConfiguration {
-
-	@Value("${local.server.port}")
-	private int port = 0;
-
-	@Bean
-	public ServerList<Server> ribbonServerList() {
-		return new StaticServerList<>(new Server("mybadhost", 80),
-				new Server("mybadhost2", 10002), new Server("mybadhost3", 10003),
-				new Server("localhost", this.port));
-	}
-
-}

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

@@ -1,152 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.util.HashMap;
-
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.AbstractLoadBalancer;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.LoadBalancerStats;
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerStats;
-import feign.Client;
-import feign.Request;
-import feign.Request.Options;
-import feign.RequestTemplate;
-import org.hamcrest.CustomMatcher;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
-import static feign.Request.HttpMethod.GET;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.hamcrest.MockitoHamcrest.argThat;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- */
-public class FeignRibbonClientTests {
-
-	private AbstractLoadBalancer loadBalancer = mock(AbstractLoadBalancer.class);
-
-	private Client delegate = mock(Client.class);
-
-	private SpringClientFactory factory = new SpringClientFactory() {
-		@Override
-		public IClientConfig getClientConfig(String name) {
-			DefaultClientConfigImpl config = new DefaultClientConfigImpl();
-			config.set(CommonClientConfigKey.ConnectTimeout, 1000);
-			config.set(CommonClientConfigKey.ReadTimeout, 500);
-			return config;
-		}
-
-		@Override
-		public <C> C getInstance(String name, Class<C> type) {
-			if (type.isAssignableFrom(ServerIntrospector.class)) {
-				@SuppressWarnings("unchecked")
-				C instance = (C) new DefaultServerIntrospector();
-				return instance;
-			}
-			return null;
-		}
-
-		@Override
-		public ILoadBalancer getLoadBalancer(String name) {
-			return FeignRibbonClientTests.this.loadBalancer;
-		}
-	};
-
-	// Even though we don't maintain FeignRibbonClient, keep these tests
-	// around to make sure the expected behaviour doesn't break
-	private Client client = new LoadBalancerFeignClient(this.delegate,
-			new CachingSpringLoadBalancerFactory(this.factory), this.factory);
-
-	@Before
-	public void init() {
-		when(this.loadBalancer.chooseServer(any()))
-				.thenReturn(new Server("foo.com", 8000));
-		// to fix NPE
-		LoadBalancerStats stats = mock(LoadBalancerStats.class);
-		when(this.loadBalancer.getLoadBalancerStats()).thenReturn(stats);
-		when(stats.getSingleServerStat(any(Server.class)))
-				.thenReturn(mock(ServerStats.class));
-	}
-
-	@Test
-	public void remoteRequestIsSentAtRoot() throws Exception {
-		Request request = new RequestTemplate().method(GET).target("https://foo")
-				.resolve(new HashMap<>()).request();
-		this.client.execute(request, new Options());
-		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
-		verify(this.delegate).execute(argThat(matcher), any(Options.class));
-	}
-
-	@Test
-	public void remoteRequestIsSent() throws Exception {
-		Request request = new RequestTemplate().method(GET).target("https://foo/")
-				.resolve(new HashMap<>()).request();
-		this.client.execute(request, new Options());
-		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
-		verify(this.delegate).execute(argThat(matcher), any(Options.class));
-	}
-
-	@Test
-	public void verifyCleanUrl() throws Exception {
-		Request request = new RequestTemplate().method(GET)
-				.target("https://tp/abc/bcd.json").resolve(new HashMap<>()).request();
-		this.client.execute(request, new Options());
-		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/abc/bcd.json");
-		verify(this.delegate).execute(argThat(matcher), any(Options.class));
-	}
-
-	@Test
-	public void remoteRequestIsSecure() throws Exception {
-		Request request = new RequestTemplate().method(GET).target("https://foo/")
-				.resolve(new HashMap<>()).request();
-		this.client.execute(request, new Options());
-		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
-		verify(this.delegate).execute(argThat(matcher), any(Options.class));
-	}
-
-	private final static class RequestMatcher extends CustomMatcher<Request> {
-
-		private String url;
-
-		private RequestMatcher(String url) {
-			super("request has URI: " + url);
-			this.url = url;
-		}
-
-		@Override
-		public boolean matches(Object item) {
-			Request request = (Request) item;
-			return request.url().equals(this.url);
-		}
-
-	}
-
-}

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

@@ -1,102 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.lang.reflect.Field;
-
-import javax.net.ssl.SSLContextSpi;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-
-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.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.ReflectionUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Ryan Baxter
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-		classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "debug=true", "feign.httpclient.disableSslValidation=true" })
-@DirtiesContext
-public class FeignRibbonHttpClientConfigurationTests {
-
-	@Autowired
-	HttpClientConnectionManager connectionManager;
-
-	@Test
-	public void disableSslTest() throws Exception {
-		Lookup<ConnectionSocketFactory> socketFactoryRegistry = getConnectionSocketFactoryLookup(
-				this.connectionManager);
-		assertThat(socketFactoryRegistry.lookup("https")).isNotNull();
-		assertThat(this.getX509TrustManager(socketFactoryRegistry).getAcceptedIssuers())
-				.isNull();
-	}
-
-	private Lookup<ConnectionSocketFactory> getConnectionSocketFactoryLookup(
-			HttpClientConnectionManager connectionManager) {
-		DefaultHttpClientConnectionOperator connectionOperator = (DefaultHttpClientConnectionOperator) this
-				.getField(connectionManager, "connectionOperator");
-		return (Lookup) this.getField(connectionOperator, "socketFactoryRegistry");
-	}
-
-	private X509TrustManager getX509TrustManager(
-			Lookup<ConnectionSocketFactory> socketFactoryRegistry) {
-		ConnectionSocketFactory connectionSocketFactory = (ConnectionSocketFactory) socketFactoryRegistry
-				.lookup("https");
-		SSLSocketFactory sslSocketFactory = (SSLSocketFactory) this
-				.getField(connectionSocketFactory, "socketfactory");
-		SSLContextSpi sslContext = (SSLContextSpi) this.getField(sslSocketFactory,
-				"context");
-		return (X509TrustManager) this.getField(sslContext, "trustManager");
-	}
-
-	protected <T> Object getField(Object target, String name) {
-		Field field = ReflectionUtils.findField(target.getClass(), name);
-		ReflectionUtils.makeAccessible(field);
-		Object value = ReflectionUtils.getField(field, target);
-		return value;
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	static class FeignRibbonHttpClientConfigurationTestsApplication {
-
-		public static void main(String[] args) {
-			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
-					.run(args);
-		}
-
-	}
-
-}

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

@@ -1,81 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.lang.reflect.Field;
-
-import javax.net.ssl.HostnameVerifier;
-
-import okhttp3.OkHttpClient;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.ReflectionUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Ryan Baxter
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-		classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class,
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "debug=true", "feign.httpclient.disableSslValidation=true",
-				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
-@DirtiesContext
-public class FeignRibbonOkHttpClientConfigurationTests {
-
-	@Autowired
-	OkHttpClient httpClient;
-
-	@Test
-	public void disableSslTest() throws Exception {
-		HostnameVerifier hostnameVerifier = (HostnameVerifier) this
-				.getField(this.httpClient, "hostnameVerifier");
-		assertThat(
-				OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier))
-						.isTrue();
-	}
-
-	protected <T> Object getField(Object target, String name) {
-		Field field = ReflectionUtils.findField(target.getClass(), name);
-		ReflectionUtils.makeAccessible(field);
-		Object value = ReflectionUtils.getField(field, target);
-		return value;
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	static class FeignRibbonOkHttpClientConfigurationTestsApplication {
-
-		public static void main(String[] args) {
-			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
-					.run(args);
-		}
-
-	}
-
-}

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

@@ -1,131 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import feign.Request;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.FeignContext;
-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.web.bind.annotation.RequestMapping;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class,
-		webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=loadBalancerFeignClientTests",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
-@DirtiesContext
-public class LoadBalancerFeignClientOverrideTests {
-
-	@Autowired
-	private FeignContext context;
-
-	@Test
-	public void overrideRequestOptions() {
-		// specific ribbon 'bar' configuration via spring bean
-		Request.Options barOptions = this.context.getInstance("bar",
-				Request.Options.class);
-		assertThat(barOptions.connectTimeoutMillis()).isEqualTo(1);
-		assertThat(barOptions.readTimeoutMillis()).isEqualTo(2);
-		assertOptions(barOptions, "bar", 1, 2);
-
-		// specific ribbon 'foo' configuration via application.yml
-		Request.Options fooOptions = this.context.getInstance("foo",
-				Request.Options.class);
-		assertThat(fooOptions).isEqualTo(LoadBalancerFeignClient.DEFAULT_OPTIONS);
-		assertOptions(fooOptions, "foo", 7, 17);
-
-		// generic ribbon default configuration
-		Request.Options bazOptions = this.context.getInstance("baz",
-				Request.Options.class);
-		assertThat(bazOptions).isEqualTo(LoadBalancerFeignClient.DEFAULT_OPTIONS);
-		assertOptions(bazOptions, "baz", 3001, 60001);
-	}
-
-	void assertOptions(Request.Options options, String name, int expectedConnect,
-			int expectedRead) {
-		LoadBalancerFeignClient client = this.context.getInstance(name,
-				LoadBalancerFeignClient.class);
-		IClientConfig config = client.getClientConfig(options, name);
-		assertThat(config.get(CommonClientConfigKey.ConnectTimeout, -1).intValue())
-				.as("connect was wrong for " + name).isEqualTo(expectedConnect);
-		assertThat(config.get(CommonClientConfigKey.ReadTimeout, -1).intValue())
-				.as("read was wrong for " + name).isEqualTo(expectedRead);
-	}
-
-	@FeignClient(value = "foo", configuration = FooConfiguration.class)
-	interface FooClient {
-
-		@RequestMapping("/")
-		String get();
-
-	}
-
-	@FeignClient(value = "bar", configuration = BarConfiguration.class)
-	interface BarClient {
-
-		@RequestMapping("/")
-		String get();
-
-	}
-
-	@FeignClient("baz")
-	interface BazClient {
-
-		@RequestMapping("/")
-		String get();
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableFeignClients(clients = { FooClient.class, BarClient.class, BazClient.class })
-	@EnableAutoConfiguration
-	protected static class TestConfiguration {
-
-	}
-
-	public static class FooConfiguration {
-
-	}
-
-	public static class BarConfiguration {
-
-		@Bean
-		public Request.Options feignRequestOptions() {
-			return new Request.Options(1, 2);
-		}
-
-	}
-
-}

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

@@ -1,702 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.ribbon;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-
-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import feign.Client;
-import feign.Request;
-import feign.Response;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicy;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerContext;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.retry.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.TerminatedRetryException;
-import org.springframework.retry.backoff.BackOffContext;
-import org.springframework.retry.backoff.BackOffInterruptedException;
-import org.springframework.retry.backoff.BackOffPolicy;
-
-import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
-import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
-import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
-import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOperations;
-import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
-import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
-import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
-import static feign.Request.HttpMethod.GET;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Ryan Baxter
- * @author Gang Li
- * @author Olga Maciaszek-Sharma
- */
-public class RetryableFeignLoadBalancerTests {
-
-	@Mock
-	private ILoadBalancer lb;
-
-	@Mock
-	private IClientConfig config;
-
-	private ServerIntrospector inspector = new DefaultServerIntrospector();
-
-	private Integer defaultConnectTimeout = 10000;
-
-	private Integer defaultReadTimeout = 10000;
-
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
-		when(this.config.get(MaxAutoRetries, DEFAULT_MAX_AUTO_RETRIES)).thenReturn(1);
-		when(this.config.get(MaxAutoRetriesNextServer,
-				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(1);
-		when(this.config.get(OkToRetryOnAllOperations, eq(anyBoolean())))
-				.thenReturn(true);
-		when(this.config.get(ConnectTimeout)).thenReturn(this.defaultConnectTimeout);
-		when(this.config.get(ReadTimeout)).thenReturn(this.defaultReadTimeout);
-		when(this.config.get(OkToRetryOnAllOperations, false)).thenReturn(true);
-	}
-
-	@Test
-	public void executeNoFailure() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("404,502,foo, ,").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory);
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().status(200).request(feignRequest)
-				.headers(new HashMap<>()).build();
-		doReturn(response).when(client).execute(any(Request.class),
-				any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
-		verify(client, times(1)).execute(any(Request.class), any(Request.Options.class));
-	}
-
-	@Test
-	public void executeNeverRetry() throws Exception {
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		doThrow(new IOException("boom")).when(client).execute(any(Request.class),
-				any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				this.config, this.inspector, new LoadBalancedRetryFactory() {
-					@Override
-					public LoadBalancedRetryPolicy createRetryPolicy(String s,
-							ServiceInstanceChooser serviceInstanceChooser) {
-						return null;
-					}
-
-					@Override
-					public RetryListener[] createRetryListeners(String service) {
-						return new RetryListener[0];
-					}
-
-					@Override
-					public BackOffPolicy createBackOffPolicy(String service) {
-						return null;
-					}
-				});
-		try {
-			feignLb.execute(request, null);
-		}
-		catch (Exception e) {
-			assertThat(e).isInstanceOf(IOException.class);
-		}
-		finally {
-			verify(client, times(1)).execute(any(Request.class),
-					any(Request.Options.class));
-		}
-	}
-
-	@Test
-	public void executeRetry() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().status(200).request(feignRequest)
-				.headers(new HashMap<>()).build();
-		doThrow(new IOException("boom")).doReturn(response).when(client)
-				.execute(any(Request.class), any(Request.Options.class));
-
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-	}
-
-	@Test
-	public void executeRetryOnStatusCode() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("404").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().request(feignRequest).status(200)
-				.headers(new HashMap<>()).build();
-		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
-				.headers(new HashMap<>()).build();
-		doReturn(fourOFourResponse).doReturn(response).when(client)
-				.execute(any(Request.class), any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-	}
-
-	@Test
-	public void executeRetryOnStatusCodeWithEmptyBody() throws Exception {
-		int retriesNextServer = 0;
-		when(this.config.get(MaxAutoRetriesNextServer,
-				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(retriesNextServer);
-		doReturn(new Server("foo", 80)).when(this.lb).chooseServer(any());
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(retriesNextServer).when(config)
-				.get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer), anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("404").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().request(feignRequest).status(404)
-				.headers(new HashMap<>()).build();
-		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
-				.headers(new HashMap<>()).build();
-		doReturn(fourOFourResponse).doReturn(response).when(client)
-				.execute(any(Request.class), any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(404);
-		assertThat(ribbonResponse.toResponse().body().length())
-				.isEqualTo(Integer.valueOf(0));
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-	}
-
-	@Test
-	public void getRequestSpecificRetryHandler() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory);
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().request(feignRequest).status(200)
-				.headers(new HashMap<>()).build();
-		doReturn(response).when(client).execute(any(Request.class),
-				any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				this.config, this.inspector, loadBalancedRetryFactory);
-		RequestSpecificRetryHandler retryHandler = feignLb
-				.getRequestSpecificRetryHandler(request, this.config);
-		assertThat(retryHandler.getMaxRetriesOnNextServer()).isEqualTo(1);
-		assertThat(retryHandler.getMaxRetriesOnSameServer()).isEqualTo(1);
-
-	}
-
-	@Test
-	public void choose() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory);
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response response = Response.builder().request(feignRequest).status(200)
-				.headers(new HashMap<>()).build();
-		doReturn(response).when(client).execute(any(Request.class),
-				any(Request.Options.class));
-		final Server server = new Server("foo", 80);
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(
-				new ILoadBalancer() {
-					@Override
-					public void addServers(List<Server> list) {
-
-					}
-
-					@Override
-					public Server chooseServer(Object o) {
-						return server;
-					}
-
-					@Override
-					public void markServerDown(Server server) {
-
-					}
-
-					@Override
-					public List<Server> getServerList(boolean b) {
-						return null;
-					}
-
-					@Override
-					public List<Server> getReachableServers() {
-						return null;
-					}
-
-					@Override
-					public List<Server> getAllServers() {
-						return null;
-					}
-				}, this.config, this.inspector, loadBalancedRetryFactory);
-		ServiceInstance serviceInstance = feignLb.choose("foo");
-		assertThat(serviceInstance.getHost()).isEqualTo("foo");
-		assertThat(serviceInstance.getPort()).isEqualTo(80);
-
-	}
-
-	@Test
-	public void retryListenerTest() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		MyRetryListener myRetryListener = new MyRetryListener();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public RetryListener[] createRetryListeners(String service) {
-				return new RetryListener[] { myRetryListener };
-			}
-
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
-		Response response = Response.builder().request(feignRequest).status(200)
-				.headers(new HashMap<>()).build();
-		doThrow(new IOException("boom")).doReturn(response).when(client)
-				.execute(any(Request.class), any(Request.Options.class));
-
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-		assertThat(myRetryListener.getOnError()).isEqualTo(1);
-	}
-
-	@Test(expected = TerminatedRetryException.class)
-	public void retryListenerTestNoRetry() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		MyRetryListenerNotRetry myRetryListenerNotRetry = new MyRetryListenerNotRetry();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public RetryListener[] createRetryListeners(String service) {
-				return new RetryListener[] { myRetryListenerNotRetry };
-			}
-
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-	}
-
-	@Test
-	public void retryWithDefaultConstructorTest() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryPolicyFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
-		Response response = Response.builder().request(feignRequest).status(200)
-				.headers(new HashMap<>()).build();
-		doThrow(new IOException("boom")).doReturn(response).when(client)
-				.execute(any(Request.class), any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryPolicyFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-	}
-
-	@Test
-	public void executeRetryFail() throws Exception {
-		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
-				this.config);
-		lbContext.setRetryHandler(new DefaultLoadBalancerRetryHandler(1, 0, true));
-		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
-		IClientConfig config = mock(IClientConfig.class);
-		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
-		doReturn(0).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
-				anyInt());
-		doReturn(true).when(config)
-				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
-		doReturn(this.defaultConnectTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ConnectTimeout));
-		doReturn(this.defaultReadTimeout).when(config)
-				.get(eq(CommonClientConfigKey.ReadTimeout));
-		doReturn("404").when(config).getPropertyAsString(
-				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
-		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
-		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
-		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
-				clientFactory) {
-			@Override
-			public BackOffPolicy createBackOffPolicy(String service) {
-				return backOffPolicy;
-			}
-		};
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
-				new byte[] {}, UTF_8, null);
-		Client client = mock(Client.class);
-		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
-		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
-				.headers(new HashMap<>()).body(new Response.Body() { // set content into
-																		// response
-					@Override
-					public Integer length() {
-						return "test".getBytes().length;
-					}
-
-					@Override
-					public boolean isRepeatable() {
-						return true;
-					}
-
-					@Override
-					public InputStream asInputStream() throws IOException {
-						return new ByteArrayInputStream("test".getBytes());
-					}
-
-					@Override
-					public Reader asReader() throws IOException {
-						return new InputStreamReader(asInputStream(), UTF_8);
-					}
-
-					@Override
-					public Reader asReader(Charset charset) throws IOException {
-						return new InputStreamReader(asInputStream(), charset);
-					}
-
-					@Override
-					public void close() throws IOException {
-					}
-				}).build();
-		doReturn(fourOFourResponse).when(client).execute(any(Request.class),
-				any(Request.Options.class));
-		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
-				config, this.inspector, loadBalancedRetryFactory);
-		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
-		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
-		assertThat(backOffPolicy.getCount()).isEqualTo(1);
-		InputStream inputStream = ribbonResponse.toResponse().body().asInputStream();
-		byte[] buf = new byte[100];
-		int read = inputStream.read(buf);
-		assertThat(new String(buf, 0, read)).isEqualTo("test");
-	}
-
-	class MyBackOffPolicy implements BackOffPolicy {
-
-		private int count = 0;
-
-		@Override
-		public BackOffContext start(RetryContext retryContext) {
-			return null;
-		}
-
-		@Override
-		public void backOff(BackOffContext backOffContext)
-				throws BackOffInterruptedException {
-			this.count++;
-		}
-
-		public int getCount() {
-			return this.count;
-		}
-
-	}
-
-	class MyRetryListener implements RetryListener {
-
-		private int onError = 0;
-
-		@Override
-		public <T, E extends Throwable> boolean open(RetryContext context,
-				RetryCallback<T, E> callback) {
-			return true;
-		}
-
-		@Override
-		public <T, E extends Throwable> void close(RetryContext context,
-				RetryCallback<T, E> callback, Throwable throwable) {
-
-		}
-
-		@Override
-		public <T, E extends Throwable> void onError(RetryContext context,
-				RetryCallback<T, E> callback, Throwable throwable) {
-			this.onError++;
-		}
-
-		public int getOnError() {
-			return this.onError;
-		}
-
-	}
-
-	class MyRetryListenerNotRetry implements RetryListener {
-
-		@Override
-		public <T, E extends Throwable> boolean open(RetryContext context,
-				RetryCallback<T, E> callback) {
-			return false;
-		}
-
-		@Override
-		public <T, E extends Throwable> void close(RetryContext context,
-				RetryCallback<T, E> callback, Throwable throwable) {
-
-		}
-
-		@Override
-		public <T, E extends Throwable> void onError(RetryContext context,
-				RetryCallback<T, E> callback, Throwable throwable) {
-		}
-
-	}
-
-}