Update SNAPSHOT to 3.0.0.M1

# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-openfeign.adoc

.flattened-pom.xml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-build</artifactId>
-    <version>2.2.0.RC2</version>
-    <relativePath></relativePath>
-  </parent>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-openfeign</artifactId>
-  <version>2.2.0.RC2</version>
-  <packaging>pom</packaging>
-  <name>Spring Cloud OpenFeign</name>
-  <description>Spring Cloud OpenFeign</description>
-  <url>https://spring.io/spring-cloud/spring-cloud-openfeign</url>
-  <organization>
-    <name>Pivotal Software, Inc.</name>
-    <url>https://www.spring.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>Copyright 2014-2015 the original author or authors.
-
-				Licensed under the Apache License, Version 2.0 (the "License");
-				you may not use this file except in compliance with the License.
-				You may obtain a copy of the License at
-
-				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.</comments>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>dsyer</id>
-      <name>Dave Syer</name>
-      <email>dsyer at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sgibb</id>
-      <name>Spencer Gibb</name>
-      <email>sgibb at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>mgrzejszczak</id>
-      <name>Marcin Grzejszczak</name>
-      <email>mgrzejszczak at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rbaxter</id>
-      <name>Ryan Baxter</name>
-      <email>rbaxter at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>omaciaszeksharma</id>
-      <name>Olga Maciaszek-Sharma</name>
-      <email>omaciaszeksharma at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
-  </scm>
-  <profiles>
-    <profile>
-      <id>spring</id>
-      <repositories>
-        <repository>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>https://repo.spring.io/libs-snapshot-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>https://repo.spring.io/libs-milestone-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</project>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. 
+
+**Sample**
+If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -18,4 +18,6 @@ _site/
 .shelf
 *.swp
 *.swo
-.vscode/
+.vscode/
+.flattened-pom.xml
+

SECURITY.md

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

docs/.flattened-pom.xml

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-openfeign</artifactId>
-    <version>2.2.0.RC2</version>
-  </parent>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-openfeign-docs</artifactId>
-  <version>2.2.0.RC2</version>
-  <packaging>pom</packaging>
-  <name>Spring Cloud OpenFeign Docs</name>
-  <description>Spring Cloud Docs</description>
-  <url>https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs</url>
-  <organization>
-    <name>Pivotal Software, Inc.</name>
-    <url>https://www.spring.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>Copyright 2014-2015 the original author or authors.
-
-				Licensed under the Apache License, Version 2.0 (the "License");
-				you may not use this file except in compliance with the License.
-				You may obtain a copy of the License at
-
-				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.</comments>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>dsyer</id>
-      <name>Dave Syer</name>
-      <email>dsyer at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sgibb</id>
-      <name>Spencer Gibb</name>
-      <email>sgibb at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>mgrzejszczak</id>
-      <name>Marcin Grzejszczak</name>
-      <email>mgrzejszczak at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rbaxter</id>
-      <name>Ryan Baxter</name>
-      <email>rbaxter at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>omaciaszeksharma</id>
-      <name>Olga Maciaszek-Sharma</name>
-      <email>omaciaszeksharma at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-openfeign</artifactId>
-      <version>2.2.0.RC2</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.0.RC2</version>
+		<version>3.0.0.M1</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -15,7 +15,7 @@
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.0.x,2.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 	</properties>
 	<dependencies>
@@ -63,6 +63,10 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

docs/src/main/asciidoc/appendix.adoc

@@ -0,0 +1,14 @@
+:numbered!:
+[appendix]
+[[common-application-properties]]
+== Common application properties
+
+include::_attributes.adoc[]
+
+Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
+This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
+
+NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
+Also, you can define your own properties.
+
+include::_configprops.adoc[]

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, 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
@@ -52,7 +52,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>>) 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.
@@ -63,12 +63,7 @@ The load-balancer client above will want to discover the physical addresses
 for the "stores" service. If your application is a Eureka client then
 it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
-in your external configuration (see
-<<spring-cloud-ribbon-without-eureka,above for example>>).
-
-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`.
+in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
 
 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
@@ -110,18 +105,16 @@ public interface StoreClient {
 }
 ----
 
-Spring Cloud Netflix provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
+Spring Cloud OpenFeign provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
 
 * `Decoder` feignDecoder: `ResponseEntityDecoder` (which wraps a `SpringDecoder`)
 * `Encoder` feignEncoder: `SpringEncoder`
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.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` contains both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`.
-
 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.
 
@@ -429,13 +422,13 @@ feign.compression.request.min-request-size=2048
 
 These properties allow you to be selective about the compressed media types and minimum request threshold length.
 
-For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in ISO-8859-1 encoding:
+For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
 
 [source,java]
----
+----
 feign.compression.response.enabled=true
 feign.compression.response.useGzipDecoder=true
----
+----
 
 === Feign logging
 
@@ -524,6 +517,50 @@ public interface DemoTemplate {
 }
 ----
 
+=== Spring @MatrixVariable Support
+
+Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.
+
+If a map is passed as the method argument, the `@MatrixVariable` path segment is created by joining key-value pairs from the map with a `=`.
+
+If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is
+joined with the provided method argument using `=`.
+
+IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, 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:
+
+[source,java,indent=0]
+----
+@GetMapping("/objects/links/{matrixVars}")
+Map<String, List<String>> getObjects(@MatrixVariable Map<String, List<String>> matrixVars);
+----
+Note that both variable name and the path segment placeholder are called `matrixVars`.
+
+[source,java,indent=0]
+----
+@FeignClient("demo")
+public interface DemoTemplate {
+
+    @GetMapping(path = "/stores")
+    CollectionModel<Store> getStores();
+}
+----
+
+
+=== Troubleshooting
+
+==== Early Initialization Errors
+
+Depending on how you are using your Feign clients you may see initialization errors when starting your application.
+To work around this problem you can use an `ObjectProvider` when autowiring your client.
+
+[source,java,indent=0]
+----
+@Autowired
+ObjectProvider<TestFeginClient> testFeginClient;
+----
+
 == 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.0.RC2</version>
+	<version>3.0.0.M1</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.2.0.RC2</version>
+		<version>3.0.0.M1</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.2.0.RC2</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.0.RC2</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>3.0.0.M1</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>3.0.0.M1</spring-cloud-netflix.version>
 
 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>

spring-cloud-openfeign-core/.flattened-pom.xml

@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-openfeign</artifactId>
-    <version>2.2.0.RC2</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-openfeign-core</artifactId>
-  <version>2.2.0.RC2</version>
-  <name>Spring Cloud OpenFeign Core</name>
-  <description>Spring Cloud OpenFeign Core</description>
-  <url>https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core</url>
-  <organization>
-    <name>Pivotal Software, Inc.</name>
-    <url>https://www.spring.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>Copyright 2014-2015 the original author or authors.
-
-				Licensed under the Apache License, Version 2.0 (the "License");
-				you may not use this file except in compliance with the License.
-				You may obtain a copy of the License at
-
-				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.</comments>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>dsyer</id>
-      <name>Dave Syer</name>
-      <email>dsyer at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sgibb</id>
-      <name>Spencer Gibb</name>
-      <email>sgibb at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>mgrzejszczak</id>
-      <name>Marcin Grzejszczak</name>
-      <email>mgrzejszczak at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rbaxter</id>
-      <name>Ryan Baxter</name>
-      <email>rbaxter at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>omaciaszeksharma</id>
-      <name>Olga Maciaszek-Sharma</name>
-      <email>omaciaszeksharma at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-netflix-ribbon</artifactId>
-      <version>2.2.0.RC2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-webflux</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-reactor-netty</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-hateoas</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-      <version>4.1.43.Final</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-      <version>3.3.0.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.retry</groupId>
-      <artifactId>spring-retry</artifactId>
-      <version>1.2.4.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-aop</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-commons</artifactId>
-      <version>2.2.0.RC2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-context</artifactId>
-      <version>2.2.0.RC2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.ribbon</groupId>
-      <artifactId>ribbon-loadbalancer</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-core</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign.form</groupId>
-      <artifactId>feign-form-spring</artifactId>
-      <version>3.8.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-slf4j</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-httpclient</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-hystrix</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-okhttp</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.github.openfeign</groupId>
-      <artifactId>feign-java8</artifactId>
-      <version>10.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.hystrix</groupId>
-      <artifactId>hystrix-core</artifactId>
-      <version>1.5.18</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.hystrix</groupId>
-      <artifactId>hystrix-serialization</artifactId>
-      <version>1.5.18</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.hystrix</groupId>
-      <artifactId>hystrix-metrics-event-stream</artifactId>
-      <version>1.5.18</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>servlet-api</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.hystrix</groupId>
-      <artifactId>hystrix-javanica</artifactId>
-      <version>1.5.18</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>jsr305</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>aspectjrt</artifactId>
-          <groupId>org.aspectj</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.ribbon</groupId>
-      <artifactId>ribbon-core</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.ribbon</groupId>
-      <artifactId>ribbon-httpclient</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>annotations</artifactId>
-          <groupId>com.google.code.findbugs</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
-      <version>1.3.8</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>3.14.4</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure-processor</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-commons</artifactId>
-      <version>2.2.1.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-loadbalancer</artifactId>
-      <version>2.2.0.RC2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.0.RC2</version>
+		<version>3.0.0.M1</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,51 +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>io.github.openfeign</groupId>
-			<artifactId>feign-java8</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-serialization</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-metrics-event-stream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-javanica</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
@@ -198,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>
@@ -236,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/FeignAutoConfiguration.java

@@ -38,7 +38,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.actuator.HasFeatures;
@@ -56,7 +55,7 @@ import org.springframework.context.annotation.Import;
  * @author Spencer Gibb
  * @author Julien Roy
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Feign.class)
 @EnableConfigurationProperties({ FeignClientProperties.class,
 		FeignHttpClientProperties.class })
@@ -78,20 +77,7 @@ public class FeignAutoConfiguration {
 		return context;
 	}
 
-	@Configuration
-	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
-	protected static class HystrixFeignTargeterConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean
-		public Targeter feignTargeter() {
-			return new HystrixTargeter();
-		}
-
-	}
-
-	@Configuration
-	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
+	@Configuration(proxyBeanMethods = false)
 	protected static class DefaultFeignTargeterConfiguration {
 
 		@Bean
@@ -103,12 +89,11 @@ public class FeignAutoConfiguration {
 	}
 
 	// 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.
-	@Configuration
+	// 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 {
@@ -172,9 +157,8 @@ public class FeignAutoConfiguration {
 
 	}
 
-	@Configuration
+	@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/FeignClient.java

@@ -26,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
@@ -85,7 +85,7 @@ public @interface FeignClient {
 	boolean decode404() default false;
 
 	/**
-	 * A custom <code>@Configuration</code> for the feign client. Can contain override
+	 * A custom configuration class for the feign client. Can contain override
 	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
 	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
 	 *
@@ -112,8 +112,7 @@ public @interface FeignClient {
 	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;
 
 /**
@@ -88,13 +86,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

@@ -21,6 +21,7 @@ import java.util.Objects;
 
 import feign.Client;
 import feign.Contract;
+import feign.ExceptionPropagationPolicy;
 import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
@@ -37,7 +38,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
@@ -76,7 +77,7 @@ class FeignClientFactoryBean
 	private Class<?> fallbackFactory = void.class;
 
 	@Override
-	public void afterPropertiesSet() throws Exception {
+	public void afterPropertiesSet() {
 		Assert.hasText(this.contextId, "Context id must be set");
 		Assert.hasText(this.name, "Name must be set");
 	}
@@ -139,6 +140,14 @@ class FeignClientFactoryBean
 		if (errorDecoder != null) {
 			builder.errorDecoder(errorDecoder);
 		}
+		else {
+			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
+					FeignErrorDecoderFactory.class);
+			if (errorDecoderFactory != null) {
+				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(this.type);
+				builder.errorDecoder(factoryErrorDecoder);
+			}
+		}
 		Request.Options options = getOptional(context, Request.Options.class);
 		if (options != null) {
 			builder.options(options);
@@ -155,6 +164,11 @@ class FeignClientFactoryBean
 		if (this.decode404) {
 			builder.decode404();
 		}
+		ExceptionPropagationPolicy exceptionPropagationPolicy = getOptional(context,
+				ExceptionPropagationPolicy.class);
+		if (exceptionPropagationPolicy != null) {
+			builder.exceptionPropagationPolicy(exceptionPropagationPolicy);
+		}
 	}
 
 	protected void configureUsingProperties(
@@ -209,6 +223,10 @@ class FeignClientFactoryBean
 		if (Objects.nonNull(config.getContract())) {
 			builder.contract(getOrInstantiate(config.getContract()));
 		}
+
+		if (Objects.nonNull(config.getExceptionPropagationPolicy())) {
+			builder.exceptionPropagationPolicy(config.getExceptionPropagationPolicy());
+		}
 	}
 
 	private <T> T getOrInstantiate(Class<T> tClass) {
@@ -243,11 +261,11 @@ class FeignClientFactoryBean
 		}
 
 		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
-	public Object getObject() throws Exception {
+	public Object getObject() {
 		return getTarget();
 	}
 
@@ -277,10 +295,10 @@ class FeignClientFactoryBean
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
-			if (client instanceof LoadBalancerFeignClient) {
+			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
-				// but ribbon is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient) client).getDelegate();
+				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
+				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
 			}
 			builder.client(client);
 		}

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

@@ -22,6 +22,7 @@ import java.util.Map;
 import java.util.Objects;
 
 import feign.Contract;
+import feign.ExceptionPropagationPolicy;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -111,6 +112,8 @@ public class FeignClientProperties {
 
 		private Class<Contract> contract;
 
+		private ExceptionPropagationPolicy exceptionPropagationPolicy;
+
 		public Logger.Level getLoggerLevel() {
 			return this.loggerLevel;
 		}
@@ -192,6 +195,15 @@ public class FeignClientProperties {
 			this.contract = contract;
 		}
 
+		public ExceptionPropagationPolicy getExceptionPropagationPolicy() {
+			return exceptionPropagationPolicy;
+		}
+
+		public void setExceptionPropagationPolicy(
+				ExceptionPropagationPolicy exceptionPropagationPolicy) {
+			this.exceptionPropagationPolicy = exceptionPropagationPolicy;
+		}
+
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -210,14 +222,17 @@ public class FeignClientProperties {
 					&& 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.contract, that.contract)
+					&& Objects.equals(this.exceptionPropagationPolicy,
+							that.exceptionPropagationPolicy);
 		}
 
 		@Override
 		public int hashCode() {
 			return Objects.hash(this.loggerLevel, this.connectTimeout, this.readTimeout,
 					this.retryer, this.errorDecoder, this.requestInterceptors,
-					this.decode404, this.encoder, this.decoder, this.contract);
+					this.decode404, this.encoder, this.decoder, this.contract,
+					this.exceptionPropagationPolicy);
 		}
 
 	}

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

@@ -20,14 +20,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.Module;
-import com.netflix.hystrix.HystrixCommand;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
 import feign.Retryer;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
-import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
 
 import org.springframework.beans.factory.ObjectFactory;
@@ -35,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.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.openfeign.support.PageJacksonModule;
@@ -55,7 +52,7 @@ import org.springframework.format.support.FormattingConversionService;
  * @author Dave Syer
  * @author Venil Noronha
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
 
 	@Autowired
@@ -144,18 +141,4 @@ public class FeignClientsConfiguration {
 		return new PageJacksonModule();
 	}
 
-	@Configuration
-	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
-	protected static class HystrixFeignConfiguration {
-
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		@ConditionalOnProperty(name = "feign.hystrix.enabled")
-		public Feign.Builder feignHystrixBuilder() {
-			return HystrixFeign.builder();
-		}
-
-	}
-
 }

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import feign.codec.ErrorDecoder;
+
+/**
+ * Allows an application to use a custom Feign {@link feign.codec.ErrorDecoder}.
+ *
+ * @author Michael Cramer
+ */
+public interface FeignErrorDecoderFactory {
+
+	/**
+	 * Factory method to provide a {@link feign.codec.ErrorDecoder} for a given
+	 * {@link Class}.
+	 * @param type the {@link Class} for which a {@link feign.codec.ErrorDecoder} instance
+	 * is to be created
+	 * @return a {@link feign.codec.ErrorDecoder} instance
+	 */
+	ErrorDecoder create(Class<?> type);
+
+}

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

@@ -1,99 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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;
-
-/**
- * @author Spencer Gibb
- * @author Erik Kringen
- */
-@SuppressWarnings("unchecked")
-class HystrixTargeter implements Targeter {
-
-	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
-			FeignContext context, Target.HardCodedTarget<T> target) {
-		if (!(feign instanceof feign.hystrix.HystrixFeign.Builder)) {
-			return feign.target(target);
-		}
-		feign.hystrix.HystrixFeign.Builder builder = (feign.hystrix.HystrixFeign.Builder) feign;
-		SetterFactory setterFactory = getOptional(factory.getName(), context,
-				SetterFactory.class);
-		if (setterFactory != null) {
-			builder.setterFactory(setterFactory);
-		}
-		Class<?> fallback = factory.getFallback();
-		if (fallback != void.class) {
-			return targetWithFallback(factory.getName(), context, target, builder,
-					fallback);
-		}
-		Class<?> fallbackFactory = factory.getFallbackFactory();
-		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(factory.getName(), context, target, builder,
-					fallbackFactory);
-		}
-
-		return feign.target(target);
-	}
-
-	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
-			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
-			Class<?> fallbackFactoryClass) {
-		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>) getFromContext(
-				"fallbackFactory", feignClientName, context, fallbackFactoryClass,
-				FallbackFactory.class);
-		return builder.target(target, fallbackFactory);
-	}
-
-	private <T> T targetWithFallback(String feignClientName, FeignContext context,
-			Target.HardCodedTarget<T> target, HystrixFeign.Builder builder,
-			Class<?> fallback) {
-		T fallbackInstance = getFromContext("fallback", feignClientName, context,
-				fallback, target.type());
-		return builder.target(target, fallbackInstance);
-	}
-
-	private <T> T getFromContext(String fallbackMechanism, String feignClientName,
-			FeignContext context, Class<?> beanType, Class<T> targetType) {
-		Object fallbackInstance = context.getInstance(feignClientName, beanType);
-		if (fallbackInstance == null) {
-			throw new IllegalStateException(String.format(
-					"No " + fallbackMechanism
-							+ " instance of type %s found for feign client %s",
-					beanType, feignClientName));
-		}
-
-		if (!targetType.isAssignableFrom(beanType)) {
-			throw new IllegalStateException(String.format("Incompatible "
-					+ fallbackMechanism
-					+ " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
-					beanType, targetType, feignClientName));
-		}
-		return (T) fallbackInstance;
-	}
-
-	private <T> T getOptional(String feignClientName, FeignContext context,
-			Class<T> beanType) {
-		return context.getInstance(feignClientName, beanType);
-	}
-
-}

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import feign.MethodMetadata;
+
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.web.bind.annotation.MatrixVariable;
+
+import static feign.Util.checkState;
+import static feign.Util.emptyToNull;
+
+/**
+ * {@link MatrixVariable} annotation processor.
+ *
+ * Can expand maps or single objects. Values are assigned from the objects
+ * {@code toString()} method.
+ *
+ * @author Matt King
+ * @see AnnotatedParameterProcessor
+ */
+public class MatrixVariableParameterProcessor implements AnnotatedParameterProcessor {
+
+	private static final Class<MatrixVariable> ANNOTATION = MatrixVariable.class;
+
+	@Override
+	public Class<? extends Annotation> getAnnotationType() {
+		return ANNOTATION;
+	}
+
+	@Override
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
+		int parameterIndex = context.getParameterIndex();
+		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
+		MethodMetadata data = context.getMethodMetadata();
+		String name = ANNOTATION.cast(annotation).value();
+
+		checkState(emptyToNull(name) != null,
+				"MatrixVariable annotation was empty on param %s.",
+				context.getParameterIndex());
+
+		context.setParameterName(name);
+
+		if (Map.class.isAssignableFrom(parameterType)) {
+			data.indexToExpander().put(parameterIndex, this::expandMap);
+		}
+		else {
+			data.indexToExpander().put(parameterIndex,
+					object -> ";" + name + "=" + object.toString());
+		}
+
+		return true;
+	}
+
+	private String expandMap(Object object) {
+		Map<String, Object> paramMap = (Map) object;
+
+		return paramMap.keySet().stream()
+				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
+				.collect(Collectors.joining());
+	}
+
+}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Collection;
+
+import feign.MethodMetadata;
+
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.web.bind.annotation.RequestPart;
+
+import static feign.Util.checkState;
+import static feign.Util.emptyToNull;
+
+/**
+ * {@link RequestPart} parameter processor.
+ *
+ * @author Aaron Whiteside
+ * @see AnnotatedParameterProcessor
+ */
+public class RequestPartParameterProcessor implements AnnotatedParameterProcessor {
+
+	private static final Class<RequestPart> ANNOTATION = RequestPart.class;
+
+	@Override
+	public Class<? extends Annotation> getAnnotationType() {
+		return ANNOTATION;
+	}
+
+	@Override
+	public boolean processArgument(AnnotatedParameterContext context,
+			Annotation annotation, Method method) {
+		int parameterIndex = context.getParameterIndex();
+		MethodMetadata data = context.getMethodMetadata();
+
+		String name = ANNOTATION.cast(annotation).value();
+		checkState(emptyToNull(name) != null,
+				"RequestPart.value() was empty on parameter %s", parameterIndex);
+		context.setParameterName(name);
+
+		data.formParams().add(name);
+		Collection<String> names = context.setTemplateParameter(name,
+				data.indexToName().get(parameterIndex));
+		data.indexToName().put(parameterIndex, names);
+		return true;
+	}
+
+}

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

@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean(CloseableHttpClient.class)
 public class HttpClientFeignConfiguration {
 

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

@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 public class OkHttpFeignConfiguration {
 

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

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Jakub Narloch
  * @see FeignAcceptGzipEncodingInterceptor
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FeignClientEncodingProperties.class)
 @ConditionalOnClass(Feign.class)
 @ConditionalOnBean(Client.class)

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

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Jakub Narloch
  * @see FeignContentGzipEncodingInterceptor
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FeignClientEncodingProperties.class)
 @ConditionalOnClass(Feign.class)
 @ConditionalOnBean(Client.class)

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

@@ -48,7 +48,7 @@ import static org.springframework.hateoas.MediaTypes.HAL_JSON;
 /**
  * @author Hector Espert
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
 @ConditionalOnClass(RepresentationModel.class)
 @AutoConfigureAfter({ JacksonAutoConfiguration.class,

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

@@ -19,23 +19,23 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Client;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-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.Configuration;
 
 /**
- * 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
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class DefaultFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
+	public Client feignClient(LoadBalancerClient loadBalancerClient) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
 				loadBalancerClient);
 	}

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

@@ -27,28 +27,28 @@ 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
  */
-class FeignBlockingLoadBalancerClient implements Client {
+public class FeignBlockingLoadBalancerClient implements Client {
 
 	private static final Log LOG = LogFactory
 			.getLog(FeignBlockingLoadBalancerClient.class);
 
 	private final Client delegate;
 
-	private final BlockingLoadBalancerClient loadBalancerClient;
+	private final LoadBalancerClient loadBalancerClient;
 
-	FeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient) {
+	public FeignBlockingLoadBalancerClient(Client delegate,
+			LoadBalancerClient loadBalancerClient) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 	}
@@ -73,13 +73,13 @@ class FeignBlockingLoadBalancerClient implements Client {
 		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
 				.toString();
 		Request newRequest = Request.create(request.httpMethod(), reconstructedUrl,
-				request.headers(), request.requestBody());
-
+				request.headers(), request.body(), request.charset(),
+				request.requestTemplate());
 		return delegate.execute(newRequest, options);
 	}
 
-	// Visible for tests
-	Client getDelegate() {
+	// Visible for Sleuth instrumentation
+	public Client getDelegate() {
 		return delegate;
 	}
 

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

@@ -19,39 +19,34 @@ 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
+@Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
 // see
 // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
 @Import({ HttpClientFeignLoadBalancerConfiguration.class,
 		OkHttpFeignLoadBalancerConfiguration.class,
 		DefaultFeignLoadBalancerConfiguration.class })
-class FeignLoadBalancerAutoConfiguration {
+public class FeignLoadBalancerAutoConfiguration {
 
 }

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

@@ -24,29 +24,29 @@ 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.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.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
- * 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
+@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
-	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+	public Client feignClient(LoadBalancerClient loadBalancerClient,
 			HttpClient httpClient) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);

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

@@ -23,30 +23,30 @@ 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.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.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
- * 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
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(OkHttpClient.class)
 @ConditionalOnProperty("feign.okhttp.enabled")
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnBean(LoadBalancerClient.class)
 @Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancerConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
-			BlockingLoadBalancerClient loadBalancerClient) {
+			LoadBalancerClient loadBalancerClient) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}

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

@@ -1,72 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-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,246 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.ClientException;
-import com.netflix.client.ClientRequest;
-import com.netflix.client.IResponse;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-import 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.requestBody());
-		}
-
-		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<String>(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() throws ClientException {
-			return this.response.body();
-		}
-
-		@Override
-		public boolean hasPayload() {
-			return this.response.body() != null;
-		}
-
-		@Override
-		public boolean isSuccess() {
-			return this.response.status() == 200;
-		}
-
-		@Override
-		public URI getRequestedURI() {
-			return this.uri;
-		}
-
-		@Override
-		public Map<String, Collection<String>> getHeaders() {
-			return this.response.headers();
-		}
-
-		Response toResponse() {
-			return this.response;
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (this.response != null && this.response.body() != null) {
-				this.response.body().close();
-			}
-		}
-
-	}
-
-}

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

@@ -1,129 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-@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,148 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.backoff.BackOffPolicy;
-import org.springframework.retry.backoff.NoBackOffPolicy;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.StreamUtils;
-
-/**
- * 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(new RetryCallback<RibbonResponse, IOException>() {
-			@Override
-			public RibbonResponse doWithRetry(RetryContext retryContext)
-					throws IOException {
-				Request feignRequest = null;
-				// on retries the policy will choose the server and set it in the context
-				// extract the server and update the request being made
-				if (retryContext instanceof LoadBalancedRetryContext) {
-					ServiceInstance service = ((LoadBalancedRetryContext) retryContext)
-							.getServiceInstance();
-					if (service != null) {
-						feignRequest = ((RibbonRequest) request
-								.replaceUri(reconstructURIWithServer(
-										new Server(service.getHost(), service.getPort()),
-										request.getUri()))).toRequest();
-					}
-				}
-				if (feignRequest == null) {
-					feignRequest = request.toRequest();
-				}
-				Response response = request.client().execute(feignRequest, options);
-				if (retryPolicy != 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/DefaultGzipDecoder.java

@@ -20,12 +20,12 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.zip.GZIPInputStream;
 
 import feign.FeignException;
 import feign.Response;
-import feign.Util;
 import feign.codec.Decoder;
 
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
@@ -72,7 +72,7 @@ public class DefaultGzipDecoder implements Decoder {
 		try (GZIPInputStream gzipInputStream = new GZIPInputStream(
 				response.body().asInputStream());
 				BufferedReader reader = new BufferedReader(
-						new InputStreamReader(gzipInputStream, Util.ISO_8859_1))) {
+						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
 			String outputString = "";
 			String line;
 			while ((line = reader.readLine()) != null) {

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

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Jaesik Kim
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty("feign.compression.response.enabled")
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present, it disables transparent compression

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

@@ -1,79 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/SpringEncoder.java

@@ -40,6 +40,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
+import org.springframework.http.converter.GenericHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConversionException;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.multipart.MultipartFile;
@@ -50,6 +52,8 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
 /**
  * @author Spencer Gibb
  * @author Scien Jus
+ * @author Ahmad Mozafarnia
+ * @author Aaron Whiteside
  */
 public class SpringEncoder implements Encoder {
 
@@ -57,7 +61,7 @@ public class SpringEncoder implements Encoder {
 
 	private final SpringFormEncoder springFormEncoder = new SpringFormEncoder();
 
-	private ObjectFactory<HttpMessageConverters> messageConverters;
+	private final ObjectFactory<HttpMessageConverters> messageConverters;
 
 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.messageConverters = messageConverters;
@@ -68,7 +72,6 @@ public class SpringEncoder implements Encoder {
 			throws EncodeException {
 		// template.body(conversionService.convert(object, String.class));
 		if (requestBody != null) {
-			Class<?> requestType = requestBody.getClass();
 			Collection<String> contentTypes = request.headers()
 					.get(HttpEncoding.CONTENT_TYPE);
 
@@ -78,44 +81,36 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}
 
-			if (bodyType != null && bodyType.equals(MultipartFile.class)) {
-				if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
-					this.springFormEncoder.encode(requestBody, bodyType, request);
-					return;
-				}
-				else {
-					String message = "Content-Type \"" + MediaType.MULTIPART_FORM_DATA
-							+ "\" not set for request body of type "
-							+ requestBody.getClass().getSimpleName();
-					throw new EncodeException(message);
+			if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
+				this.springFormEncoder.encode(requestBody, bodyType, request);
+				return;
+			}
+			else {
+				if (bodyType == MultipartFile.class) {
+					log.warn(
+							"For MultipartFile to be handled correctly, the 'consumes' parameter of @RequestMapping "
+									+ "should be specified as MediaType.MULTIPART_FORM_DATA_VALUE");
 				}
 			}
 
-			for (HttpMessageConverter<?> messageConverter : this.messageConverters
+			for (HttpMessageConverter messageConverter : this.messageConverters
 					.getObject().getConverters()) {
-				if (messageConverter.canWrite(requestType, requestContentType)) {
-					if (log.isDebugEnabled()) {
-						if (requestContentType != null) {
-							log.debug("Writing [" + requestBody + "] as \""
-									+ requestContentType + "\" using [" + messageConverter
-									+ "]");
-						}
-						else {
-							log.debug("Writing [" + requestBody + "] using ["
-									+ messageConverter + "]");
-						}
-
+				FeignOutputMessage outputMessage;
+				try {
+					if (messageConverter instanceof GenericHttpMessageConverter) {
+						outputMessage = checkAndWrite(requestBody, bodyType,
+								requestContentType,
+								(GenericHttpMessageConverter) messageConverter, request);
 					}
-
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-					try {
-						@SuppressWarnings("unchecked")
-						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
-						copy.write(requestBody, requestContentType, outputMessage);
-					}
-					catch (IOException ex) {
-						throw new EncodeException("Error converting request body", ex);
+					else {
+						outputMessage = checkAndWrite(requestBody, requestContentType,
+								messageConverter, request);
 					}
+				}
+				catch (IOException | HttpMessageConversionException ex) {
+					throw new EncodeException("Error converting request body", ex);
+				}
+				if (outputMessage != null) {
 					// clear headers
 					request.headers(null);
 					// converters can modify headers, so update the request
@@ -141,7 +136,7 @@ public class SpringEncoder implements Encoder {
 				}
 			}
 			String message = "Could not write request: no suitable HttpMessageConverter "
-					+ "found for request type [" + requestType.getName() + "]";
+					+ "found for request type [" + requestBody.getClass().getName() + "]";
 			if (requestContentType != null) {
 				message += " and content type [" + requestContentType + "]";
 			}
@@ -149,6 +144,49 @@ public class SpringEncoder implements Encoder {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType,
+			HttpMessageConverter converter, RequestTemplate request) throws IOException {
+		if (converter.canWrite(body.getClass(), contentType)) {
+			logBeforeWrite(body, contentType, converter);
+			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+			converter.write(body, contentType, outputMessage);
+			return outputMessage;
+		}
+		else {
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private FeignOutputMessage checkAndWrite(Object body, Type genericType,
+			MediaType contentType, GenericHttpMessageConverter converter,
+			RequestTemplate request) throws IOException {
+		if (converter.canWrite(genericType, body.getClass(), contentType)) {
+			logBeforeWrite(body, contentType, converter);
+			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+			converter.write(body, genericType, contentType, outputMessage);
+			return outputMessage;
+		}
+		else {
+			return null;
+		}
+	}
+
+	private void logBeforeWrite(Object requestBody, MediaType requestContentType,
+			HttpMessageConverter messageConverter) {
+		if (log.isDebugEnabled()) {
+			if (requestContentType != null) {
+				log.debug("Writing [" + requestBody + "] as \"" + requestContentType
+						+ "\" using [" + messageConverter + "]");
+			}
+			else {
+				log.debug(
+						"Writing [" + requestBody + "] using [" + messageConverter + "]");
+			}
+		}
+	}
+
 	private final class FeignOutputMessage implements HttpOutputMessage {
 
 		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

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

@@ -36,10 +36,12 @@ import feign.Param;
 import feign.Request;
 
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.RequestHeaderParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.RequestParamParameterProcessor;
+import org.springframework.cloud.openfeign.annotation.RequestPartParameterProcessor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.DefaultParameterNameDiscoverer;
@@ -68,6 +70,8 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
  * @author Halvdan Hoem Grelland
  * @author Aram Peres
  * @author Olga Maciaszek-Sharma
+ * @author Aaron Whiteside
+ * @author Artyom Romanenko
  */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -110,13 +114,9 @@ public class SpringMvcContract extends Contract.BaseContract
 				"Parameter processors can not be null.");
 		Assert.notNull(conversionService, "ConversionService can not be null.");
 
-		List<AnnotatedParameterProcessor> processors;
-		if (!annotatedParameterProcessors.isEmpty()) {
-			processors = new ArrayList<>(annotatedParameterProcessors);
-		}
-		else {
-			processors = getDefaultAnnotatedArgumentsProcessors();
-		}
+		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
+		processors.addAll(annotatedParameterProcessors);
+
 		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
 		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
@@ -168,15 +168,14 @@ 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;
+					if (!pathValue.equals("/")) {
+						data.template().uri(pathValue);
 					}
-					data.template().uri(pathValue);
 				}
 			}
 		}
@@ -230,11 +229,9 @@ 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;
+				if (!pathValue.equals("/")) {
+					data.template().uri(pathValue, true);
 				}
-				data.template().uri(pathValue, true);
 			}
 		}
 
@@ -355,10 +352,12 @@ public class SpringMvcContract extends Contract.BaseContract
 
 		List<AnnotatedParameterProcessor> annotatedArgumentResolvers = new ArrayList<>();
 
+		annotatedArgumentResolvers.add(new MatrixVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new PathVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestParamParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
 		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());
+		annotatedArgumentResolvers.add(new RequestPartParameterProcessor());
 
 		return annotatedArgumentResolvers;
 	}

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/DefaultGzipDecoderTests.java

@@ -90,6 +90,18 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 		assertThat(hello).as("null hello didn't match").isEqualTo(null);
 	}
 
+	@Test
+	public void testCharsetDecompress() {
+		ResponseEntity<Hello> response = testClient().getUtf8Response();
+		assertThat(response).as("response was null").isNotNull();
+		assertThat(response.getStatusCode()).as("wrong status code")
+				.isEqualTo(HttpStatus.OK);
+		Hello hello = response.getBody();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("utf8 hello didn't match")
+				.isEqualTo(new Hello("안녕하세요 means Hello in Korean"));
+	}
+
 	private static class Hello {
 
 		private String message;
@@ -136,9 +148,12 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 		@GetMapping("/nullGzipResponse")
 		ResponseEntity<Hello> getNullResponse();
 
+		@GetMapping("/utf8Response")
+		ResponseEntity<Hello> getUtf8Response();
+
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -154,6 +169,11 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 			return ResponseEntity.ok(null);
 		}
 
+		@Override
+		public ResponseEntity<Hello> getUtf8Response() {
+			return ResponseEntity.ok(new Hello("안녕하세요 means Hello in Korean"));
+		}
+
 	}
 
 }

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;
 
@@ -48,9 +46,8 @@ public class EnableFeignClientsSpringDataTests {
 				.cast(this.feignContext.getInstance("foo", Encoder.class));
 	}
 
-	@Configuration
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			FeignAutoConfiguration.class })
+	@Configuration(proxyBeanMethods = false)
+	@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;
@@ -87,8 +86,8 @@ public class EnableFeignClientsTests {
 		Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}
 
-	@Configuration
-	@Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class })
+	@Configuration(proxyBeanMethods = false)
+	@Import({ FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {
 
 	}

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;
@@ -127,10 +126,8 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").decode404(true)
-				.fallback(TestFeignClientFallback.class)
-				.fallbackFactory(TestFeignClientFallbackFactory.class).path("Path/")
-				.url("Url/").contextId("TestContext");
+				.forType(TestFeignClient.class, "TestClient").decode404(true).url("Url/")
+				.path("/Path").contextId("TestContext");
 
 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
@@ -142,9 +139,7 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "url", "http://Url/");
 		assertFactoryBeanField(builder, "path", "/Path");
 		assertFactoryBeanField(builder, "decode404", true);
-		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
-		assertFactoryBeanField(builder, "fallbackFactory",
-				TestFeignClientFallbackFactory.class);
+
 	}
 
 	@Test
@@ -167,18 +162,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/FeignClientErrorDecoderTests.java

@@ -0,0 +1,170 @@
+/*
+ * Copyright 2020-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Map;
+
+import feign.Contract;
+import feign.InvocationHandlerFactory;
+import feign.RequestLine;
+import feign.Response;
+import feign.codec.ErrorDecoder;
+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.cloud.openfeign.support.SpringMvcContract;
+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.test.util.ReflectionTestUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Michael Cramer
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignClientErrorDecoderTests.TestConfiguration.class)
+@DirtiesContext
+public class FeignClientErrorDecoderTests {
+
+	@Autowired
+	private FeignContext context;
+
+	@Autowired
+	private FooClient foo;
+
+	@Autowired
+	private BarClient bar;
+
+	@Test
+	public void clientsAvailable() {
+		assertThat(this.foo).isNotNull();
+		assertThat(this.bar).isNotNull();
+	}
+
+	@Test
+	public void errorDecoderInConfiguration() {
+		assertThat(this.context.getInstance("foo", ErrorDecoder.class))
+				.isInstanceOf(ErrorDecoder.Default.class);
+		assertThat(this.context.getInstance("bar", ErrorDecoder.class)).isNull();
+	}
+
+	@Test
+	public void useConfiguredErrorDecoderWhenAlsoErrorDecoderFactoryIsAvailable() {
+		Object errorDecoder = getErrorDecoderFromClient(this.foo);
+		assertThat(errorDecoder).isInstanceOf(ErrorDecoder.Default.class);
+	}
+
+	@Test
+	public void useErrorDecoderFromErrorDecoderFactory() {
+		Object errorDecoder = getErrorDecoderFromClient(this.bar);
+		assertThat(errorDecoder).isInstanceOf(ErrorDecoderImpl.class);
+	}
+
+	@SuppressWarnings({ "unchecked", "ConstantConditions" })
+	private Object getErrorDecoderFromClient(final Object client) {
+		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
+		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
+				.getField(invocationHandler, "dispatch");
+		Method key = new ArrayList<>(dispatch.keySet()).get(0);
+		return ReflectionTestUtils.getField(dispatch.get(key), "errorDecoder");
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
+	@EnableAutoConfiguration
+	protected static class TestConfiguration {
+
+	}
+
+	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
+	interface FooClient {
+
+		@RequestLine("GET /")
+		String get();
+
+	}
+
+	public static class FooConfiguration {
+
+		@Bean
+		Contract feignContract() {
+			return new Contract.Default();
+		}
+
+		@Bean
+		FeignErrorDecoderFactory errorDecoderFactory() {
+			return new FeignErrorDecoderFactoryImpl();
+		}
+
+		@Bean
+		ErrorDecoder feignErrorDecoder() {
+			return new ErrorDecoder.Default();
+		}
+
+	}
+
+	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
+	interface BarClient {
+
+		@RequestMapping(value = "/", method = RequestMethod.GET)
+		String get();
+
+	}
+
+	public static class BarConfiguration {
+
+		@Bean
+		Contract feignContract() {
+			return new SpringMvcContract();
+		}
+
+		@Bean
+		FeignErrorDecoderFactory errorDecoderFactory() {
+			return new FeignErrorDecoderFactoryImpl();
+		}
+
+	}
+
+	public static class FeignErrorDecoderFactoryImpl implements FeignErrorDecoderFactory {
+
+		@Override
+		public ErrorDecoder create(final Class<?> type) {
+			return new ErrorDecoderImpl();
+		}
+
+	}
+
+	public static class ErrorDecoderImpl implements ErrorDecoder {
+
+		@Override
+		public Exception decode(final String methodKey, final Response response) {
+			return null;
+		}
+
+	}
+
+}

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

@@ -16,14 +16,30 @@
 
 package org.springframework.cloud.openfeign;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
 
+import feign.Client;
+import feign.InvocationHandlerFactory;
 import org.junit.Test;
 
+import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 /**
  * @author Spencer Gibb
@@ -49,10 +65,74 @@ public class FeignClientFactoryTests {
 		assertThat(foobar).as("bar was not null").isNull();
 	}
 
+	@Test
+	public void shouldRedirectToDelegateWhenUrlSet() {
+		new ApplicationContextRunner().withUserConfiguration(TestConfig.class)
+				.run(this::defaultClientUsed);
+	}
+
+	@SuppressWarnings({ "unchecked", "ConstantConditions" })
+	private void defaultClientUsed(AssertableApplicationContext context) {
+		Proxy target = context.getBean(FeignClientFactoryBean.class).getTarget();
+		Object invocationHandler = ReflectionTestUtils.getField(target, "h");
+		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
+				.getField(invocationHandler, "dispatch");
+		Method key = new ArrayList<>(dispatch.keySet()).get(0);
+		Object client = ReflectionTestUtils.getField(dispatch.get(key), "client");
+		assertThat(client).isInstanceOf(Client.Default.class);
+	}
+
 	private FeignClientSpecification getSpec(String name, Class<?> configClass) {
 		return new FeignClientSpecification(name, new Class[] { configClass });
 	}
 
+	interface TestType {
+
+		@RequestMapping(value = "/", method = GET)
+		String hello();
+
+	}
+
+	@Configuration
+	static class TestConfig {
+
+		@Bean
+		BlockingLoadBalancerClient loadBalancerClient() {
+			return new BlockingLoadBalancerClient(new LoadBalancerClientFactory());
+		}
+
+		@Bean
+		FeignContext feignContext() {
+			FeignContext feignContext = new FeignContext();
+			feignContext.setConfigurations(
+					Collections.singletonList(new FeignClientSpecification("test",
+							new Class[] { LoadBalancerAutoConfiguration.class })));
+			return feignContext;
+		}
+
+		@Bean
+		FeignClientProperties feignClientProperties() {
+			return new FeignClientProperties();
+		}
+
+		@Bean
+		Targeter targeter() {
+			return new DefaultTargeter();
+		}
+
+		@Bean
+		FeignClientFactoryBean feignClientFactoryBean() {
+			FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
+			feignClientFactoryBean.setContextId("test");
+			feignClientFactoryBean.setName("test");
+			feignClientFactoryBean.setType(TestType.class);
+			feignClientFactoryBean.setPath("");
+			feignClientFactoryBean.setUrl("http://some.absolute.url");
+			return feignClientFactoryBean;
+		}
+
+	}
+
 	static class FooConfig {
 
 		@Bean

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

@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign;
 
 import feign.Contract;
-import feign.Feign;
+import feign.ExceptionPropagationPolicy;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
@@ -29,7 +29,6 @@ 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;
@@ -37,14 +36,12 @@ 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;
@@ -120,13 +117,6 @@ public class FeignClientOverrideDefaultsTests {
 				.cast(this.context.getInstance("bar", ErrorDecoder.class));
 	}
 
-	@Test
-	public void overrideBuilder() {
-		HystrixFeign.Builder.class
-				.cast(this.context.getInstance("foo", Feign.Builder.class));
-		Feign.Builder.class.cast(this.context.getInstance("bar", Feign.Builder.class));
-	}
-
 	@Test
 	public void overrideRequestOptions() {
 		assertThat(this.context.getInstance("foo", Request.Options.class)).isNull();
@@ -151,6 +141,14 @@ public class FeignClientOverrideDefaultsTests {
 				.isEqualTo(2);
 	}
 
+	@Test
+	public void exceptionPropagationPolicy() {
+		assertThat(this.context.getInstances("foo", ExceptionPropagationPolicy.class))
+				.isNull();
+		assertThat(this.context.getInstances("bar", ExceptionPropagationPolicy.class))
+				.containsValues(ExceptionPropagationPolicy.UNWRAP);
+	}
+
 	@FeignClient(name = "foo", url = "https://foo",
 			configuration = FooConfiguration.class)
 	interface FooClient {
@@ -169,10 +167,9 @@ public class FeignClientOverrideDefaultsTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			FeignAutoConfiguration.class })
+	@EnableAutoConfiguration
 	protected static class TestConfiguration {
 
 		@Bean
@@ -208,11 +205,6 @@ public class FeignClientOverrideDefaultsTests {
 			return new Contract.Default();
 		}
 
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new feign.QueryMapEncoder.Default();
@@ -252,6 +244,11 @@ public class FeignClientOverrideDefaultsTests {
 			return new BeanQueryMapEncoder();
 		}
 
+		@Bean
+		public ExceptionPropagationPolicy exceptionPropagationPolicy() {
+			return ExceptionPropagationPolicy.UNWRAP;
+		}
+
 	}
 
 }

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

@@ -16,13 +16,14 @@
 
 package org.springframework.cloud.openfeign;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
+import java.net.SocketTimeoutException;
 import java.util.Collections;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -50,7 +51,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -78,6 +78,8 @@ public class FeignClientUsingPropertiesTests {
 
 	private FeignClientFactoryBean barFactoryBean;
 
+	private FeignClientFactoryBean unwrapFactoryBean;
+
 	private FeignClientFactoryBean formFactoryBean;
 
 	public FeignClientUsingPropertiesTests() {
@@ -89,6 +91,10 @@ public class FeignClientUsingPropertiesTests {
 		this.barFactoryBean.setContextId("bar");
 		this.barFactoryBean.setType(FeignClientFactoryBean.class);
 
+		this.unwrapFactoryBean = new FeignClientFactoryBean();
+		this.unwrapFactoryBean.setContextId("unwrap");
+		this.unwrapFactoryBean.setType(FeignClientFactoryBean.class);
+
 		this.formFactoryBean = new FeignClientFactoryBean();
 		this.formFactoryBean.setContextId("form");
 		this.formFactoryBean.setType(FeignClientFactoryBean.class);
@@ -106,6 +112,12 @@ public class FeignClientUsingPropertiesTests {
 				"http://localhost:" + this.port);
 	}
 
+	public UnwrapClient unwrapClient() {
+		this.unwrapFactoryBean.setApplicationContext(this.applicationContext);
+		return this.unwrapFactoryBean.feign(this.context).target(UnwrapClient.class,
+				"http://localhost:" + this.port);
+	}
+
 	public FormClient formClient() {
 		this.formFactoryBean.setApplicationContext(this.applicationContext);
 		return this.formFactoryBean.feign(this.context).target(FormClient.class,
@@ -124,6 +136,12 @@ public class FeignClientUsingPropertiesTests {
 		fail("it should timeout");
 	}
 
+	@Test(expected = SocketTimeoutException.class)
+	public void testUnwrap() throws Exception {
+		unwrapClient().unwrap();
+		fail("it should timeout");
+	}
+
 	@Test
 	public void testForm() {
 		Map<String, String> request = Collections.singletonMap("form", "Data");
@@ -145,6 +163,13 @@ public class FeignClientUsingPropertiesTests {
 
 	}
 
+	protected interface UnwrapClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/bar") // intentionally /bar
+		String unwrap() throws IOException;
+
+	}
+
 	protected interface FormClient {
 
 		@RequestMapping(value = "/form", method = RequestMethod.POST,
@@ -153,7 +178,7 @@ public class FeignClientUsingPropertiesTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -233,7 +258,7 @@ public class FeignClientUsingPropertiesTests {
 
 			requestTemplate.header(HttpHeaders.CONTENT_TYPE,
 					MediaType.APPLICATION_FORM_URLENCODED_VALUE);
-			requestTemplate.body(Request.Body.bodyTemplate(builder.toString(), UTF_8));
+			requestTemplate.body(builder.toString());
 		}
 
 	}

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

@@ -107,14 +107,14 @@ public class FeignClientsRegistrarTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
 	protected static class FallbackTestConfig {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableFeignClients(
 			clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class })

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))
@@ -71,7 +69,7 @@ public class FeignCompressionTests {
 				});
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class PlainConfig {
 
 		@Autowired

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

@@ -0,0 +1,125 @@
+/*
+ * Copyright 2020-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.Response;
+import feign.codec.ErrorDecoder;
+import org.junit.Test;
+
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Michael Cramer
+ */
+public class FeignErrorDecoderFactoryTests {
+
+	@Test
+	public void testNoDefaultFactory() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				SampleConfiguration1.class);
+		String[] beanNamesForType = context
+				.getBeanNamesForType(FeignErrorDecoderFactory.class);
+		assertThat(beanNamesForType).isEmpty();
+		context.close();
+	}
+
+	@Test
+	public void testCustomErrorDecoderFactory() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				SampleConfiguration2.class);
+		FeignErrorDecoderFactory errorDecoderFactory = context
+				.getBean(FeignErrorDecoderFactory.class);
+		assertThat(errorDecoderFactory).isNotNull();
+		ErrorDecoder errorDecoder = errorDecoderFactory.create(Object.class);
+		assertThat(errorDecoder).isNotNull();
+		assertThat(errorDecoder instanceof ErrorDecoderImpl).isTrue();
+		context.close();
+	}
+
+	@Test
+	public void testCustomErrorDecoderFactoryNotOverwritingErrorDecoder() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				SampleConfiguration3.class);
+		FeignErrorDecoderFactory errorDecoderFactory = context
+				.getBean(FeignErrorDecoderFactory.class);
+		assertThat(errorDecoderFactory).isNotNull();
+		ErrorDecoder errorDecoderFromFactory = errorDecoderFactory.create(Object.class);
+		assertThat(errorDecoderFromFactory).isNotNull();
+		assertThat(errorDecoderFromFactory instanceof ErrorDecoderImpl).isTrue();
+		ErrorDecoder errorDecoder = context.getBean(ErrorDecoder.class);
+		assertThat(errorDecoder).isNotNull();
+		assertThat(errorDecoder instanceof ErrorDecoder.Default).isTrue();
+		context.close();
+	}
+
+	@Configuration
+	@Import(FeignClientsConfiguration.class)
+	protected static class SampleConfiguration1 {
+
+	}
+
+	@Configuration
+	@Import(FeignClientsConfiguration.class)
+	protected static class SampleConfiguration2 {
+
+		@Bean
+		public FeignErrorDecoderFactory errorDecoderFactory() {
+			return new ErrorDecoderFactoryImpl();
+		}
+
+	}
+
+	@Configuration
+	@Import(FeignClientsConfiguration.class)
+	protected static class SampleConfiguration3 {
+
+		@Bean
+		public FeignErrorDecoderFactory errorDecoderFactory() {
+			return new ErrorDecoderFactoryImpl();
+		}
+
+		@Bean
+		public ErrorDecoder errorDecoder() {
+			return new ErrorDecoder.Default();
+		}
+
+	}
+
+	static class ErrorDecoderFactoryImpl implements FeignErrorDecoderFactory {
+
+		@Override
+		public ErrorDecoder create(final Class<?> type) {
+			return new ErrorDecoderImpl();
+		}
+
+	}
+
+	static class ErrorDecoderImpl implements ErrorDecoder {
+
+		@Override
+		public Exception decode(final String methodKey, final Response response) {
+			return null;
+		}
+
+	}
+
+}

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

@@ -129,7 +129,7 @@ public class FeignHttpClientUrlTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class,

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

@@ -69,13 +69,13 @@ public class FeignLoggerFactoryTests {
 		context.close();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration1 {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration2 {
 
@@ -95,7 +95,7 @@ public class FeignLoggerFactoryTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration3 {
 

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

@@ -25,10 +25,10 @@ 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;
@@ -56,7 +56,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 	@Autowired
 	FeignContext context;
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	private int port = 0;
 
 	public SpringDecoderTests() {
@@ -215,7 +215,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)

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

@@ -1,77 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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;
@@ -112,7 +117,7 @@ public class FeignClientTests {
 		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients
@@ -170,7 +175,7 @@ public class FeignClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class TestDefaultFeignConfig {
 
 	}

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/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)
@@ -83,18 +81,16 @@ public class FeignAcceptEncodingTests {
 
 	}
 
-	@Configuration
-	static class LocalRibbonClientConfiguration {
+	@Configuration(proxyBeanMethods = false)
+	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)
@@ -87,18 +85,16 @@ public class FeignContentEncodingTests {
 
 	}
 
-	@Configuration
-	static class LocalRibbonClientConfiguration {
+	@Configuration(proxyBeanMethods = false)
+	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,20 +16,16 @@
 
 package org.springframework.cloud.openfeign.encoding;
 
-import java.util.Collections;
-
-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;
@@ -38,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.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -85,7 +82,7 @@ public class FeignPageableEncodingTests {
 	}
 
 	@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 })
@@ -95,18 +92,16 @@ public class FeignPageableEncodingTests {
 
 	}
 
-	@Configuration
-	static class LocalRibbonClientConfiguration {
+	@Configuration(proxyBeanMethods = false)
+	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/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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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,48 +72,7 @@ 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
+	@Configuration(proxyBeanMethods = false)
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
 	protected static class NameAndServiceIdConfiguration {
@@ -137,8 +87,7 @@ public class FeignClientValidationTests {
 
 	}
 
-	@Configuration
-
+	@Configuration(proxyBeanMethods = false)
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(
 			clients = { DuplicatedFeignClientNamesConfiguration.FooClient.class,
@@ -163,7 +112,7 @@ public class FeignClientValidationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = BadHostnameConfiguration.Client.class)
 	protected static class BadHostnameConfiguration {
@@ -178,123 +127,4 @@ public class FeignClientValidationTests {
 
 	}
 
-	@Configuration
-	@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
-	@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
-	@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
-	@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/FeignBlockingLoadBalancerClientTests.java

@@ -121,7 +121,7 @@ class FeignBlockingLoadBalancerClientTests {
 		assertThat(actualRequest.headers()).hasSize(1);
 		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
 				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
-		assertThat(actualRequest.requestBody().asString()).isEqualTo("hello");
+		assertThat(new String(actualRequest.body())).isEqualTo("hello");
 	}
 
 	private Request testRequest() {
@@ -130,8 +130,7 @@ class FeignBlockingLoadBalancerClientTests {
 
 	private Request testRequest(String host) {
 		return Request.create(Request.HttpMethod.GET, "http://" + host + "/path",
-				testHeaders(),
-				Request.Body.encoded("hello".getBytes(), StandardCharsets.UTF_8));
+				testHeaders(), "hello".getBytes(), StandardCharsets.UTF_8, null);
 	}
 
 	private Map<String, Collection<String>> testHeaders() {

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,53 +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");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, Client.Default.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
 	}
 
 	@Test
-	void shouldInstantiateHttpFeignClientWhenEnabled() {
+	public void shouldInstantiateHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext(
 				"spring.cloud.loadbalancer.ribbon.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, ApacheHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
 	}
 
 	@Test
-	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
+	public void shouldInstantiateOkHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=false",
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, OkHttpClient.class);
-		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
-	}
-
-	@Test
-	void shouldNotProcessLoadBalancerConfigurationWhenRibbonEnabled() {
-		ConfigurableApplicationContext context = initContext(
-				"spring.cloud.loadbalancer.ribbon.enabled=true");
-		assertThatOneBeanPresent(context, LoadBalancerFeignClient.class);
-		assertThatBeanNotPresent(context, BlockingLoadBalancerClient.class);
-		assertThatBeanNotPresent(context, FeignBlockingLoadBalancerClient.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();
 	}
@@ -93,21 +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 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/ribbon/CachingSpringLoadBalancerFactoryTests.java

@@ -1,106 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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);
-
-		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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-	@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
-	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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-	@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
-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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-	@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-	@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
-	@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-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		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) {
-		}
-
-	}
-
-}

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

@@ -1,67 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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 java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import feign.Request;
-import feign.Response;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import org.springframework.util.StreamUtils;
-
-import static feign.Request.HttpMethod.GET;
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Ryan Baxter
- */
-@RunWith(MockitoJUnitRunner.class)
-public class RibbonResponseStatusCodeExceptionTest {
-
-	@Test
-	public void getResponse() throws Exception {
-		Map<String, Collection<String>> headers = new HashMap<String, Collection<String>>();
-		List<String> fooValues = new ArrayList<String>();
-		fooValues.add("bar");
-		headers.put("foo", fooValues);
-		Request request = Request.create(GET, "https://service.com",
-				new HashMap<String, Collection<String>>(), new byte[] {},
-				Charset.defaultCharset());
-		byte[] body = "foo".getBytes();
-		ByteArrayInputStream is = new ByteArrayInputStream(body);
-		Response response = Response.builder().status(200).reason("Success")
-				.request(request).body(is, body.length).headers(headers).build();
-		RibbonResponseStatusCodeException ex = new RibbonResponseStatusCodeException(
-				"service", response, body, new URI(request.url()));
-		assertThat(ex.getResponse().status()).isEqualTo(200);
-		assertThat(ex.getResponse().request()).isEqualTo(request);
-		assertThat(ex.getResponse().reason()).isEqualTo("Success");
-		assertThat(StreamUtils.copyToString(ex.getResponse().body().asInputStream(),
-				Charset.defaultCharset())).isEqualTo("foo");
-	}
-
-}

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

@@ -91,7 +91,7 @@ public class FeignHttpClientPropertiesTests {
 		return this.context.getBean(FeignHttpClientProperties.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	protected static class TestConfiguration {
 

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

@@ -68,13 +68,8 @@ public class PageableEncoderTests {
 		// Request page shall contain page
 		assertThat(request.queries().get("page")).contains(String.valueOf(PAGE));
 		// Request size shall contain size
-		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE)); // Request
-																					// sort
-																					// size
-																					// shall
-																					// contain
-																					// sort
-																					// entries
+		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE));
+		// Request sort size shall contain sort entries
 		assertThat(request.queries().get("sort")).hasSize(2);
 	}
 
@@ -92,13 +87,8 @@ public class PageableEncoderTests {
 		// Request page shall contain page
 		assertThat(request.queries().get("page")).contains(String.valueOf(PAGE));
 		// Request size shall contain size
-		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE)); // Request
-																					// sort
-																					// size
-																					// shall
-																					// contain
-																					// sort
-																					// entries
+		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE));
+		// Request sort size shall contain sort entries
 		assertThat(request.queries()).doesNotContainKey("sort");
 	}
 

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

@@ -16,10 +16,11 @@
 
 package org.springframework.cloud.openfeign.support;
 
-import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import feign.RequestTemplate;
@@ -27,7 +28,6 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,12 +35,15 @@ 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.FeignContext;
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractGenericHttpMessageConverter;
+import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
@@ -60,6 +63,7 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
 /**
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
+ * @author Ahmad Mozafarnia
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringEncoderTests.Application.class,
@@ -75,6 +79,10 @@ public class SpringEncoderTests {
 	@Qualifier("myHttpMessageConverter")
 	private HttpMessageConverter<?> myConverter;
 
+	@Autowired
+	@Qualifier("myGenericHttpMessageConverter")
+	private GenericHttpMessageConverter<?> myGenericConverter;
+
 	@Test
 	public void testCustomHttpMessageConverter() {
 		Encoder encoder = this.context.getInstance("foo", Encoder.class);
@@ -94,7 +102,35 @@ public class SpringEncoderTests {
 
 		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
 		assertThat(request.requestCharset()).as("request charset is wrong")
-				.isEqualTo(Charset.forName("UTF-8"));
+				.isEqualTo(StandardCharsets.UTF_8);
+	}
+
+	// gh-225
+	@Test
+	public void testCustomGenericHttpMessageConverter() {
+		Encoder encoder = this.context.getInstance("foo", Encoder.class);
+		assertThat(encoder).isNotNull();
+		RequestTemplate request = new RequestTemplate();
+
+		ParameterizedTypeReference<List<String>> stringListType = new ParameterizedTypeReference<List<String>>() {
+		};
+
+		request.header(HttpEncoding.CONTENT_TYPE, "application/mygenerictype");
+		encoder.encode(Collections.singletonList("hi"), stringListType.getType(),
+				request);
+
+		Collection<String> contentTypeHeader = request.headers().get("Content-Type");
+		assertThat(contentTypeHeader).as("missing content type header").isNotNull();
+		assertThat(contentTypeHeader.isEmpty()).as("missing content type header")
+				.isFalse();
+
+		String header = contentTypeHeader.iterator().next();
+		assertThat(header).as("content type header is wrong")
+				.isEqualTo("application/mygenerictype");
+
+		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
+		assertThat(request.requestCharset()).as("request charset is wrong")
+				.isEqualTo(StandardCharsets.UTF_8);
 	}
 
 	@Test
@@ -120,8 +156,6 @@ public class SpringEncoderTests {
 		MultipartFile multipartFile = new MockMultipartFile("test_multipart_file",
 				"hi".getBytes());
 		encoder.encode(multipartFile, MultipartFile.class, request);
-
-		assertThat(request.requestCharset()).as("request charset is not null").isNull();
 	}
 
 	// gh-105, gh-107
@@ -169,7 +203,7 @@ public class SpringEncoderTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application implements TestClient {
@@ -179,6 +213,11 @@ public class SpringEncoderTests {
 			return new MyHttpMessageConverter();
 		}
 
+		@Bean
+		GenericHttpMessageConverter<?> myGenericHttpMessageConverter() {
+			return new MyGenericHttpMessageConverter();
+		}
+
 		private static class MyHttpMessageConverter
 				extends AbstractGenericHttpMessageConverter<Object> {
 
@@ -204,20 +243,77 @@ public class SpringEncoderTests {
 			@Override
 			protected void writeInternal(Object o, Type type,
 					HttpOutputMessage outputMessage)
-					throws IOException, HttpMessageNotWritableException {
+					throws HttpMessageNotWritableException {
 
 			}
 
 			@Override
 			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
-					throws IOException, HttpMessageNotReadableException {
+					throws HttpMessageNotReadableException {
 				return null;
 			}
 
 			@Override
 			public Object read(Type type, Class<?> contextClass,
 					HttpInputMessage inputMessage)
-					throws IOException, HttpMessageNotReadableException {
+					throws HttpMessageNotReadableException {
+				return null;
+			}
+
+		}
+
+		private static class MyGenericHttpMessageConverter
+				extends AbstractGenericHttpMessageConverter<Object> {
+
+			MyGenericHttpMessageConverter() {
+				super(new MediaType("application", "mygenerictype"));
+			}
+
+			private boolean isStringList(Type type) {
+				if (type instanceof ParameterizedType) {
+					ParameterizedType parameterizedType = (ParameterizedType) type;
+					return parameterizedType.getRawType() == List.class
+							&& parameterizedType
+									.getActualTypeArguments()[0] == String.class;
+				}
+				else {
+					return false;
+				}
+			}
+
+			@Override
+			protected boolean supports(Class<?> clazz) {
+				return clazz == List.class;
+			}
+
+			@Override
+			public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
+				return canWrite(mediaType) && isStringList(type);
+			}
+
+			@Override
+			public boolean canRead(Type type, Class<?> contextClass,
+					MediaType mediaType) {
+				return canRead(mediaType) && isStringList(type);
+			}
+
+			@Override
+			protected void writeInternal(Object o, Type type,
+					HttpOutputMessage outputMessage)
+					throws HttpMessageNotWritableException {
+
+			}
+
+			@Override
+			public Object read(Type type, Class<?> contextClass,
+					HttpInputMessage inputMessage)
+					throws HttpMessageNotReadableException {
+				return null;
+			}
+
+			@Override
+			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
+					throws HttpMessageNotReadableException {
 				return null;
 			}
 
@@ -225,27 +321,4 @@ public class SpringEncoderTests {
 
 	}
 
-	class MediaTypeMatcher implements ArgumentMatcher<MediaType> {
-
-		private MediaType mediaType;
-
-		MediaTypeMatcher(String type, String subtype) {
-			this.mediaType = new MediaType(type, subtype);
-		}
-
-		@Override
-		public boolean matches(MediaType argument) {
-			return this.mediaType.equals(argument);
-		}
-
-		@Override
-		public String toString() {
-			final StringBuffer sb = new StringBuffer("MediaTypeMatcher{");
-			sb.append("mediaType=").append(this.mediaType);
-			sb.append('}');
-			return sb.toString();
-		}
-
-	}
-
 }

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

@@ -23,6 +23,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -30,8 +31,11 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import feign.MethodMetadata;
 import feign.Param;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.core.convert.ConversionService;
@@ -45,6 +49,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.MatrixVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -52,19 +57,22 @@ 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.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
 
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
-import static org.springframework.web.util.UriUtils.encode;
 
 /**
  * @author chadjaros
  * @author Halvdan Hoem Grelland
  * @author Aram Peres
+ * @author Aaron Whiteside
+ * @author Artyom Romanenko
  */
+@RunWith(JUnitParamsRunner.class)
 public class SpringMvcContractTests {
 
 	private static final Class<?> EXECUTABLE_TYPE;
@@ -244,7 +252,7 @@ public class SpringMvcContractTests {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-				.isEqualTo("/advanced/test/{id}?amount=" + encode("{amount}", UTF_8));
+				.isEqualTo("/advanced/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -268,7 +276,7 @@ public class SpringMvcContractTests {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-				.isEqualTo("/advanced/test/{id}?amount=" + encode("{amount}", UTF_8));
+				.isEqualTo("/advanced/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -293,7 +301,7 @@ public class SpringMvcContractTests {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-				.isEqualTo("/advanced/test2?amount=" + encode("{amount}", UTF_8));
+				.isEqualTo("/advanced/test2?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -380,7 +388,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url()).isEqualTo("/test?id=" + encode("{id}", UTF_8));
+		assertThat(data.template().url()).isEqualTo("/test?id=" + "{id}");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().queries().get("id").toString()).isEqualTo("[{id}]");
 		assertThat(data.indexToExpander().get(0)).isNotNull();
@@ -393,7 +401,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url()).isEqualTo("/test?id=" + encode("{id}", UTF_8));
+		assertThat(data.template().url()).isEqualTo("/test?id=" + "{id}");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().queries().get("id").toString()).isEqualTo("[{id}]");
 		assertThat(data.indexToExpander().get(0)).isNotNull();
@@ -448,8 +456,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url()).isEqualTo(
-				"/advanced/testfallback/{id}?amount=" + encode("{amount}", UTF_8));
+		assertThat(data.template().url())
+				.isEqualTo("/advanced/testfallback/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -493,8 +501,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-				.isEqualTo("/queryMap?aParam=" + encode("{aParam}", UTF_8));
+		assertThat(data.template().url()).isEqualTo("/queryMap?aParam=" + "{aParam}");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.queryMapIndex().intValue()).isEqualTo(0);
 		Map<String, Collection<String>> params = data.template().queries();
@@ -509,7 +516,7 @@ public class SpringMvcContractTests {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-				.isEqualTo("/queryMapObject?aParam=" + encode("{aParam}", UTF_8));
+				.isEqualTo("/queryMapObject?aParam=" + "{aParam}");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.queryMapIndex().intValue()).isEqualTo(0);
 		Map<String, Collection<String>> params = data.template().queries();
@@ -523,6 +530,51 @@ public class SpringMvcContractTests {
 		this.contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
 	}
 
+	@Test
+	public void testMatrixVariable_MapParam() throws Exception {
+		Method method = TestTemplate_MatrixVariable.class
+				.getDeclaredMethod("matrixVariable", Map.class);
+		MethodMetadata data = this.contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		Map<String, String> testMap = new HashMap<>();
+		testMap.put("param", "value");
+
+		assertThat(data.template().method()).isEqualTo("GET");
+		assertThat(data.template().url()).isEqualTo("/matrixVariable/{params}");
+		assertThat(";param=value")
+				.isEqualTo(data.indexToExpander().get(0).expand(testMap));
+	}
+
+	@Test
+	public void testMatrixVariable_ObjectParam() throws Exception {
+		Method method = TestTemplate_MatrixVariable.class
+				.getDeclaredMethod("matrixVariableObject", Object.class);
+		MethodMetadata data = this.contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().method()).isEqualTo("GET");
+		assertThat(data.template().url()).isEqualTo("/matrixVariableObject/{param}");
+		assertThat(";param=value")
+				.isEqualTo(data.indexToExpander().get(0).expand("value"));
+	}
+
+	@Test
+	public void testMatrixVariableWithNoName() throws NoSuchMethodException {
+		Method method = TestTemplate_MatrixVariable.class
+				.getDeclaredMethod("matrixVariableNotNamed", Map.class);
+		MethodMetadata data = this.contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		Map<String, String> testMap = new HashMap<>();
+
+		testMap.put("param", "value");
+
+		assertThat(data.template().method()).isEqualTo("GET");
+		assertThat(data.template().url()).isEqualTo("/matrixVariable/{params}");
+		assertThat(";param=value")
+				.isEqualTo(data.indexToExpander().get(0).expand(testMap));
+	}
+
 	@Test
 	public void testAddingTemplatedParameterWithTheSameKey()
 			throws NoSuchMethodException {
@@ -535,6 +587,63 @@ public class SpringMvcContractTests {
 				"{Accept}");
 	}
 
+	private Class[] doubleMappingClassesProvider() {
+		return new Class[] { TestTemplate_RequestMapping_Empty_Class.class,
+				TestTemplate_RequestMapping_Empty_Method.class };
+	}
+
+	@Test
+	@Parameters(method = "doubleMappingClassesProvider")
+	public void testDoubleRequestMapping_root(Class clazz) throws NoSuchMethodException {
+		Method method = clazz.getDeclaredMethod("root");
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/");
+	}
+
+	@Test
+	@Parameters(method = "doubleMappingClassesProvider")
+	public void testDoubleRequestMapping_rootReverse(Class clazz)
+			throws NoSuchMethodException {
+		Method method = clazz.getDeclaredMethod("rootReverse");
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/");
+	}
+
+	@Test
+	@Parameters(method = "doubleMappingClassesProvider")
+	public void testDoubleRequestMapping_sub(Class clazz) throws NoSuchMethodException {
+		Method method = clazz.getDeclaredMethod("sub");
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/sub");
+	}
+
+	@Test
+	@Parameters(method = "doubleMappingClassesProvider")
+	public void testDoubleRequestMapping_subEmpty(Class clazz)
+			throws NoSuchMethodException {
+		Method method = clazz.getDeclaredMethod("subEmpty");
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().url()).isEqualTo("/subEmpty");
+	}
+
+	@Test
+	public void testMultipleRequestPartAnnotations() throws NoSuchMethodException {
+		Method method = TestTemplate_RequestPart.class.getDeclaredMethod(
+				"requestWithMultipleParts", MultipartFile.class, String.class);
+
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		assertThat(data.formParams()).contains("file", "id");
+	}
+
 	public interface TestTemplate_Simple {
 
 		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
@@ -639,6 +748,28 @@ public class SpringMvcContractTests {
 
 	}
 
+	public interface TestTemplate_RequestPart {
+
+		@RequestMapping(path = "/requestPart", method = RequestMethod.POST,
+				consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+		void requestWithMultipleParts(@RequestPart("file") MultipartFile file,
+				@RequestPart("id") String identifier);
+
+	}
+
+	public interface TestTemplate_MatrixVariable {
+
+		@RequestMapping(path = "/matrixVariable/{params}")
+		String matrixVariable(@MatrixVariable("params") Map<String, Object> params);
+
+		@RequestMapping(path = "/matrixVariableObject/{param}")
+		String matrixVariableObject(@MatrixVariable("param") Object object);
+
+		@RequestMapping(path = "/matrixVariable/{params}")
+		String matrixVariableNotNamed(@MatrixVariable Map<String, Object> params);
+
+	}
+
 	@JsonAutoDetect
 	@RequestMapping("/advanced")
 	public interface TestTemplate_Advanced {
@@ -691,6 +822,40 @@ public class SpringMvcContractTests {
 
 	}
 
+	@RequestMapping("")
+	public interface TestTemplate_RequestMapping_Empty_Class {
+
+		@RequestMapping("/")
+		String root();
+
+		@RequestMapping("")
+		String rootReverse();
+
+		@RequestMapping("/sub")
+		String sub();
+
+		@RequestMapping("subEmpty")
+		String subEmpty();
+
+	}
+
+	@RequestMapping("/")
+	public interface TestTemplate_RequestMapping_Empty_Method {
+
+		@RequestMapping("")
+		String root();
+
+		@RequestMapping("/")
+		String rootReverse();
+
+		@RequestMapping("/sub")
+		String sub();
+
+		@RequestMapping("subEmpty")
+		String subEmpty();
+
+	}
+
 	@JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE,
 			setterVisibility = NONE)
 	public class TestObject {

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

@@ -48,7 +48,7 @@ import org.springframework.cloud.commons.httpclient.DefaultApacheHttpClientConne
 import org.springframework.cloud.commons.httpclient.DefaultApacheHttpClientFactory;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
@@ -65,8 +65,7 @@ import static org.mockito.Mockito.mockingDetails;
  * @author Ryan Baxter
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(
-		properties = { "feign.okhttp.enabled: false", "ribbon.eureka.enabled = false" })
+@SpringBootTest(properties = { "feign.okhttp.enabled: false" })
 @DirtiesContext
 public class ApacheHttpClientConfigurationTests {
 
@@ -77,7 +76,7 @@ public class ApacheHttpClientConfigurationTests {
 	ApacheHttpClientFactory httpClientFactory;
 
 	@Autowired
-	LoadBalancerFeignClient feignClient;
+	FeignBlockingLoadBalancerClient feignClient;
 
 	@Test
 	public void testFactories() {
@@ -160,7 +159,7 @@ public class ApacheHttpClientConfigurationTests {
 
 		}
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		static class MyConfig {
 
 			@Bean

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

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter {
 
 	@Override

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

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.openfeign.test;
 
-import java.lang.reflect.Field;
 import java.util.concurrent.TimeUnit;
 
 import feign.Client;
@@ -35,11 +34,11 @@ import org.springframework.cloud.commons.httpclient.DefaultOkHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.ReflectionUtils;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -64,7 +63,7 @@ public class OkHttpClientConfigurationTests {
 	OkHttpClientConnectionPoolFactory connectionPoolFactory;
 
 	@Autowired
-	LoadBalancerFeignClient feignClient;
+	FeignBlockingLoadBalancerClient feignClient;
 
 	@Test
 	public void testFactories() {
@@ -88,13 +87,11 @@ public class OkHttpClientConfigurationTests {
 	}
 
 	protected <T> T getField(Object target, String name) {
-		Field field = ReflectionUtils.findField(target.getClass(), name);
-		ReflectionUtils.makeAccessible(field);
-		Object value = ReflectionUtils.getField(field, target);
+		Object value = ReflectionTestUtils.getField(target, target.getClass(), name);
 		return (T) value;
 	}
 
-	@FeignClient(name = "foo", serviceId = "foo")
+	@FeignClient(name = "foo")
 	interface FooClient {
 
 	}

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

@@ -33,7 +33,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ NoopDiscoveryClientAutoConfiguration.class })
 @AutoConfigureBefore(SecurityAutoConfiguration.class)
 public class TestAutoConfiguration {
@@ -42,7 +42,7 @@ public class TestAutoConfiguration {
 
 	public static final String PASSWORD = "{noop}password";
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	protected static class TestSecurityConfiguration
 			extends WebSecurityConfigurerAdapter {