Update SNAPSHOT to 2.2.4.RELEASE

Revert "Fix double @RequestMapping with empty value (#245 )"
This reverts commit 0afb60a72a. # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java
2020-07-31 20:51:47 +00:00 · 2020-07-30 16:18:25 +02:00 · 2020-07-17 15:05:21 +02:00 · 2020-07-14 17:38:02 +02:00 · 2020-07-14 16:02:28 +02:00 · 2020-07-14 15:19:58 +02:00
89 changed files with 5124 additions and 815 deletions
@@ -4,6 +4,7 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////

+
 image:https://circleci.com/gh/spring-cloud/spring-cloud-openfeign.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-openfeign"]

 image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
@@ -312,4 +313,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.

-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0-M2</version>
+		<version>2.2.4.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -15,7 +15,6 @@
 	<properties>
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 	</properties>
@@ -25,16 +24,6 @@
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
@@ -45,11 +34,9 @@
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
@@ -61,7 +48,6 @@
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>
@@ -1,23 +1,23 @@
 |===
 |Name | Default | Description

-|feign.client.config |  | null
-|feign.client.default-config | default | null
-|feign.client.default-to-properties | true | null
+|feign.client.config |  | 
+|feign.client.default-config | default | 
+|feign.client.default-to-properties | true | 
 |feign.compression.request.enabled | false | Enables the request sent by Feign to be compressed.
 |feign.compression.request.mime-types | [text/xml, application/xml, application/json] | The list of supported mime types.
 |feign.compression.request.min-request-size | 2048 | The minimum threshold content size.
 |feign.compression.response.enabled | false | Enables the response from Feign to be compressed.
 |feign.compression.response.useGzipDecoder | false | Enables the default gzip decoder to be used.
-|feign.httpclient.connection-timeout | 2000 | null
-|feign.httpclient.connection-timer-repeat | 3000 | null
-|feign.httpclient.disable-ssl-validation | false | null
+|feign.httpclient.connection-timeout | 2000 | 
+|feign.httpclient.connection-timer-repeat | 3000 | 
+|feign.httpclient.disable-ssl-validation | false | 
 |feign.httpclient.enabled | true | Enables the use of the Apache HTTP Client by Feign.
-|feign.httpclient.follow-redirects | true | null
-|feign.httpclient.max-connections | 200 | null
-|feign.httpclient.max-connections-per-route | 50 | null
-|feign.httpclient.time-to-live | 900 | null
-|feign.httpclient.time-to-live-unit |  | null
+|feign.httpclient.follow-redirects | true | 
+|feign.httpclient.max-connections | 200 | 
+|feign.httpclient.max-connections-per-route | 50 | 
+|feign.httpclient.time-to-live | 900 | 
+|feign.httpclient.time-to-live-unit |  | 
 |feign.hystrix.enabled | false | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
 |feign.okhttp.enabled | false | Enables the use of the OK HTTP Client by Feign.

@@ -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 Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.
+Spring Cloud integrates Ribbon and Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -55,7 +55,7 @@ public interface StoreClient {
 }
 ----

-In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create 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].
+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].
 You can also specify a URL using the `url` attribute
 (absolute value or just a hostname). The name of the bean in the
 application context is the fully qualified name of the interface.
@@ -68,6 +68,10 @@ it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
 in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].

+WARNING: In order to maintain backward compatibility, is used as the default load-balancer implementation.
+However, Spring Cloud Netflix Ribbon is now in maintenance mode, so we recommend using Spring Cloud LoadBalancer instead.
+To do this, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false`.
+
 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults

@@ -108,16 +112,18 @@ public interface StoreClient {
 }
 ----

-Spring Cloud OpenFeign provides the following beans by default for feign (`BeanType` beanName: `ClassName`):
+Spring Cloud Netflix 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 Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
+* `Client` feignClient: if Ribbon is in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
 If none of them is in the classpath, the default feign client is used.

+NOTE: `spring-cloud-starter-openfeign` supports both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`. However, as they are optional dependencies, you need to make sure the one you want to use has been added to your project.
+
 The OkHttpClient and ApacheHttpClient 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.

@@ -131,6 +137,10 @@ Spring Cloud OpenFeign _does not_ provide the following beans by default for fei
 * `SetterFactory`
 * `QueryMapEncoder`

+A bean of `Retryer.NEVER_RETRY` with the type `Retryer` is created by default, which will disable retrying.
+Notice this retrying behavior is different from the Feign default one, where it will automatically retry IOExceptions,
+treating them as transient network related exceptions, and any RetryableException thrown from an ErrorDecoder.
+
 Creating a bean of one of those type and placing it in a `@FeignClient` configuration (such as `FooConfiguration` above) allows you to override each one of the beans described.  Example:

 [source,java,indent=0]
@@ -576,6 +586,25 @@ public interface DemoTemplate {
 }
 ----

+=== Feign `CollectionFormat` support
+We support `feign.CollectionFormat` by providing the `@CollectionFormat` annotation. You can annotate a Feign client method with it by passing the desired `feign.CollectionFormat` as annotation value.
+
+In the following example, the `CSV` format is used instead of the default `EXPLODED` to process the method.
+
+[source,java,indent=0]
+----
+@FeignClient(name = "demo")
+	protected interface PageableFeignClient {
+
+		@CollectionFormat(feign.CollectionFormat.CSV)
+		@GetMapping(path = "/page")
+		ResponseEntity performRequest(Pageable page);
+
+	}
+----
+
+TIP: Set the `CSV` format while sending `Pageable` as a query parameter in order for it to be encoded correctly.
+
 === Reactive Support
 As the https://github.com/OpenFeign/feign[OpenFeign project] does not currently support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], neither does Spring Cloud OpenFeign. We will add support for it here as soon as it becomes available in the core project.

@@ -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>3.0.0-M2</version>
+	<version>2.2.4.RELEASE</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>3.0.0-M2</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>3.0.0-M2</spring-cloud-commons.version>
+		<spring-cloud-commons.version>2.2.4.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.4.RELEASE</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -95,6 +96,13 @@

 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-dependencies</artifactId>
+				<version>${spring-cloud-netflix.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-commons-dependencies</artifactId>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0-M2</version>
+		<version>2.2.4.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -21,6 +21,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-ribbon</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -85,6 +89,11 @@
 			<artifactId>spring-cloud-context</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-core</artifactId>
@@ -104,11 +113,46 @@
 			<artifactId>feign-httpclient</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-hystrix</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-serialization</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-metrics-event-stream</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-javanica</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-httpclient</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
@@ -149,6 +193,16 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -177,12 +231,6 @@
 			<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>
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates which collection format should be used while processing the annotated method.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @see feign.CollectionFormat
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CollectionFormat {
+
+	/**
+	 * Allows setting the {@link feign.CollectionFormat} to be used while processing the
+	 * annotated method.
+	 * @return the {@link feign.CollectionFormat} to be used
+	 */
+	feign.CollectionFormat value();
+
+}
@@ -38,6 +38,7 @@ 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;
@@ -78,6 +79,19 @@ public class FeignAutoConfiguration {
 	}

 	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
+	protected static class HystrixFeignTargeterConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean
+		public Targeter feignTargeter() {
+			return new HystrixTargeter();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
 	protected static class DefaultFeignTargeterConfiguration {

 		@Bean
@@ -89,11 +103,12 @@ public class FeignAutoConfiguration {
 	}

 	// the following configuration is for alternate feign clients if
-	// SC loadbalancer is not on the class path.
+	// ribbon is not on the class path.
 	// see corresponding configurations in FeignRibbonClientAutoConfiguration
-	// for load-balanced clients.
+	// for load balanced ribbon clients.
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ApacheHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
 	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
 	protected static class HttpClientFeignConfiguration {
@@ -159,6 +174,7 @@ public class FeignAutoConfiguration {

 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OkHttpClient.class)
+	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
 	@ConditionalOnProperty("feign.okhttp.enabled")
 	protected static class OkHttpFeignConfiguration {
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign;

 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -26,9 +27,9 @@ import org.springframework.core.annotation.AliasFor;

 /**
 * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If SC LoadBalancer is available
- * it will be used to load balance the backend requests, and the load balancer can be
- * configured using the same name (i.e. value) as the feign client.
+ * created (e.g. for autowiring into another component). If ribbon is available it will be
+ * used to load balance the backend requests, and the load balancer can be configured
+ * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
 *
 * @author Spencer Gibb
 * @author Venil Noronha
@@ -36,6 +37,7 @@ import org.springframework.core.annotation.AliasFor;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
+@Inherited
 public @interface FeignClient {

 	/**
@@ -112,7 +114,8 @@ public @interface FeignClient {
 	Class<?> fallbackFactory() default void.class;

 	/**
-	 * @return path prefix to be used by all method-level mappings.
+	 * @return path prefix to be used by all method-level mappings. Can be used with or
+	 * without <code>@RibbonClient</code>.
 	 */
 	String path() default "";

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

 package org.springframework.cloud.openfeign;

+import feign.hystrix.FallbackFactory;
+
 import org.springframework.context.ApplicationContext;

 /**
@@ -39,11 +41,6 @@ public class FeignClientBuilder {
 		return new Builder<>(this.applicationContext, type, name);
 	}

-	public <T> Builder<T> forType(final Class<T> type,
-			final FeignClientFactoryBean clientFactoryBean, final String name) {
-		return new Builder<>(this.applicationContext, clientFactoryBean, type, name);
-	}
-
 	/**
 	 * Builder of feign targets.
 	 *
@@ -55,13 +52,7 @@ public class FeignClientBuilder {

 		private Builder(final ApplicationContext applicationContext, final Class<T> type,
 				final String name) {
-			this(applicationContext, new FeignClientFactoryBean(), type, name);
-		}
-
-		private Builder(final ApplicationContext applicationContext,
-				final FeignClientFactoryBean clientFactoryBean, final Class<T> type,
-				final String name) {
-			this.feignClientFactoryBean = clientFactoryBean;
+			this.feignClientFactoryBean = new FeignClientFactoryBean();

 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
@@ -104,6 +95,13 @@ public class FeignClientBuilder {
 			return this;
 		}

+		public Builder<T> fallbackFactory(
+				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
+			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
+			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
+			return this;
+		}
+
 		/**
 		 * @return the created Feign client
 		 */
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign;

 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;

 import feign.Client;
 import feign.Contract;
@@ -40,9 +41,9 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

@@ -52,8 +53,9 @@ import org.springframework.util.StringUtils;
 * @author Eko Kurniawan Khannedy
 * @author Gregor Zurowski
 * @author Matt King
+ * @author Olga Maciaszek-Sharma
 */
-public class FeignClientFactoryBean
+class FeignClientFactoryBean
 		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware {

 	/***********************************
@@ -81,15 +83,19 @@ public class FeignClientFactoryBean

 	private Class<?> fallbackFactory = void.class;

+	private int readTimeoutMillis = new Request.Options().readTimeoutMillis();
+
+	private int connectTimeoutMillis = new Request.Options().connectTimeoutMillis();
+
 	@Override
 	public void afterPropertiesSet() {
-		Assert.hasText(this.contextId, "Context id must be set");
-		Assert.hasText(this.name, "Name must be set");
+		Assert.hasText(contextId, "Context id must be set");
+		Assert.hasText(name, "Name must be set");
 	}

 	protected Feign.Builder feign(FeignContext context) {
 		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
-		Logger logger = loggerFactory.create(this.type);
+		Logger logger = loggerFactory.create(type);

 		// @formatter:off
 		Feign.Builder builder = get(context, Feign.Builder.class)
@@ -101,25 +107,12 @@ public class FeignClientFactoryBean
 		// @formatter:on

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

 		return builder;
 	}

-	private void applyBuildCustomizers(FeignContext context, Feign.Builder builder) {
-		Map<String, FeignBuilderCustomizer> customizerMap = context
-				.getInstances(contextId, FeignBuilderCustomizer.class);
-
-		if (customizerMap != null) {
-			customizerMap.values().stream()
-					.sorted(AnnotationAwareOrderComparator.INSTANCE)
-					.forEach(feignBuilderCustomizer -> feignBuilderCustomizer
-							.customize(builder));
-		}
-	}
-
 	protected void configureFeign(FeignContext context, Feign.Builder builder) {
-		FeignClientProperties properties = this.applicationContext
+		FeignClientProperties properties = applicationContext
 				.getBean(FeignClientProperties.class);

 		FeignClientConfigurer feignClientConfigurer = getOptional(context,
@@ -132,15 +125,13 @@ public class FeignClientFactoryBean
 				configureUsingProperties(
 						properties.getConfig().get(properties.getDefaultConfig()),
 						builder);
-				configureUsingProperties(properties.getConfig().get(this.contextId),
-						builder);
+				configureUsingProperties(properties.getConfig().get(contextId), builder);
 			}
 			else {
 				configureUsingProperties(
 						properties.getConfig().get(properties.getDefaultConfig()),
 						builder);
-				configureUsingProperties(properties.getConfig().get(this.contextId),
-						builder);
+				configureUsingProperties(properties.getConfig().get(contextId), builder);
 				configureUsingConfiguration(context, builder);
 			}
 		}
@@ -168,7 +159,7 @@ public class FeignClientFactoryBean
 			FeignErrorDecoderFactory errorDecoderFactory = getOptional(context,
 					FeignErrorDecoderFactory.class);
 			if (errorDecoderFactory != null) {
-				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(this.type);
+				ErrorDecoder factoryErrorDecoder = errorDecoderFactory.create(type);
 				builder.errorDecoder(factoryErrorDecoder);
 			}
 		}
@@ -176,6 +167,8 @@ public class FeignClientFactoryBean
 				Request.Options.class);
 		if (options != null) {
 			builder.options(options);
+			readTimeoutMillis = options.readTimeoutMillis();
+			connectTimeoutMillis = options.connectTimeoutMillis();
 		}
 		Map<String, RequestInterceptor> requestInterceptors = getInheritedAwareInstances(
 				context, RequestInterceptor.class);
@@ -187,7 +180,7 @@ public class FeignClientFactoryBean
 		if (queryMapEncoder != null) {
 			builder.queryMapEncoder(queryMapEncoder);
 		}
-		if (this.decode404) {
+		if (decode404) {
 			builder.decode404();
 		}
 		ExceptionPropagationPolicy exceptionPropagationPolicy = getInheritedAwareOptional(
@@ -208,10 +201,13 @@ public class FeignClientFactoryBean
 			builder.logLevel(config.getLoggerLevel());
 		}

-		if (config.getConnectTimeout() != null && config.getReadTimeout() != null) {
-			builder.options(new Request.Options(config.getConnectTimeout(),
-					config.getReadTimeout()));
-		}
+		connectTimeoutMillis = config.getConnectTimeout() != null
+				? config.getConnectTimeout() : connectTimeoutMillis;
+		readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout()
+				: readTimeoutMillis;
+
+		builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS,
+				readTimeoutMillis, TimeUnit.MILLISECONDS, true));

 		if (config.getRetryer() != null) {
 			Retryer retryer = getOrInstantiate(config.getRetryer());
@@ -257,7 +253,7 @@ public class FeignClientFactoryBean

 	private <T> T getOrInstantiate(Class<T> tClass) {
 		try {
-			return this.applicationContext.getBean(tClass);
+			return applicationContext.getBean(tClass);
 		}
 		catch (NoSuchBeanDefinitionException e) {
 			return BeanUtils.instantiateClass(tClass);
@@ -265,16 +261,16 @@ public class FeignClientFactoryBean
 	}

 	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(this.contextId, type);
+		T instance = context.getInstance(contextId, type);
 		if (instance == null) {
 			throw new IllegalStateException(
-					"No bean found of type " + type + " for " + this.contextId);
+					"No bean found of type " + type + " for " + contextId);
 		}
 		return instance;
 	}

 	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(this.contextId, type);
+		return context.getInstance(contextId, type);
 	}

 	protected <T> T getInheritedAwareOptional(FeignContext context, Class<T> type) {
@@ -282,17 +278,17 @@ public class FeignClientFactoryBean
 			return getOptional(context, type);
 		}
 		else {
-			return context.getInstanceWithoutAncestors(this.contextId, type);
+			return context.getInstanceWithoutAncestors(contextId, type);
 		}
 	}

 	protected <T> Map<String, T> getInheritedAwareInstances(FeignContext context,
 			Class<T> type) {
 		if (inheritParentContext) {
-			return context.getInstances(this.contextId, type);
+			return context.getInstances(contextId, type);
 		}
 		else {
-			return context.getInstancesWithoutAncestors(this.contextId, type);
+			return context.getInstancesWithoutAncestors(contextId, type);
 		}
 	}

@@ -306,11 +302,11 @@ public class FeignClientFactoryBean
 		}

 		throw new IllegalStateException(
-				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-loadbalancer?");
+				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon?");
 	}

 	@Override
-	public Object getObject() {
+	public Object getObject() throws Exception {
 		return getTarget();
 	}

@@ -320,26 +316,31 @@ public class FeignClientFactoryBean
 	 * information
 	 */
 	<T> T getTarget() {
-		FeignContext context = this.applicationContext.getBean(FeignContext.class);
+		FeignContext context = applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);

-		if (!StringUtils.hasText(this.url)) {
-			if (!this.name.startsWith("http")) {
-				this.url = "http://" + this.name;
+		if (!StringUtils.hasText(url)) {
+			if (!name.startsWith("http")) {
+				url = "http://" + name;
 			}
 			else {
-				this.url = this.name;
+				url = name;
 			}
-			this.url += cleanPath();
+			url += cleanPath();
 			return (T) loadBalance(builder, context,
-					new HardCodedTarget<>(this.type, this.name, this.url));
+					new HardCodedTarget<>(type, name, url));
 		}
-		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
-			this.url = "http://" + this.url;
+		if (StringUtils.hasText(url) && !url.startsWith("http")) {
+			url = "http://" + url;
 		}
 		String url = this.url + cleanPath();
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
+			if (client instanceof LoadBalancerFeignClient) {
+				// not load balancing because we have a url,
+				// but ribbon is on the classpath, so unwrap
+				client = ((LoadBalancerFeignClient) client).getDelegate();
+			}
 			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
@@ -349,7 +350,7 @@ public class FeignClientFactoryBean
 		}
 		Targeter targeter = get(context, Targeter.class);
 		return (T) targeter.target(this, builder, context,
-				new HardCodedTarget<>(this.type, this.name, url));
+				new HardCodedTarget<>(type, name, url));
 	}

 	private String cleanPath() {
@@ -367,7 +368,7 @@ public class FeignClientFactoryBean

 	@Override
 	public Class<?> getObjectType() {
-		return this.type;
+		return type;
 	}

 	@Override
@@ -376,7 +377,7 @@ public class FeignClientFactoryBean
 	}

 	public Class<?> getType() {
-		return this.type;
+		return type;
 	}

 	public void setType(Class<?> type) {
@@ -384,7 +385,7 @@ public class FeignClientFactoryBean
 	}

 	public String getName() {
-		return this.name;
+		return name;
 	}

 	public void setName(String name) {
@@ -392,7 +393,7 @@ public class FeignClientFactoryBean
 	}

 	public String getContextId() {
-		return this.contextId;
+		return contextId;
 	}

 	public void setContextId(String contextId) {
@@ -400,7 +401,7 @@ public class FeignClientFactoryBean
 	}

 	public String getUrl() {
-		return this.url;
+		return url;
 	}

 	public void setUrl(String url) {
@@ -408,7 +409,7 @@ public class FeignClientFactoryBean
 	}

 	public String getPath() {
-		return this.path;
+		return path;
 	}

 	public void setPath(String path) {
@@ -416,7 +417,7 @@ public class FeignClientFactoryBean
 	}

 	public boolean isDecode404() {
-		return this.decode404;
+		return decode404;
 	}

 	public void setDecode404(boolean decode404) {
@@ -432,7 +433,7 @@ public class FeignClientFactoryBean
 	}

 	public ApplicationContext getApplicationContext() {
-		return this.applicationContext;
+		return applicationContext;
 	}

 	@Override
@@ -441,7 +442,7 @@ public class FeignClientFactoryBean
 	}

 	public Class<?> getFallback() {
-		return this.fallback;
+		return fallback;
 	}

 	public void setFallback(Class<?> fallback) {
@@ -449,7 +450,7 @@ public class FeignClientFactoryBean
 	}

 	public Class<?> getFallbackFactory() {
-		return this.fallbackFactory;
+		return fallbackFactory;
 	}

 	public void setFallbackFactory(Class<?> fallbackFactory) {
@@ -465,35 +466,31 @@ public class FeignClientFactoryBean
 			return false;
 		}
 		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(this.applicationContext, that.applicationContext)
-				&& this.decode404 == that.decode404
-				&& this.inheritParentContext == that.inheritParentContext
-				&& Objects.equals(this.fallback, that.fallback)
-				&& Objects.equals(this.fallbackFactory, that.fallbackFactory)
-				&& Objects.equals(this.name, that.name)
-				&& Objects.equals(this.path, that.path)
-				&& Objects.equals(this.type, that.type)
-				&& Objects.equals(this.url, that.url);
+		return Objects.equals(applicationContext, that.applicationContext)
+				&& decode404 == that.decode404
+				&& inheritParentContext == that.inheritParentContext
+				&& Objects.equals(fallback, that.fallback)
+				&& Objects.equals(fallbackFactory, that.fallbackFactory)
+				&& Objects.equals(name, that.name) && Objects.equals(path, that.path)
+				&& Objects.equals(type, that.type) && Objects.equals(url, that.url);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(this.applicationContext, this.decode404,
-				this.inheritParentContext, this.fallback, this.fallbackFactory, this.name,
-				this.path, this.type, this.url);
+		return Objects.hash(applicationContext, decode404, inheritParentContext, fallback,
+				fallbackFactory, name, path, type, url);
 	}

 	@Override
 	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{").append("type=")
-				.append(this.type).append(", ").append("name='").append(this.name)
-				.append("', ").append("url='").append(this.url).append("', ")
-				.append("path='").append(this.path).append("', ").append("decode404=")
-				.append(this.decode404).append(", ").append("inheritParentContext=")
-				.append(this.inheritParentContext).append(", ")
-				.append("applicationContext=").append(this.applicationContext)
-				.append(", ").append("fallback=").append(this.fallback).append(", ")
-				.append("fallbackFactory=").append(this.fallbackFactory).append("}")
+		return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type)
+				.append(", ").append("name='").append(name).append("', ").append("url='")
+				.append(url).append("', ").append("path='").append(path).append("', ")
+				.append("decode404=").append(decode404).append(", ")
+				.append("inheritParentContext=").append(inheritParentContext).append(", ")
+				.append("applicationContext=").append(applicationContext).append(", ")
+				.append("fallback=").append(fallback).append(", ")
+				.append("fallbackFactory=").append(fallbackFactory).append("}")
 				.toString();
 	}

@@ -20,6 +20,7 @@ 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;
@@ -28,6 +29,7 @@ import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.form.MultipartFormContentProcessor;
 import feign.form.spring.SpringFormEncoder;
+import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;

 import org.springframework.beans.factory.ObjectFactory;
@@ -36,6 +38,7 @@ 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.clientconfig.FeignClientConfigurer;
@@ -177,6 +180,20 @@ public class FeignClientsConfiguration {
 		}
 	}

+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
+	protected static class HystrixFeignConfiguration {
+
+		@Bean
+		@Scope("prototype")
+		@ConditionalOnMissingBean
+		@ConditionalOnProperty(name = "feign.hystrix.enabled")
+		public Feign.Builder feignHystrixBuilder() {
+			return HystrixFeign.builder();
+		}
+
+	}
+
 	private class SpringPojoFormEncoder extends SpringFormEncoder {

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

 	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign,
 			FeignContext context, Target.HardCodedTarget<T> target);
@@ -16,11 +16,9 @@

 package org.springframework.cloud.openfeign.encoding;

-import feign.Client;
 import feign.Feign;

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

@@ -19,13 +19,13 @@ package org.springframework.cloud.openfeign.loadbalancer;
 import feign.Client;

 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

 /**
- * Configuration instantiating a {@link LoadBalancerClient}-based {@link Client} object
- * that uses {@link Client.Default} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link Client.Default} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
@@ -35,7 +35,7 @@ class DefaultFeignLoadBalancerConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
-	public Client feignClient(LoadBalancerClient loadBalancerClient) {
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
 				loadBalancerClient);
 	}
@@ -27,13 +27,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;

 /**
- * A {@link Client} implementation that uses {@link LoadBalancerClient} to select a
- * {@link ServiceInstance} to use while resolving the request host.
+ * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} to select
+ * a {@link ServiceInstance} to use while resolving the request host.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
@@ -45,10 +45,10 @@ public class FeignBlockingLoadBalancerClient implements Client {

 	private final Client delegate;

-	private final LoadBalancerClient loadBalancerClient;
+	private final BlockingLoadBalancerClient loadBalancerClient;

 	public FeignBlockingLoadBalancerClient(Client delegate,
-			LoadBalancerClient loadBalancerClient) {
+			BlockingLoadBalancerClient loadBalancerClient) {
 		this.delegate = delegate;
 		this.loadBalancerClient = loadBalancerClient;
 	}
@@ -19,26 +19,31 @@ 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.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

 /**
- * An autoconfiguration that instantiates {@link LoadBalancerClient}-based implementations
- * of {@link Client}.
+ * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
+ * implementations of {@link Client}. In order to use this load-balancing mechanism, the
+ * Ribbon-based implementation has to be disabled by setting
+ * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
 */
@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(LoadBalancerClient.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)
+@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class)
@EnableConfigurationProperties(FeignHttpClientProperties.class)
@Configuration(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
@@ -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.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 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 LoadBalancerClient}-based {@link Client} object
- * that uses {@link ApacheHttpClient} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link ApacheHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnBean(LoadBalancerClient.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
@Import(HttpClientFeignConfiguration.class)
 class HttpClientFeignLoadBalancerConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
-	public Client feignClient(LoadBalancerClient loadBalancerClient,
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
 			HttpClient httpClient) {
 		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
@@ -23,15 +23,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 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 LoadBalancerClient}-based {@link Client} object
- * that uses {@link OkHttpClient} under the hood.
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link OkHttpClient} under the hood.
 *
 * @author Olga Maciaszek-Sharma
 * @since 2.2.0
@@ -39,14 +39,14 @@ import org.springframework.context.annotation.Import;
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty("feign.okhttp.enabled")
-@ConditionalOnBean(LoadBalancerClient.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
@Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancerConfiguration {

 	@Bean
 	@ConditionalOnMissingBean
 	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
-			LoadBalancerClient loadBalancerClient) {
+			BlockingLoadBalancerClient loadBalancerClient) {
 		OkHttpClient delegate = new OkHttpClient(okHttpClient);
 		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
 	}
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.Map;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.util.ConcurrentReferenceHashMap;
+
+/**
+ * Factory for SpringLoadBalancer instances that caches the entries created.
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ * @author Ryan Baxter
+ * @author Gang Li
+ */
+public class CachingSpringLoadBalancerFactory {
+
+	protected final SpringClientFactory factory;
+
+	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;
+
+	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();
+
+	public CachingSpringLoadBalancerFactory(SpringClientFactory factory) {
+		this.factory = factory;
+	}
+
+	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
+			LoadBalancedRetryFactory loadBalancedRetryPolicyFactory) {
+		this.factory = factory;
+		this.loadBalancedRetryFactory = loadBalancedRetryPolicyFactory;
+	}
+
+	public FeignLoadBalancer create(String clientName) {
+		FeignLoadBalancer client = this.cache.get(clientName);
+		if (client != null) {
+			return client;
+		}
+		IClientConfig config = this.factory.getClientConfig(clientName);
+		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
+		ServerIntrospector serverIntrospector = this.factory.getInstance(clientName,
+				ServerIntrospector.class);
+		client = this.loadBalancedRetryFactory != null
+				? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
+						this.loadBalancedRetryFactory)
+				: new FeignLoadBalancer(lb, config, serverIntrospector);
+		this.cache.put(clientName, client);
+		return client;
+	}
+
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import feign.Client;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Spencer Gibb
+ */
+@Configuration(proxyBeanMethods = false)
+class DefaultFeignLoadBalancedConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory) {
+		return new LoadBalancerFeignClient(new Client.Default(null, null), cachingFactory,
+				clientFactory);
+	}
+
+}
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.netflix.client.AbstractLoadBalancerAwareClient;
+import com.netflix.client.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.body(), request.charset(), request.requestTemplate());
+		}
+
+		Request toRequest() {
+			return toRequest(this.request);
+		}
+
+		Client client() {
+			return this.client;
+		}
+
+		HttpRequest toHttpRequest() {
+			return new HttpRequest() {
+				@Override
+				public HttpMethod getMethod() {
+					return HttpMethod
+							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
+				}
+
+				@Override
+				public String getMethodValue() {
+					return getMethod().name();
+				}
+
+				@Override
+				public URI getURI() {
+					return RibbonRequest.this.getUri();
+				}
+
+				@Override
+				public HttpHeaders getHeaders() {
+					Map<String, List<String>> headers = new HashMap<>();
+					Map<String, Collection<String>> feignHeaders = RibbonRequest.this
+							.toRequest().headers();
+					for (String key : feignHeaders.keySet()) {
+						headers.put(key, new ArrayList<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();
+			}
+		}
+
+	}
+
+}
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
+import org.springframework.http.HttpRequest;
+import org.springframework.retry.RetryContext;
+
+/**
+ * @author Ryan Baxter
+ */
+public class FeignRetryPolicy extends InterceptorRetryPolicy {
+
+	private HttpRequest request;
+
+	private String serviceId;
+
+	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
+			ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
+		super(request, policy, serviceInstanceChooser, serviceName);
+		this.request = request;
+		this.serviceId = serviceName;
+	}
+
+	@Override
+	public boolean canRetry(RetryContext context) {
+		/*
+		 * In InterceptorRetryPolicy.canRetry we ask the LoadBalancer to choose a server
+		 * if one is not set in the retry context and then return true. RetryTemplat calls
+		 * the canRetry method of the policy even on its first execution. So the fact that
+		 * we didnt have a service instance set in the RetryContext signaled that it was
+		 * the first execution and we should return true.
+		 *
+		 * In the Feign scenario, Feign as actually already queried the load balancer for
+		 * a service instance and we set that service instance in the context when we call
+		 * the open method of the policy. So in the Feign case we just return true if the
+		 * retry count is 0 indicating we haven't yet made a failed request.
+		 */
+		if (context.getRetryCount() == 0) {
+			return true;
+		}
+		return super.canRetry(context);
+	}
+
+	@Override
+	public RetryContext open(RetryContext parent) {
+		/*
+		 * With Feign (unlike Ribbon) the request already has the URI for the service
+		 * instance we are going to make the request to, so extract that information and
+		 * set the service instance in the context. In the Ribbon scenario the URI in the
+		 * request object still has the service id so we choose and set the service
+		 * instance later on.
+		 */
+		LoadBalancedRetryContext context = new LoadBalancedRetryContext(parent,
+				this.request);
+		context.setServiceInstance(
+				new FeignRetryPolicyServiceInstance(this.serviceId, this.request));
+		return context;
+	}
+
+	class FeignRetryPolicyServiceInstance implements ServiceInstance {
+
+		private String serviceId;
+
+		private HttpRequest request;
+
+		private Map<String, String> metadata;
+
+		FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) {
+			this.serviceId = serviceId;
+			this.request = request;
+			this.metadata = new HashMap<>();
+		}
+
+		@Override
+		public String getServiceId() {
+			return this.serviceId;
+		}
+
+		@Override
+		public String getHost() {
+			return this.request.getURI().getHost();
+		}
+
+		@Override
+		public int getPort() {
+			return this.request.getURI().getPort();
+		}
+
+		@Override
+		public boolean isSecure() {
+			return "https".equals(this.request.getURI().getScheme());
+		}
+
+		@Override
+		public URI getUri() {
+			return this.request.getURI();
+		}
+
+		@Override
+		public Map<String, String> getMetadata() {
+			return this.metadata;
+		}
+
+	}
+
+}
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import feign.Feign;
+import feign.Request;
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
+ * load balancer.
+ *
+ * @author Dave Syer
+ * @author Olga Maciaszek-Sharma
+ */
+@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
+@ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled",
+		matchIfMissing = true)
+@Configuration(proxyBeanMethods = false)
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+@EnableConfigurationProperties({ FeignHttpClientProperties.class })
+// Order is important here, last should be the default, first should be optional
+// see
+// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
+@Import({ HttpClientFeignLoadBalancedConfiguration.class,
+		OkHttpFeignLoadBalancedConfiguration.class,
+		DefaultFeignLoadBalancedConfiguration.class })
+public class FeignRibbonClientAutoConfiguration {
+
+	@Bean
+	@Primary
+	@ConditionalOnMissingBean
+	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
+	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
+			SpringClientFactory factory) {
+		return new CachingSpringLoadBalancerFactory(factory);
+	}
+
+	@Bean
+	@Primary
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
+	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
+			SpringClientFactory factory, LoadBalancedRetryFactory retryFactory) {
+		return new CachingSpringLoadBalancerFactory(factory, retryFactory);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Request.Options feignRequestOptions() {
+		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
+	}
+
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
+import org.apache.http.client.HttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(ApacheHttpClient.class)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Import(HttpClientFeignConfiguration.class)
+class HttpClientFeignLoadBalancedConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(Client.class)
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory, HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
+	}
+
+}
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+
+import com.netflix.client.ClientException;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class LoadBalancerFeignClient implements Client {
+
+	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
+
+	private final Client delegate;
+
+	private CachingSpringLoadBalancerFactory lbClientFactory;
+
+	private SpringClientFactory clientFactory;
+
+	public LoadBalancerFeignClient(Client delegate,
+			CachingSpringLoadBalancerFactory lbClientFactory,
+			SpringClientFactory clientFactory) {
+		this.delegate = delegate;
+		this.lbClientFactory = lbClientFactory;
+		this.clientFactory = clientFactory;
+	}
+
+	static URI cleanUrl(String originalUrl, String host) {
+		String newUrl = originalUrl;
+		if (originalUrl.startsWith("https://")) {
+			newUrl = originalUrl.substring(0, 8)
+					+ originalUrl.substring(8 + host.length());
+		}
+		else if (originalUrl.startsWith("http")) {
+			newUrl = originalUrl.substring(0, 7)
+					+ originalUrl.substring(7 + host.length());
+		}
+		StringBuffer buffer = new StringBuffer(newUrl);
+		if ((newUrl.startsWith("https://") && newUrl.length() == 8)
+				|| (newUrl.startsWith("http://") && newUrl.length() == 7)) {
+			buffer.append("/");
+		}
+		return URI.create(buffer.toString());
+	}
+
+	@Override
+	public Response execute(Request request, Request.Options options) throws IOException {
+		try {
+			URI asUri = URI.create(request.url());
+			String clientName = asUri.getHost();
+			URI uriWithoutHost = cleanUrl(request.url(), clientName);
+			FeignLoadBalancer.RibbonRequest ribbonRequest = new FeignLoadBalancer.RibbonRequest(
+					this.delegate, request, uriWithoutHost);
+
+			IClientConfig requestConfig = getClientConfig(options, clientName);
+			return lbClient(clientName)
+					.executeWithLoadBalancer(ribbonRequest, requestConfig).toResponse();
+		}
+		catch (ClientException e) {
+			IOException io = findIOException(e);
+			if (io != null) {
+				throw io;
+			}
+			throw new RuntimeException(e);
+		}
+	}
+
+	IClientConfig getClientConfig(Request.Options options, String clientName) {
+		IClientConfig requestConfig;
+		if (options == DEFAULT_OPTIONS) {
+			requestConfig = this.clientFactory.getClientConfig(clientName);
+		}
+		else {
+			requestConfig = new FeignOptionsClientConfig(options);
+		}
+		return requestConfig;
+	}
+
+	protected IOException findIOException(Throwable t) {
+		if (t == null) {
+			return null;
+		}
+		if (t instanceof IOException) {
+			return (IOException) t;
+		}
+		return findIOException(t.getCause());
+	}
+
+	public Client getDelegate() {
+		return this.delegate;
+	}
+
+	private FeignLoadBalancer lbClient(String clientName) {
+		return this.lbClientFactory.create(clientName);
+	}
+
+	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
+
+		FeignOptionsClientConfig(Request.Options options) {
+			setProperty(CommonClientConfigKey.ConnectTimeout,
+					options.connectTimeoutMillis());
+			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
+		}
+
+		@Override
+		public void loadProperties(String clientName) {
+
+		}
+
+		@Override
+		public void loadDefaultValues() {
+
+		}
+
+	}
+
+}
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import feign.Client;
+import feign.okhttp.OkHttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(OkHttpClient.class)
+@ConditionalOnProperty("feign.okhttp.enabled")
+@Import(OkHttpFeignConfiguration.class)
+class OkHttpFeignLoadBalancedConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(Client.class)
+	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
+			SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
+		OkHttpClient delegate = new OkHttpClient(okHttpClient);
+		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
+	}
+
+}
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+
+import com.netflix.client.DefaultLoadBalancerRetryHandler;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
+import org.springframework.cloud.netflix.ribbon.RibbonProperties;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.retry.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));
+	}
+
+}
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
+import feign.Response;
+
+import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
+
+/**
+ * A {@link RetryableStatusCodeException} for {@link Response}s.
+ *
+ * @author Ryan Baxter
+ */
+public class RibbonResponseStatusCodeException extends RetryableStatusCodeException {
+
+	private final Response response;
+
+	public RibbonResponseStatusCodeException(String serviceId, Response response,
+			byte[] body, URI uri) {
+		super(serviceId, response.status(), response, uri);
+		this.response = Response.builder()
+				.body(new ByteArrayInputStream(body), body.length)
+				.headers(response.headers()).reason(response.reason())
+				.status(response.status()).request(response.request()).build();
+	}
+
+	@Override
+	public Response getResponse() {
+		return this.response;
+	}
+
+}
@@ -29,6 +29,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;

 import static feign.form.ContentProcessor.CRLF;
+import static feign.form.util.PojoUtil.isUserPojo;

 /**
 * @author Darren Foong
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.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;
+	}
+
+}
@@ -37,6 +37,7 @@ import feign.Param;
 import feign.Request;

 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.cloud.openfeign.CollectionFormat;
 import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
@@ -121,9 +122,9 @@ public class SpringMvcContract extends Contract.BaseContract
 		List<AnnotatedParameterProcessor> processors = getDefaultAnnotatedArgumentsProcessors();
 		processors.addAll(annotatedParameterProcessors);

-		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
+		annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
-		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
+		convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
 	}

 	private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) {
@@ -172,14 +173,15 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (clz.getInterfaces().length == 0) {
 			RequestMapping classAnnotation = findMergedAnnotation(clz,
 					RequestMapping.class);
-			if (classAnnotation != null && classAnnotation.value().length > 0) {
+			if (classAnnotation != null) {
 				// Prepend path from class annotation if specified
-				String pathValue = emptyToNull(classAnnotation.value()[0]);
-				if (pathValue != null) {
+				if (classAnnotation.value().length > 0) {
+					String pathValue = emptyToNull(classAnnotation.value()[0]);
 					pathValue = resolve(pathValue);
-					if (!pathValue.equals("/")) {
-						data.template().uri(pathValue);
+					if (!pathValue.startsWith("/")) {
+						pathValue = "/" + pathValue;
 					}
+					data.template().uri(pathValue);
 				}
 			}
 		}
@@ -187,7 +189,7 @@ public class SpringMvcContract extends Contract.BaseContract

 	@Override
 	public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
-		this.processedMethods.put(Feign.configKey(targetType, method), method);
+		processedMethods.put(Feign.configKey(targetType, method), method);
 		MethodMetadata md = super.parseAndValidateMetadata(targetType, method);

 		RequestMapping classAnnotation = findMergedAnnotation(targetType,
@@ -213,6 +215,12 @@ public class SpringMvcContract extends Contract.BaseContract
 	@Override
 	protected void processAnnotationOnMethod(MethodMetadata data,
 			Annotation methodAnnotation, Method method) {
+		if (CollectionFormat.class.isInstance(methodAnnotation)) {
+			CollectionFormat collectionFormat = findMergedAnnotation(method,
+					CollectionFormat.class);
+			data.template().collectionFormat(collectionFormat.value());
+		}
+
 		if (!RequestMapping.class.isInstance(methodAnnotation) && !methodAnnotation
 				.annotationType().isAnnotationPresent(RequestMapping.class)) {
 			return;
@@ -233,9 +241,11 @@ public class SpringMvcContract extends Contract.BaseContract
 			String pathValue = emptyToNull(methodMapping.value()[0]);
 			if (pathValue != null) {
 				pathValue = resolve(pathValue);
-				if (!pathValue.equals("/")) {
-					data.template().uri(pathValue, true);
+				// Append path from @RequestMapping if value is present on method
+				if (!pathValue.startsWith("/") && !data.template().path().endsWith("/")) {
+					pathValue = "/" + pathValue;
 				}
+				data.template().uri(pathValue, true);
 			}
 		}

@@ -248,13 +258,13 @@ public class SpringMvcContract extends Contract.BaseContract
 		// headers
 		parseHeaders(data, method, methodMapping);

-		data.indexToExpander(new LinkedHashMap<Integer, Param.Expander>());
+		data.indexToExpander(new LinkedHashMap<>());
 	}

 	private String resolve(String value) {
 		if (StringUtils.hasText(value)
-				&& this.resourceLoader instanceof ConfigurableApplicationContext) {
-			return ((ConfigurableApplicationContext) this.resourceLoader).getEnvironment()
+				&& resourceLoader instanceof ConfigurableApplicationContext) {
+			return ((ConfigurableApplicationContext) resourceLoader).getEnvironment()
 					.resolvePlaceholders(value);
 		}
 		return value;
@@ -280,9 +290,9 @@ public class SpringMvcContract extends Contract.BaseContract

 		AnnotatedParameterProcessor.AnnotatedParameterContext context = new SimpleAnnotatedParameterContext(
 				data, paramIndex);
-		Method method = this.processedMethods.get(data.configKey());
+		Method method = processedMethods.get(data.configKey());
 		for (Annotation parameterAnnotation : annotations) {
-			AnnotatedParameterProcessor processor = this.annotatedArgumentProcessors
+			AnnotatedParameterProcessor processor = annotatedArgumentProcessors
 					.get(parameterAnnotation.annotationType());
 			if (processor != null) {
 				Annotation processParameterAnnotation;
@@ -298,9 +308,8 @@ public class SpringMvcContract extends Contract.BaseContract
 		if (!isMultipartFormData(data) && isHttpAnnotation
 				&& data.indexToExpander().get(paramIndex) == null) {
 			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
-			if (this.conversionService.canConvert(typeDescriptor,
-					STRING_TYPE_DESCRIPTOR)) {
-				Param.Expander expander = this.convertingExpanderFactory
+			if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) {
+				Param.Expander expander = convertingExpanderFactory
 						.getExpander(typeDescriptor);
 				if (expander != null) {
 					data.indexToExpander().put(paramIndex, expander);
@@ -419,7 +428,7 @@ public class SpringMvcContract extends Contract.BaseContract

 		@Override
 		public String expand(Object value) {
-			return this.conversionService.convert(value, String.class);
+			return conversionService.convert(value, String.class);
 		}

 	}
@@ -434,7 +443,7 @@ public class SpringMvcContract extends Contract.BaseContract

 		Param.Expander getExpander(TypeDescriptor typeDescriptor) {
 			return value -> {
-				Object converted = this.conversionService.convert(value, typeDescriptor,
+				Object converted = conversionService.convert(value, typeDescriptor,
 						STRING_TYPE_DESCRIPTOR);
 				return (String) converted;
 			};
@@ -457,17 +466,17 @@ public class SpringMvcContract extends Contract.BaseContract

 		@Override
 		public MethodMetadata getMethodMetadata() {
-			return this.methodMetadata;
+			return methodMetadata;
 		}

 		@Override
 		public int getParameterIndex() {
-			return this.parameterIndex;
+			return parameterIndex;
 		}

 		@Override
 		public void setParameterName(String name) {
-			nameParam(this.methodMetadata, name, this.parameterIndex);
+			nameParam(methodMetadata, name, parameterIndex);
 		}

 		@Override
@@ -1,4 +1,5 @@
 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,\
@@ -21,10 +21,12 @@ 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.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 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;

@@ -47,7 +49,8 @@ public class EnableFeignClientsSpringDataTests {
 	}

 	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {

 	}
@@ -30,6 +30,7 @@ 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,7 +88,7 @@ public class EnableFeignClientsTests {
 	}

 	@Configuration(proxyBeanMethods = false)
-	@Import({ FeignAutoConfiguration.class })
+	@Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {

 	}
@@ -1,160 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import java.lang.reflect.Field;
-
-import feign.Feign;
-import feign.Logger;
-import org.junit.Test;
-
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.Order;
-import org.springframework.util.ReflectionUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Matt King
- */
-public class FeignBuilderCustomizerTests {
-
-	@Test
-	public void testBuilderCustomizer() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				FeignBuilderCustomizerTests.SampleConfiguration2.class);
-
-		FeignClientFactoryBean clientFactoryBean = context
-				.getBean(FeignClientFactoryBean.class);
-		FeignContext feignContext = context.getBean(FeignContext.class);
-
-		Feign.Builder builder = clientFactoryBean.feign(feignContext);
-		assertFeignBuilderField(builder, "logLevel", Logger.Level.HEADERS);
-		assertFeignBuilderField(builder, "decode404", true);
-
-		context.close();
-	}
-
-	private void assertFeignBuilderField(Feign.Builder builder, String fieldName,
-			Object expectedValue) {
-		Field builderField = ReflectionUtils.findField(Feign.Builder.class, fieldName);
-		ReflectionUtils.makeAccessible(builderField);
-
-		Object value = ReflectionUtils.getField(builderField, builder);
-		assertThat(value).as("Expected value for the field '" + fieldName + "':")
-				.isEqualTo(expectedValue);
-	}
-
-	@Test
-	public void testBuildCustomizerOrdered() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				FeignBuilderCustomizerTests.SampleConfiguration3.class);
-
-		FeignClientFactoryBean clientFactoryBean = context
-				.getBean(FeignClientFactoryBean.class);
-		FeignContext feignContext = context.getBean(FeignContext.class);
-
-		Feign.Builder builder = clientFactoryBean.feign(feignContext);
-		assertFeignBuilderField(builder, "logLevel", Logger.Level.FULL);
-		assertFeignBuilderField(builder, "decode404", true);
-
-		context.close();
-	}
-
-	private static FeignClientFactoryBean defaultFeignClientFactoryBean() {
-		FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
-		feignClientFactoryBean.setContextId("test");
-		feignClientFactoryBean.setName("test");
-		feignClientFactoryBean.setType(FeignClientFactoryTests.TestType.class);
-		feignClientFactoryBean.setPath("");
-		feignClientFactoryBean.setUrl("http://some.absolute.url");
-		return feignClientFactoryBean;
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignClientsConfiguration.class)
-	protected static class SampleConfiguration2 {
-
-		@Bean
-		FeignContext feignContext() {
-			return new FeignContext();
-		}
-
-		@Bean
-		FeignClientProperties feignClientProperties() {
-			return new FeignClientProperties();
-		}
-
-		@Bean
-		FeignBuilderCustomizer feignBuilderCustomizer() {
-			return builder -> builder.logLevel(Logger.Level.HEADERS);
-		}
-
-		@Bean
-		FeignBuilderCustomizer feignBuilderCustomizer2() {
-			return Feign.Builder::decode404;
-		}
-
-		@Bean
-		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(FeignClientsConfiguration.class)
-	protected static class SampleConfiguration3 {
-
-		@Bean
-		FeignContext feignContext() {
-			return new FeignContext();
-		}
-
-		@Bean
-		FeignClientProperties feignClientProperties() {
-			return new FeignClientProperties();
-		}
-
-		@Bean
-		@Order(1)
-		FeignBuilderCustomizer feignBuilderCustomizer() {
-			return builder -> builder.logLevel(Logger.Level.HEADERS);
-		}
-
-		@Bean
-		@Order(2)
-		FeignBuilderCustomizer feignBuilderCustomizer1() {
-			return builder -> builder.logLevel(Logger.Level.FULL);
-		}
-
-		@Bean
-		FeignBuilderCustomizer feignBuilderCustomizer2() {
-			return Feign.Builder::decode404;
-		}
-
-		@Bean
-		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean();
-		}
-
-	}
-
-}
@@ -24,6 +24,7 @@ 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;
@@ -108,6 +109,7 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "type", TestFeignClient.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
 		assertFactoryBeanField(builder, "contextId", "TestClient");
+		assertFactoryBeanField(builder, "inheritParentContext", true);

 		// and:
 		assertFactoryBeanField(builder, "url",
@@ -126,29 +128,10 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").decode404(true).url("Url/")
-				.path("/Path").contextId("TestContext");
-
-		// then:
-		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", TestFeignClient.class);
-		assertFactoryBeanField(builder, "name", "TestClient");
-		assertFactoryBeanField(builder, "contextId", "TestContext");
-
-		// and:
-		assertFactoryBeanField(builder, "url", "http://Url/");
-		assertFactoryBeanField(builder, "path", "/Path");
-		assertFactoryBeanField(builder, "decode404", true);
-
-	}
-
-	@Test
-	public void forType_clientFactoryBeanProvided() {
-		// when:
-		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, new FeignClientFactoryBean(),
-						"TestClient")
-				.decode404(true).path("Path/").url("Url/").contextId("TestContext");
+				.forType(TestFeignClient.class, "TestClient").inheritParentContext(false)
+				.fallback(TestFeignClientFallback.class)
+				.fallbackFactory(TestFeignClientFallbackFactory.class).decode404(true)
+				.url("Url/").path("/Path").contextId("TestContext");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
@@ -160,6 +143,10 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "url", "http://Url/");
 		assertFactoryBeanField(builder, "path", "/Path");
 		assertFactoryBeanField(builder, "decode404", true);
+		assertFactoryBeanField(builder, "inheritParentContext", false);
+		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
+		assertFactoryBeanField(builder, "fallbackFactory",
+				TestFeignClientFallbackFactory.class);
 	}

 	@Test
@@ -182,4 +169,18 @@ public class FeignClientBuilderTests {

 	}

+	private class TestFeignClientFallback implements TestFeignClient {
+
+	}
+
+	private class TestFeignClientFallbackFactory
+			implements FallbackFactory<TestFeignClient> {
+
+		@Override
+		public TestFeignClientFallback create(Throwable throwable) {
+			return new TestFeignClientFallback();
+		}
+
+	}
+
 }
@@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign;

 import feign.Contract;
 import feign.ExceptionPropagationPolicy;
+import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
@@ -29,6 +30,7 @@ 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;
@@ -36,12 +38,14 @@ 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.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 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;
@@ -117,6 +121,13 @@ 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();
@@ -169,7 +180,8 @@ public class FeignClientOverrideDefaultsTests {

 	@Configuration(proxyBeanMethods = false)
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
-	@EnableAutoConfiguration
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			FeignAutoConfiguration.class })
 	protected static class TestConfiguration {

 		@Bean
@@ -205,6 +217,11 @@ public class FeignClientOverrideDefaultsTests {
 			return new Contract.Default();
 		}

+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new feign.QueryMapEncoder.Default();
@@ -17,13 +17,19 @@
 package org.springframework.cloud.openfeign;

 import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;

 import javax.servlet.http.HttpServletRequest;

+import feign.InvocationHandlerFactory;
+import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -47,6 +53,8 @@ import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -57,7 +65,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen

 /**
 * @author Eko Kurniawan Khannedy
+ * @author Olga Maciaszek-Sharma
 */
+@SuppressWarnings("FieldMayBeFinal")
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
 		webEnvironment = RANDOM_PORT)
@@ -83,45 +93,45 @@ public class FeignClientUsingPropertiesTests {
 	private FeignClientFactoryBean formFactoryBean;

 	public FeignClientUsingPropertiesTests() {
-		this.fooFactoryBean = new FeignClientFactoryBean();
-		this.fooFactoryBean.setContextId("foo");
-		this.fooFactoryBean.setType(FeignClientFactoryBean.class);
+		fooFactoryBean = new FeignClientFactoryBean();
+		fooFactoryBean.setContextId("foo");
+		fooFactoryBean.setType(FeignClientFactoryBean.class);

-		this.barFactoryBean = new FeignClientFactoryBean();
-		this.barFactoryBean.setContextId("bar");
-		this.barFactoryBean.setType(FeignClientFactoryBean.class);
+		barFactoryBean = new FeignClientFactoryBean();
+		barFactoryBean.setContextId("bar");
+		barFactoryBean.setType(FeignClientFactoryBean.class);

-		this.unwrapFactoryBean = new FeignClientFactoryBean();
-		this.unwrapFactoryBean.setContextId("unwrap");
-		this.unwrapFactoryBean.setType(FeignClientFactoryBean.class);
+		unwrapFactoryBean = new FeignClientFactoryBean();
+		unwrapFactoryBean.setContextId("unwrap");
+		unwrapFactoryBean.setType(FeignClientFactoryBean.class);

-		this.formFactoryBean = new FeignClientFactoryBean();
-		this.formFactoryBean.setContextId("form");
-		this.formFactoryBean.setType(FeignClientFactoryBean.class);
+		formFactoryBean = new FeignClientFactoryBean();
+		formFactoryBean.setContextId("form");
+		formFactoryBean.setType(FeignClientFactoryBean.class);
 	}

 	public FooClient fooClient() {
-		this.fooFactoryBean.setApplicationContext(this.applicationContext);
-		return this.fooFactoryBean.feign(this.context).target(FooClient.class,
-				"http://localhost:" + this.port);
+		fooFactoryBean.setApplicationContext(applicationContext);
+		return fooFactoryBean.feign(context).target(FooClient.class,
+				"http://localhost:" + port);
 	}

 	public BarClient barClient() {
-		this.barFactoryBean.setApplicationContext(this.applicationContext);
-		return this.barFactoryBean.feign(this.context).target(BarClient.class,
-				"http://localhost:" + this.port);
+		barFactoryBean.setApplicationContext(applicationContext);
+		return barFactoryBean.feign(context).target(BarClient.class,
+				"http://localhost:" + port);
 	}

 	public UnwrapClient unwrapClient() {
-		this.unwrapFactoryBean.setApplicationContext(this.applicationContext);
-		return this.unwrapFactoryBean.feign(this.context).target(UnwrapClient.class,
-				"http://localhost:" + this.port);
+		unwrapFactoryBean.setApplicationContext(applicationContext);
+		return unwrapFactoryBean.feign(context).target(UnwrapClient.class,
+				"http://localhost:" + port);
 	}

 	public FormClient formClient() {
-		this.formFactoryBean.setApplicationContext(this.applicationContext);
-		return this.formFactoryBean.feign(this.context).target(FormClient.class,
-				"http://localhost:" + this.port);
+		formFactoryBean.setApplicationContext(applicationContext);
+		return formFactoryBean.feign(context).target(FormClient.class,
+				"http://localhost:" + port);
 	}

 	@Test
@@ -149,6 +159,47 @@ public class FeignClientUsingPropertiesTests {
 		assertThat(response).isEqualTo("Data");
 	}

+	@Test
+	public void readTimeoutShouldWorkWhenConnectTimeoutNotSet() {
+		FeignClientFactoryBean readTimeoutFactoryBean = new FeignClientFactoryBean();
+		readTimeoutFactoryBean.setContextId("readTimeout");
+		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
+		readTimeoutFactoryBean.setApplicationContext(applicationContext);
+
+		TimeoutClient client = readTimeoutFactoryBean.feign(context)
+				.target(TimeoutClient.class, "http://localhost:" + port);
+
+		Request.Options options = getRequestOptions((Proxy) client);
+
+		assertThat(options.readTimeoutMillis()).isEqualTo(1000);
+		assertThat(options.connectTimeoutMillis()).isEqualTo(5000);
+	}
+
+	@Test
+	public void connectTimeoutShouldWorkWhenReadTimeoutNotSet() {
+		FeignClientFactoryBean readTimeoutFactoryBean = new FeignClientFactoryBean();
+		readTimeoutFactoryBean.setContextId("connectTimeout");
+		readTimeoutFactoryBean.setType(FeignClientFactoryBean.class);
+		readTimeoutFactoryBean.setApplicationContext(applicationContext);
+
+		TimeoutClient client = readTimeoutFactoryBean.feign(context)
+				.target(TimeoutClient.class, "http://localhost:" + port);
+
+		Request.Options options = getRequestOptions((Proxy) client);
+
+		assertThat(options.connectTimeoutMillis()).isEqualTo(1000);
+		assertThat(options.readTimeoutMillis()).isEqualTo(5000);
+	}
+
+	private Request.Options getRequestOptions(Proxy client) {
+		Object invocationHandler = ReflectionTestUtils.getField(client, "h");
+		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
+				.getField(Objects.requireNonNull(invocationHandler), "dispatch");
+		Method key = new ArrayList<>(dispatch.keySet()).get(0);
+		return (Request.Options) ReflectionTestUtils.getField(dispatch.get(key),
+				"options");
+	}
+
 	protected interface FooClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
@@ -178,6 +229,13 @@ public class FeignClientUsingPropertiesTests {

 	}

+	protected interface TimeoutClient {
+
+		@GetMapping("/timeouts")
+		String timeouts();
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
@@ -28,6 +28,7 @@ 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;
@@ -53,7 +54,8 @@ public class FeignCompressionTests {
 				.withPropertyValues("feign.compression.response.enabled=true",
 						"feign.compression.request.enabled=true",
 						"feign.okhttp.enabled=false")
-				.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
+				.withConfiguration(AutoConfigurations.of(ArchaiusAutoConfiguration.class,
+						FeignAutoConfiguration.class,
 						FeignContentGzipEncodingAutoConfiguration.class,
 						FeignAcceptGzipEncodingAutoConfiguration.class,
 						HttpClientConfiguration.class, PlainConfig.class))
@@ -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;

-	@LocalServerPort
+	@Value("${local.server.port}")
 	private int port = 0;

 	public SpringDecoderTests() {
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" })
+public class SpringRetryDisabledTests {
+
+	private ConfigurableApplicationContext context;
+
+	@Before
+	public void setUp() {
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.sources(RibbonAutoConfiguration.class,
+						LoadBalancerAutoConfiguration.class,
+						RibbonClientConfiguration.class,
+						FeignRibbonClientAutoConfiguration.class)
+				.run();
+	}
+
+	@After
+	public void tearDown() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void testLoadBalancedRetryFactoryBean() throws Exception {
+		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
+				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
+		assertThat(lbFactorys.values()).hasSize(1);
+		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
+		assertThat(lb).isInstanceOf(FeignLoadBalancer.class);
+		assertThat(lb).isNotInstanceOf(RetryableFeignLoadBalancer.class);
+	}
+
+}
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.BeansException;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.RetryableFeignLoadBalancer;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { RibbonAutoConfiguration.class,
+		RibbonClientConfiguration.class, LoadBalancerAutoConfiguration.class,
+		FeignRibbonClientAutoConfiguration.class, HttpClientConfiguration.class })
+public class SpringRetryEnabledTests implements ApplicationContextAware {
+
+	private ApplicationContext context;
+
+	@Test
+	public void testLoadBalancedRetryFactoryBean() throws Exception {
+		Map<String, CachingSpringLoadBalancerFactory> lbFactorys = this.context
+				.getBeansOfType(CachingSpringLoadBalancerFactory.class);
+		assertThat(lbFactorys.values()).hasSize(1);
+		FeignLoadBalancer lb = lbFactorys.values().iterator().next().create("foo");
+		assertThat(lb).isInstanceOf(RetryableFeignLoadBalancer.class);
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.context = context;
+	}
+
+}
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.beans;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Olga Maciaszek-Sharma
+ */
+@SpringBootTest(classes = FeignClientMockBeanTests.Config.class)
+public class FeignClientMockBeanTests {
+
+	@MockBean
+	private RandomClient randomClient;
+
+	@Autowired
+	private TestService testService;
+
+	@Test
+	public void randomClientShouldBeMocked() {
+		String mockMessage = "Mocked Feign Client";
+		when(randomClient.getRandomString()).thenReturn(mockMessage);
+
+		String returnedMessage = testService.testMethod();
+
+		assertThat(returnedMessage).isEqualTo(mockMessage);
+	}
+
+	@FeignClient("random-test")
+	protected interface RandomClient {
+
+		@GetMapping("/random-test")
+		String getRandomString();
+
+	}
+
+	@Configuration
+	protected static class Config {
+
+		@Bean
+		TestService testService() {
+			return new TestService();
+		}
+
+	}
+
+}
+
+class TestService {
+
+	@Autowired
+	private FeignClientMockBeanTests.RandomClient randomClient;
+
+	public String testMethod() {
+		return randomClient.getRandomString();
+	}
+
+}
@@ -47,20 +47,15 @@ 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 = BeansFeignClientTests.Application.class,
+@SpringBootTest(classes = FeignClientTests.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 BeansFeignClientTests {
+public class FeignClientTests {

 	@Value("${local.server.port}")
 	private int port = 0;
@@ -17,7 +17,7 @@
 package org.springframework.cloud.openfeign.beans;

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

 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.beans.BeansFeignClientTests.Hello;
+import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

@@ -16,17 +16,20 @@

 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.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -34,7 +37,6 @@ 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;
@@ -73,7 +75,7 @@ public class FeignAcceptEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
@@ -82,15 +84,17 @@ public class FeignAcceptEncodingTests {
 	}

 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -16,17 +16,20 @@

 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.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
@@ -34,7 +37,6 @@ 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;
@@ -77,7 +79,7 @@ public class FeignContentEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
@@ -86,15 +88,17 @@ public class FeignContentEncodingTests {
 	}

 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -16,18 +16,21 @@

 package org.springframework.cloud.openfeign.encoding;

+import java.util.Collections;
 import java.util.Optional;

+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
@@ -36,7 +39,6 @@ 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;
@@ -92,7 +94,7 @@ public class FeignPageableEncodingTests {
 	}

 	@EnableFeignClients(clients = InvoiceClient.class)
-	@LoadBalancerClient(name = "local", configuration = LocalClientConfiguration.class)
+	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
 			exclude = { RepositoryRestMvcAutoConfiguration.class })
@@ -103,15 +105,17 @@ public class FeignPageableEncodingTests {
 	}

 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ILoadBalancer ribbonLoadBalancer() {
+			BaseLoadBalancer balancer = new BaseLoadBalancer();
+			balancer.setServersList(
+					Collections.singletonList(new Server("localhost", this.port)));
+			return balancer;
 		}

 	}
@@ -18,14 +18,10 @@ package org.springframework.cloud.openfeign.hateoas.app;

 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 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.
@@ -33,26 +29,11 @@ import org.springframework.core.env.Environment;
 * @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();
-	}
-
 }
@@ -16,7 +16,14 @@

 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
@@ -26,4 +33,12 @@ 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;
+	}
+
 }
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
+import org.springframework.cloud.openfeign.hystrix.security.app.ProxyUsernameController;
+import org.springframework.cloud.openfeign.hystrix.security.app.TestInterceptor;
+import org.springframework.cloud.openfeign.hystrix.security.app.UsernameClient;
+import org.springframework.cloud.openfeign.hystrix.security.app.UsernameController;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * @author Daniel Lavoie
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableAutoConfiguration
+@EnableFeignClients(clients = UsernameClient.class)
+@Import(NoSecurityConfiguration.class)
+public class HystrixSecurityApplication {
+
+	@Bean
+	public CustomConcurrenyStrategy customConcurrenyStrategy() {
+		return new CustomConcurrenyStrategy();
+	}
+
+	@Bean
+	public TestInterceptor testInterceptor() {
+		return new TestInterceptor();
+	}
+
+	@Bean
+	public ProxyUsernameController proxyUsernameController() {
+		return new ProxyUsernameController();
+	}
+
+	@Bean
+	public UsernameController usernameController() {
+		return new UsernameController();
+	}
+
+}
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security;
+
+import java.util.Base64;
+
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurrencyStrategy;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests that a secured web service returning values using a feign client properly access
+ * the security context from a hystrix command.
+ *
+ * @author Daniel Lavoie
+ */
+@RunWith(SpringRunner.class)
+@DirtiesContext
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
+		properties = { "feign.hystrix.enabled=true" })
+@ActiveProfiles("proxysecurity")
+public class HystrixSecurityTests {
+
+	@Autowired
+	private CustomConcurrenyStrategy customConcurrenyStrategy;
+
+	@LocalServerPort
+	private String serverPort;
+
+	// TODO: move to constants in TestAutoConfiguration
+	private String username = "user";
+
+	private String password = "password";
+
+	public static HttpHeaders createBasicAuthHeader(final String username,
+			final String password) {
+		return new HttpHeaders() {
+			private static final long serialVersionUID = 1766341693637204893L;
+
+			{
+				String auth = username + ":" + password;
+				byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes());
+				String authHeader = "Basic " + new String(encodedAuth);
+				this.set("Authorization", authHeader);
+			}
+		};
+	}
+
+	@Test
+	public void testSecurityConcurrencyStrategyInstalled() {
+		HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance()
+				.getConcurrencyStrategy();
+		assertThat(concurrencyStrategy)
+				.isInstanceOf(SecurityContextConcurrencyStrategy.class);
+	}
+
+	@Test
+	public void testFeignHystrixSecurity() {
+		HttpHeaders headers = createBasicAuthHeader(this.username, this.password);
+
+		ResponseEntity<String> entity = new RestTemplate().exchange(
+				"http://localhost:" + this.serverPort + "/proxy-username", HttpMethod.GET,
+				new HttpEntity<Void>(headers), String.class);
+
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+		assertThat(entity.getBody())
+				.as("Username should have been intercepted by feign interceptor.")
+				.isEqualTo(this.username);
+
+		assertThat(this.customConcurrenyStrategy.isHookCalled())
+				.as("Custom hook should have been called.").isTrue();
+	}
+
+	@SpringBootConfiguration
+	@Import(HystrixSecurityApplication.class)
+	@RibbonClient(name = "username", configuration = LocalRibbonClientConfiguration.class)
+	protected static class TestConfig {
+
+	}
+
+	protected static class LocalRibbonClientConfiguration {
+
+		@LocalServerPort
+		private int port = 0;
+
+		@Bean
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
+		}
+
+	}
+
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import java.util.concurrent.Callable;
+
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+
+public class CustomConcurrenyStrategy extends HystrixConcurrencyStrategy {
+
+	private boolean hookCalled;
+
+	@Override
+	public <T> Callable<T> wrapCallable(Callable<T> callable) {
+		this.hookCalled = true;
+
+		return super.wrapCallable(callable);
+	}
+
+	public boolean isHookCalled() {
+		return this.hookCalled;
+	}
+
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Daniel Lavoie
+ */
+@RestController
+@RequestMapping("/proxy-username")
+public class ProxyUsernameController {
+
+	@Autowired
+	private UsernameClient usernameClient;
+
+	@RequestMapping
+	public String getUsername() {
+		return this.usernameClient.getUsername();
+	}
+
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hystrix.security.app;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * This interceptor should be called from an Hyxtrix command execution thread. It is
+ * access the SecurityContext and settings an http header from the authentication details.
+ *
+ * @author Daniel Lavoie
+ */
+public class TestInterceptor implements RequestInterceptor {
+
+	@Override
+	public void apply(RequestTemplate template) {
+		if (SecurityContextHolder.getContext().getAuthentication() != null) {
+			template.header("username",
+					SecurityContextHolder.getContext().getAuthentication().getName());
+		}
+	}
+
+}
@@ -14,18 +14,18 @@
 * limitations under the License.
 */

-package org.springframework.cloud.openfeign;
+package org.springframework.cloud.openfeign.hystrix.security.app;

-import feign.Feign;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;

 /**
- * Allows application to customize the Feign builder.
- *
- * @author Matt King
+ * @author Daniel Lavoie
 */
-@FunctionalInterface
-public interface FeignBuilderCustomizer {
+@FeignClient("username")
+public interface UsernameClient {

-	void customize(Feign.Builder builder);
+	@RequestMapping("/username")
+	String getUsername();

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

 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;
@@ -44,7 +50,9 @@ public class FeignClientValidationTests {
 	@Test
 	public void testServiceIdAndValue() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				LoadBalancerAutoConfiguration.class, NameAndServiceIdConfiguration.class);
+				LoadBalancerAutoConfiguration.class, RibbonAutoConfiguration.class,
+				FeignRibbonClientAutoConfiguration.class,
+				NameAndServiceIdConfiguration.class);
 		assertThat(context.getBean(NameAndServiceIdConfiguration.Client.class))
 				.isNotNull();
 		context.close();
@@ -55,6 +63,7 @@ public class FeignClientValidationTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.setAllowBeanDefinitionOverriding(false);
 		context.register(LoadBalancerAutoConfiguration.class,
+				RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class,
 				DuplicatedFeignClientNamesConfiguration.class);
 		context.refresh();
 		assertThat(
@@ -72,6 +81,47 @@ public class FeignClientValidationTests {
 		new AnnotationConfigApplicationContext(BadHostnameConfiguration.class);
 	}

+	@Test
+	public void testMissingFallback() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				MissingFallbackConfiguration.class)) {
+			this.expected.expectMessage("No fallback instance of type");
+			assertThat(context.getBean(MissingFallbackConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testWrongFallbackType() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				WrongFallbackTypeConfiguration.class)) {
+			this.expected.expectMessage("Incompatible fallback instance");
+			assertThat(context.getBean(WrongFallbackTypeConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testMissingFallbackFactory() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				MissingFallbackFactoryConfiguration.class)) {
+			this.expected.expectMessage("No fallbackFactory instance of type");
+			assertThat(context.getBean(MissingFallbackFactoryConfiguration.Client.class))
+					.isNotNull();
+		}
+	}
+
+	@Test
+	public void testWrongFallbackFactoryType() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				WrongFallbackFactoryTypeConfiguration.class)) {
+			this.expected.expectMessage("Incompatible fallbackFactory instance");
+			assertThat(
+					context.getBean(WrongFallbackFactoryTypeConfiguration.Client.class))
+							.isNotNull();
+		}
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
@@ -127,4 +177,123 @@ public class FeignClientValidationTests {

 	}

+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = MissingFallbackConfiguration.Client.class)
+	protected static class MissingFallbackConfiguration {
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallback = ClientFallback.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class ClientFallback implements Client {
+
+			@Override
+			public String get() {
+				return null;
+			}
+
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = WrongFallbackTypeConfiguration.Client.class)
+	protected static class WrongFallbackTypeConfiguration {
+
+		@Bean
+		Dummy dummy() {
+			return new Dummy();
+		}
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost", fallback = Dummy.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class Dummy {
+
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = MissingFallbackFactoryConfiguration.Client.class)
+	protected static class MissingFallbackFactoryConfiguration {
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallbackFactory = ClientFallback.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class ClientFallback implements FallbackFactory<Client> {
+
+			@Override
+			public Client create(Throwable cause) {
+				return null;
+			}
+
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Import(FeignAutoConfiguration.class)
+	@EnableFeignClients(clients = WrongFallbackFactoryTypeConfiguration.Client.class)
+	protected static class WrongFallbackFactoryTypeConfiguration {
+
+		@Bean
+		Dummy dummy() {
+			return new Dummy();
+		}
+
+		@Bean
+		public Feign.Builder feignBuilder() {
+			return HystrixFeign.builder();
+		}
+
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallbackFactory = Dummy.class)
+		interface Client {
+
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+
+		}
+
+		class Dummy {
+
+		}
+
+	}
+
 }
@@ -21,7 +21,7 @@ import java.util.Map;
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -29,6 +29,9 @@ 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;
@@ -36,38 +39,53 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Olga Maciaszek-Sharma
 */
-public class FeignLoadBalancerAutoConfigurationTests {
+class FeignLoadBalancerAutoConfigurationTests {

 	@Test
-	public void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
+	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
-	public void shouldInstantiateHttpFeignClientWhenEnabled() {
+	void shouldInstantiateHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext(
 				"spring.cloud.loadbalancer.ribbon.enabled=false");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		assertLoadBalanced(context, ApacheHttpClient.class);
+		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
 	}

 	@Test
-	public void shouldInstantiateOkHttpFeignClientWhenEnabled() {
+	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,
+				.sources(HttpClientConfiguration.class, RibbonAutoConfiguration.class,
 						LoadBalancerAutoConfiguration.class,
 						BlockingLoadBalancerClientAutoConfiguration.class,
+						FeignRibbonClientAutoConfiguration.class,
 						FeignLoadBalancerAutoConfiguration.class)
 				.run();
 	}
@@ -75,15 +93,21 @@ public class FeignLoadBalancerAutoConfigurationTests {
 	private void assertThatOneBeanPresent(ConfigurableApplicationContext context,
 			Class<?> beanClass) {
 		Map<String, ?> beans = context.getBeansOfType(beanClass);
-		assertThat(beans).as("Missing bean of type %s", beanClass).hasSize(1);
+		assertThat(beans).hasSize(1);
 	}

 	private void assertLoadBalanced(ConfigurableApplicationContext context,
 			Class delegateClass) {
 		Map<String, FeignBlockingLoadBalancerClient> beans = context
 				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
-		assertThat(beans).as("Missing bean of type %s", delegateClass).hasSize(1);
+		assertThat(beans).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();
+	}
+
 }
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Spencer Gibb
+ */
+public class CachingSpringLoadBalancerFactoryTests {
+
+	@Mock
+	private SpringClientFactory delegate;
+
+	@Mock
+	private RibbonLoadBalancedRetryFactory loadBalancedRetryFactory;
+
+	private CachingSpringLoadBalancerFactory factory;
+
+	@Before
+	public void init() {
+		MockitoAnnotations.initMocks(this);
+
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+
+		when(this.delegate.getClientConfig("client1")).thenReturn(config);
+		when(this.delegate.getClientConfig("client2")).thenReturn(config);
+
+		this.factory = new CachingSpringLoadBalancerFactory(this.delegate,
+				this.loadBalancedRetryFactory);
+	}
+
+	@Test
+	public void delegateCreatesWhenMissing() {
+		FeignLoadBalancer client = this.factory.create("client1");
+		assertThat(client).as("client was null").isNotNull();
+
+		verify(this.delegate, times(1)).getClientConfig("client1");
+	}
+
+	@Test
+	public void cacheWorks() {
+		FeignLoadBalancer client = this.factory.create("client2");
+		assertThat(client).as("client was null").isNotNull();
+
+		client = this.factory.create("client2");
+		assertThat(client).as("client was null").isNotNull();
+
+		verify(this.delegate, times(1)).getClientConfig("client2");
+	}
+
+	@Test
+	public void delegateCreatesWithNoRetry() {
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+		when(this.delegate.getClientConfig("retry")).thenReturn(config);
+		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
+				this.delegate);
+		FeignLoadBalancer client = this.factory.create("retry");
+		assertThat(client).as("client was null").isNotNull();
+	}
+
+	@Test
+	public void delegateCreatesWithRetry() {
+		IClientConfig config = new DefaultClientConfigImpl();
+		config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+		config.set(CommonClientConfigKey.ReadTimeout, 500);
+		when(this.delegate.getClientConfig("retry")).thenReturn(config);
+		CachingSpringLoadBalancerFactory factory = new CachingSpringLoadBalancerFactory(
+				this.delegate, this.loadBalancedRetryFactory);
+		FeignLoadBalancer client = this.factory.create("retry");
+		assertThat(client).as("client was null").isNotNull();
+	}
+
+}
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.RoundRobinRule;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
+import feign.Client;
+import feign.Request;
+import feign.Request.Options;
+import feign.RequestTemplate;
+import feign.Response;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonRequest;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonResponse;
+
+import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
+import static com.netflix.client.config.CommonClientConfigKey.IsSecure;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
+import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOperations;
+import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
+import static feign.Request.HttpMethod.GET;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+public class FeignLoadBalancerTests {
+
+	@Mock
+	private Client delegate;
+
+	@Mock
+	private ILoadBalancer lb;
+
+	@Mock
+	private IClientConfig config;
+
+	private FeignLoadBalancer feignLoadBalancer;
+
+	private ServerIntrospector inspector = new DefaultServerIntrospector();
+
+	private Integer defaultConnectTimeout = 10000;
+
+	private Integer defaultReadTimeout = 10000;
+
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		when(this.config.get(MaxAutoRetries, DEFAULT_MAX_AUTO_RETRIES)).thenReturn(1);
+		when(this.config.get(MaxAutoRetriesNextServer,
+				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(1);
+		when(this.config.get(OkToRetryOnAllOperations, eq(anyBoolean())))
+				.thenReturn(true);
+		when(this.config.get(ConnectTimeout)).thenReturn(this.defaultConnectTimeout);
+		when(this.config.get(ReadTimeout)).thenReturn(this.defaultReadTimeout);
+		when(this.config.get(OkToRetryOnAllOperations, false)).thenReturn(true);
+	}
+
+	@Test
+	public void testUriInsecure() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
+				.resolve(new HashMap<>()).request();
+		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
+				new URI(request.url()));
+
+		Response response = Response.builder().request(request).status(200).reason("Test")
+				.headers(Collections.emptyMap()).body(new byte[0]).build();
+		when(this.delegate.execute(any(Request.class), any(Options.class)))
+				.thenReturn(response);
+
+		RibbonResponse resp = this.feignLoadBalancer.execute(ribbonRequest, null);
+
+		assertThat(resp.getRequestedURI()).isEqualTo(new URI("https://foo"));
+	}
+
+	@Test
+	public void testSecureUriFromClientConfig() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(true);
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Server server = new Server("foo", 7777);
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("https://foo/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
+	}
+
+	@Test
+	public void testInsecureUriFromInsecureClientConfigToSecureServerIntrospector()
+			throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				new ServerIntrospector() {
+					@Override
+					public boolean isSecure(Server server) {
+						return true;
+					}
+
+					@Override
+					public Map<String, String> getMetadata(Server server) {
+						return null;
+					}
+				});
+		Server server = new Server("foo", 7777);
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("https://foo/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
+	}
+
+	@Test
+	public void testSecureUriFromClientConfigOverride() throws Exception {
+		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
+				this.inspector);
+		Server server = Mockito.mock(Server.class);
+		when(server.getPort()).thenReturn(443);
+		when(server.getHost()).thenReturn("foo");
+		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
+				new URI("https://bar/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:443/"));
+	}
+
+	@Test
+	public void testRibbonRequestURLEncode() throws Exception {
+		String url = "https://foo/?name=%7bcookie"; // name={cookie
+		Request request = Request.create(GET, url, new HashMap<>(), null, null, null);
+
+		assertThat(request.url()).isEqualTo(url);
+
+		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
+				new URI(request.url()));
+
+		Request cloneRequest = ribbonRequest.toRequest();
+
+		assertThat(cloneRequest.url()).isEqualTo(url);
+
+	}
+
+	@Test
+	public void testOverrideFeignLoadBalancer() throws Exception {
+		when(this.config.get(IsSecure)).thenReturn(false);
+		Server server1 = new Server("foo", 6666);
+		Server server2 = new Server("foo", 7777);
+		BaseLoadBalancer baseLoadBalancer = new BaseLoadBalancer();
+		baseLoadBalancer.setRule(new RoundRobinRule() {
+			@Override
+			public Server choose(Object loadBalancerKey) {
+				return loadBalancerKey == null ? server2 : server1;
+			}
+		});
+
+		this.feignLoadBalancer = new FeignLoadBalancer(baseLoadBalancer, this.config,
+				this.inspector) {
+			protected void customizeLoadBalancerCommandBuilder(
+					final FeignLoadBalancer.RibbonRequest request,
+					final IClientConfig config,
+					final LoadBalancerCommand.Builder<FeignLoadBalancer.RibbonResponse> builder) {
+				builder.withServerLocator(request.getRequest().headers().get("c_ip"));
+			}
+		};
+		Request request = new RequestTemplate().method(GET).resolve(new HashMap<>())
+				.request();
+		RibbonResponse resp = this.feignLoadBalancer.executeWithLoadBalancer(
+				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort()).isEqualTo(7777);
+		request = new RequestTemplate().method(GET).header("c_ip", "666")
+				.resolve(new HashMap<>()).request();
+		resp = this.feignLoadBalancer.executeWithLoadBalancer(
+				new RibbonRequest(this.delegate, request, new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort()).isEqualTo(6666);
+	}
+
+}
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author Venil Noronha
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "spring.application.name=feignribbonclientpathtest",
+				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
+				"feign.hystrix.enabled=false", "test.path.prefix=/base/path" // For
+																				// pathWithPlaceholder
+																				// test
+		})
+@DirtiesContext
+public class FeignRibbonClientPathTests {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Autowired
+	private TestClient1 testClient1;
+
+	@Autowired
+	private TestClient2 testClient2;
+
+	@Autowired
+	private TestClient3 testClient3;
+
+	@Autowired
+	private TestClient4 testClient4;
+
+	@Autowired
+	private TestClient5 testClient5;
+
+	@Test
+	public void pathWithLeadingButNotTrailingSlash() {
+		testClientPath(this.testClient1);
+	}
+
+	@Test
+	public void pathWithoutLeadingAndTrailingSlash() {
+		testClientPath(this.testClient2);
+	}
+
+	@Test
+	public void pathWithoutLeadingButTrailingSlash() {
+		testClientPath(this.testClient3);
+	}
+
+	@Test
+	public void pathWithLeadingAndTrailingSlash() {
+		testClientPath(this.testClient4);
+	}
+
+	@Test
+	public void pathWithPlaceholder() {
+		testClientPath(this.testClient5);
+	}
+
+	private void testClientPath(TestClient testClient) {
+		Hello hello = testClient.getHello();
+		assertThat(hello).as("Object returned was null").isNotNull();
+		assertThat(hello.getMessage()).as("Response object value didn't match")
+				.isEqualTo("hello world");
+	}
+
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+	}
+
+	@FeignClient(name = "localapp", path = "/base/path")
+	protected interface TestClient1 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp1", path = "base/path")
+	protected interface TestClient2 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp2", path = "base/path/")
+	protected interface TestClient3 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp3", path = "/base/path/")
+	protected interface TestClient4 extends TestClient {
+
+	}
+
+	@FeignClient(name = "localapp4", path = "${test.path.prefix}")
+	protected interface TestClient5 extends TestClient {
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@RequestMapping("/base/path")
+	@EnableFeignClients(clients = { TestClient1.class, TestClient2.class,
+			TestClient3.class, TestClient4.class, TestClient5.class })
+	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
+	@Import(NoSecurityConfiguration.class)
+	public static class Application {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		public Hello getHello() {
+			return new Hello("hello world");
+		}
+
+	}
+
+	public static class Hello {
+
+		private String message;
+
+		public Hello() {
+		}
+
+		public Hello(String message) {
+			this.message = message;
+		}
+
+		public String getMessage() {
+			return this.message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	public static class LocalRibbonClientConfiguration {
+
+		@Value("${local.server.port}")
+		private int port = 0;
+
+		@Bean
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
+		}
+
+	}
+
+}
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * Tests the Feign Retryer, not ribbon retry.
+ *
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "spring.application.name=feignclientretrytest",
+				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
+				"feign.hystrix.enabled=false", "localapp.ribbon.MaxAutoRetries=2",
+				"localapp.ribbon.MaxAutoRetriesNextServer=3" })
+@DirtiesContext
+public class FeignRibbonClientRetryTests {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Autowired
+	private TestClient testClient;
+
+	@Test
+	public void testClient() {
+		assertThat(this.testClient).as("testClient was null").isNotNull();
+		assertThat(Proxy.isProxyClass(this.testClient.getClass()))
+				.as("testClient is not a java Proxy").isTrue();
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.testClient);
+		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
+	}
+
+	@Test
+	public void testRetries() {
+		int retryMe = this.testClient.retryMe();
+		assertThat(1).as("retryCount didn't match").isEqualTo(retryMe);
+		// TODO: not sure how to verify retry happens. Debugging through it, it works
+		// maybe the assertEquals above is enough because of the bogus servers
+	}
+
+	@FeignClient("localapp")
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
+		int retryMe();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = TestClient.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
+	@Import(NoSecurityConfiguration.class)
+	public static class Application {
+
+		private AtomicInteger retries = new AtomicInteger(1);
+
+		@RequestMapping(method = RequestMethod.GET, value = "/hello")
+		public Hello getHello() {
+			return new Hello("hello world 1");
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/retryme")
+		public int retryMe() {
+			return this.retries.getAndIncrement();
+		}
+
+	}
+
+	public static class Hello {
+
+		private String message;
+
+		public Hello() {
+		}
+
+		public Hello(String message) {
+			this.message = message;
+		}
+
+		public String getMessage() {
+			return this.message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+	}
+
+}
+
+// Load balancer with fixed server list for "local" pointing to localhost
+// some bogus servers are thrown in to test retry
+@Configuration(proxyBeanMethods = false)
+class LocalRibbonClientConfiguration {
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	@Bean
+	public ServerList<Server> ribbonServerList() {
+		return new StaticServerList<>(new Server("mybadhost", 80),
+				new Server("mybadhost2", 10002), new Server("mybadhost3", 10003),
+				new Server("localhost", this.port));
+	}
+
+}
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.util.HashMap;
+
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.AbstractLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.LoadBalancerStats;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerStats;
+import feign.Client;
+import feign.Request;
+import feign.Request.Options;
+import feign.RequestTemplate;
+import org.hamcrest.CustomMatcher;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import static feign.Request.HttpMethod.GET;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+
+/**
+ * @author Dave Syer
+ * @author Spencer Gibb
+ */
+public class FeignRibbonClientTests {
+
+	private AbstractLoadBalancer loadBalancer = mock(AbstractLoadBalancer.class);
+
+	private Client delegate = mock(Client.class);
+
+	private SpringClientFactory factory = new SpringClientFactory() {
+		@Override
+		public IClientConfig getClientConfig(String name) {
+			DefaultClientConfigImpl config = new DefaultClientConfigImpl();
+			config.set(CommonClientConfigKey.ConnectTimeout, 1000);
+			config.set(CommonClientConfigKey.ReadTimeout, 500);
+			return config;
+		}
+
+		@Override
+		public <C> C getInstance(String name, Class<C> type) {
+			if (type.isAssignableFrom(ServerIntrospector.class)) {
+				@SuppressWarnings("unchecked")
+				C instance = (C) new DefaultServerIntrospector();
+				return instance;
+			}
+			return null;
+		}
+
+		@Override
+		public ILoadBalancer getLoadBalancer(String name) {
+			return FeignRibbonClientTests.this.loadBalancer;
+		}
+	};
+
+	// Even though we don't maintain FeignRibbonClient, keep these tests
+	// around to make sure the expected behaviour doesn't break
+	private Client client = new LoadBalancerFeignClient(this.delegate,
+			new CachingSpringLoadBalancerFactory(this.factory), this.factory);
+
+	@Before
+	public void init() {
+		when(this.loadBalancer.chooseServer(any()))
+				.thenReturn(new Server("foo.com", 8000));
+		// to fix NPE
+		LoadBalancerStats stats = mock(LoadBalancerStats.class);
+		when(this.loadBalancer.getLoadBalancerStats()).thenReturn(stats);
+		when(stats.getSingleServerStat(any(Server.class)))
+				.thenReturn(mock(ServerStats.class));
+	}
+
+	@Test
+	public void remoteRequestIsSentAtRoot() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void remoteRequestIsSent() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void verifyCleanUrl() throws Exception {
+		Request request = new RequestTemplate().method(GET)
+				.target("https://tp/abc/bcd.json").resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/abc/bcd.json");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	@Test
+	public void remoteRequestIsSecure() throws Exception {
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
+				.resolve(new HashMap<>()).request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher), any(Options.class));
+	}
+
+	private final static class RequestMatcher extends CustomMatcher<Request> {
+
+		private String url;
+
+		private RequestMatcher(String url) {
+			super("request has URI: " + url);
+			this.url = url;
+		}
+
+		@Override
+		public boolean matches(Object item) {
+			Request request = (Request) item;
+			return request.url().equals(this.url);
+		}
+
+	}
+
+}
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.lang.reflect.Field;
+
+import javax.net.ssl.SSLContextSpi;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.config.Lookup;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.impl.conn.DefaultHttpClientConnectionOperator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+		classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = { "debug=true", "feign.httpclient.disableSslValidation=true" })
+@DirtiesContext
+public class FeignRibbonHttpClientConfigurationTests {
+
+	@Autowired
+	HttpClientConnectionManager connectionManager;
+
+	@Test
+	public void disableSslTest() throws Exception {
+		Lookup<ConnectionSocketFactory> socketFactoryRegistry = getConnectionSocketFactoryLookup(
+				this.connectionManager);
+		assertThat(socketFactoryRegistry.lookup("https")).isNotNull();
+		assertThat(this.getX509TrustManager(socketFactoryRegistry).getAcceptedIssuers())
+				.isNull();
+	}
+
+	private Lookup<ConnectionSocketFactory> getConnectionSocketFactoryLookup(
+			HttpClientConnectionManager connectionManager) {
+		DefaultHttpClientConnectionOperator connectionOperator = (DefaultHttpClientConnectionOperator) this
+				.getField(connectionManager, "connectionOperator");
+		return (Lookup) this.getField(connectionOperator, "socketFactoryRegistry");
+	}
+
+	private X509TrustManager getX509TrustManager(
+			Lookup<ConnectionSocketFactory> socketFactoryRegistry) {
+		ConnectionSocketFactory connectionSocketFactory = (ConnectionSocketFactory) socketFactoryRegistry
+				.lookup("https");
+		SSLSocketFactory sslSocketFactory = (SSLSocketFactory) this
+				.getField(connectionSocketFactory, "socketfactory");
+		SSLContextSpi sslContext = (SSLContextSpi) this.getField(sslSocketFactory,
+				"context");
+		return (X509TrustManager) this.getField(sslContext, "trustManager");
+	}
+
+	protected <T> Object getField(Object target, String name) {
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
+		return value;
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	static class FeignRibbonHttpClientConfigurationTestsApplication {
+
+		public static void main(String[] args) {
+			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
+					.run(args);
+		}
+
+	}
+
+}
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.lang.reflect.Field;
+
+import javax.net.ssl.HostnameVerifier;
+
+import okhttp3.OkHttpClient;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+		classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = { "debug=true", "feign.httpclient.disableSslValidation=true",
+				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
+@DirtiesContext
+public class FeignRibbonOkHttpClientConfigurationTests {
+
+	@Autowired
+	OkHttpClient httpClient;
+
+	@Test
+	public void disableSslTest() throws Exception {
+		HostnameVerifier hostnameVerifier = (HostnameVerifier) this
+				.getField(this.httpClient, "hostnameVerifier");
+		assertThat(
+				OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier))
+						.isTrue();
+	}
+
+	protected <T> Object getField(Object target, String name) {
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
+		return value;
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	static class FeignRibbonOkHttpClientConfigurationTestsApplication {
+
+		public static void main(String[] args) {
+			new SpringApplicationBuilder(FeignRibbonClientRetryTests.Application.class)
+					.run(args);
+		}
+
+	}
+
+}
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.IClientConfig;
+import feign.Request;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.FeignContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT,
+		value = { "spring.application.name=loadBalancerFeignClientTests",
+				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
+@DirtiesContext
+public class LoadBalancerFeignClientOverrideTests {
+
+	@Autowired
+	private FeignContext context;
+
+	@Test
+	public void overrideRequestOptions() {
+		// specific ribbon 'bar' configuration via spring bean
+		Request.Options barOptions = this.context.getInstance("bar",
+				Request.Options.class);
+		assertThat(barOptions.connectTimeoutMillis()).isEqualTo(1);
+		assertThat(barOptions.readTimeoutMillis()).isEqualTo(2);
+		assertOptions(barOptions, "bar", 1, 2);
+
+		// specific ribbon 'foo' configuration via application.yml
+		Request.Options fooOptions = this.context.getInstance("foo",
+				Request.Options.class);
+		assertThat(fooOptions).isEqualTo(LoadBalancerFeignClient.DEFAULT_OPTIONS);
+		assertOptions(fooOptions, "foo", 7, 17);
+
+		// generic ribbon default configuration
+		Request.Options bazOptions = this.context.getInstance("baz",
+				Request.Options.class);
+		assertThat(bazOptions).isEqualTo(LoadBalancerFeignClient.DEFAULT_OPTIONS);
+		assertOptions(bazOptions, "baz", 3001, 60001);
+	}
+
+	void assertOptions(Request.Options options, String name, int expectedConnect,
+			int expectedRead) {
+		LoadBalancerFeignClient client = this.context.getInstance(name,
+				LoadBalancerFeignClient.class);
+		IClientConfig config = client.getClientConfig(options, name);
+		assertThat(config.get(CommonClientConfigKey.ConnectTimeout, -1).intValue())
+				.as("connect was wrong for " + name).isEqualTo(expectedConnect);
+		assertThat(config.get(CommonClientConfigKey.ReadTimeout, -1).intValue())
+				.as("read was wrong for " + name).isEqualTo(expectedRead);
+	}
+
+	@FeignClient(value = "foo", configuration = FooConfiguration.class)
+	interface FooClient {
+
+		@RequestMapping("/")
+		String get();
+
+	}
+
+	@FeignClient(value = "bar", configuration = BarConfiguration.class)
+	interface BarClient {
+
+		@RequestMapping("/")
+		String get();
+
+	}
+
+	@FeignClient("baz")
+	interface BazClient {
+
+		@RequestMapping("/")
+		String get();
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableFeignClients(clients = { FooClient.class, BarClient.class, BazClient.class })
+	@EnableAutoConfiguration
+	protected static class TestConfiguration {
+
+	}
+
+	public static class FooConfiguration {
+
+	}
+
+	public static class BarConfiguration {
+
+		@Bean
+		public Request.Options feignRequestOptions() {
+			return new Request.Options(1, 2);
+		}
+
+	}
+
+}
@@ -0,0 +1,702 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+
+import com.netflix.client.DefaultLoadBalancerRetryHandler;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
+import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
+import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicy;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerContext;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.retry.RetryCallback;
+import org.springframework.retry.RetryContext;
+import org.springframework.retry.RetryListener;
+import org.springframework.retry.TerminatedRetryException;
+import org.springframework.retry.backoff.BackOffContext;
+import org.springframework.retry.backoff.BackOffInterruptedException;
+import org.springframework.retry.backoff.BackOffPolicy;
+
+import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
+import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
+import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOperations;
+import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
+import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
+import static feign.Request.HttpMethod.GET;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Ryan Baxter
+ * @author Gang Li
+ * @author Olga Maciaszek-Sharma
+ */
+public class RetryableFeignLoadBalancerTests {
+
+	@Mock
+	private ILoadBalancer lb;
+
+	@Mock
+	private IClientConfig config;
+
+	private ServerIntrospector inspector = new DefaultServerIntrospector();
+
+	private Integer defaultConnectTimeout = 10000;
+
+	private Integer defaultReadTimeout = 10000;
+
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		when(this.config.get(MaxAutoRetries, DEFAULT_MAX_AUTO_RETRIES)).thenReturn(1);
+		when(this.config.get(MaxAutoRetriesNextServer,
+				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(1);
+		when(this.config.get(OkToRetryOnAllOperations, eq(anyBoolean())))
+				.thenReturn(true);
+		when(this.config.get(ConnectTimeout)).thenReturn(this.defaultConnectTimeout);
+		when(this.config.get(ReadTimeout)).thenReturn(this.defaultReadTimeout);
+		when(this.config.get(OkToRetryOnAllOperations, false)).thenReturn(true);
+	}
+
+	@Test
+	public void executeNoFailure() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("404,502,foo, ,").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory);
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().status(200).request(feignRequest)
+				.headers(new HashMap<>()).build();
+		doReturn(response).when(client).execute(any(Request.class),
+				any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
+		verify(client, times(1)).execute(any(Request.class), any(Request.Options.class));
+	}
+
+	@Test
+	public void executeNeverRetry() throws Exception {
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		doThrow(new IOException("boom")).when(client).execute(any(Request.class),
+				any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				this.config, this.inspector, new LoadBalancedRetryFactory() {
+					@Override
+					public LoadBalancedRetryPolicy createRetryPolicy(String s,
+							ServiceInstanceChooser serviceInstanceChooser) {
+						return null;
+					}
+
+					@Override
+					public RetryListener[] createRetryListeners(String service) {
+						return new RetryListener[0];
+					}
+
+					@Override
+					public BackOffPolicy createBackOffPolicy(String service) {
+						return null;
+					}
+				});
+		try {
+			feignLb.execute(request, null);
+		}
+		catch (Exception e) {
+			assertThat(e).isInstanceOf(IOException.class);
+		}
+		finally {
+			verify(client, times(1)).execute(any(Request.class),
+					any(Request.Options.class));
+		}
+	}
+
+	@Test
+	public void executeRetry() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().status(200).request(feignRequest)
+				.headers(new HashMap<>()).build();
+		doThrow(new IOException("boom")).doReturn(response).when(client)
+				.execute(any(Request.class), any(Request.Options.class));
+
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+	}
+
+	@Test
+	public void executeRetryOnStatusCode() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("404").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().request(feignRequest).status(200)
+				.headers(new HashMap<>()).build();
+		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
+				.headers(new HashMap<>()).build();
+		doReturn(fourOFourResponse).doReturn(response).when(client)
+				.execute(any(Request.class), any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+	}
+
+	@Test
+	public void executeRetryOnStatusCodeWithEmptyBody() throws Exception {
+		int retriesNextServer = 0;
+		when(this.config.get(MaxAutoRetriesNextServer,
+				DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(retriesNextServer);
+		doReturn(new Server("foo", 80)).when(this.lb).chooseServer(any());
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(retriesNextServer).when(config)
+				.get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer), anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("404").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().request(feignRequest).status(404)
+				.headers(new HashMap<>()).build();
+		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
+				.headers(new HashMap<>()).build();
+		doReturn(fourOFourResponse).doReturn(response).when(client)
+				.execute(any(Request.class), any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(404);
+		assertThat(ribbonResponse.toResponse().body().length())
+				.isEqualTo(Integer.valueOf(0));
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+	}
+
+	@Test
+	public void getRequestSpecificRetryHandler() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory);
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().request(feignRequest).status(200)
+				.headers(new HashMap<>()).build();
+		doReturn(response).when(client).execute(any(Request.class),
+				any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				this.config, this.inspector, loadBalancedRetryFactory);
+		RequestSpecificRetryHandler retryHandler = feignLb
+				.getRequestSpecificRetryHandler(request, this.config);
+		assertThat(retryHandler.getMaxRetriesOnNextServer()).isEqualTo(1);
+		assertThat(retryHandler.getMaxRetriesOnSameServer()).isEqualTo(1);
+
+	}
+
+	@Test
+	public void choose() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory);
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response response = Response.builder().request(feignRequest).status(200)
+				.headers(new HashMap<>()).build();
+		doReturn(response).when(client).execute(any(Request.class),
+				any(Request.Options.class));
+		final Server server = new Server("foo", 80);
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(
+				new ILoadBalancer() {
+					@Override
+					public void addServers(List<Server> list) {
+
+					}
+
+					@Override
+					public Server chooseServer(Object o) {
+						return server;
+					}
+
+					@Override
+					public void markServerDown(Server server) {
+
+					}
+
+					@Override
+					public List<Server> getServerList(boolean b) {
+						return null;
+					}
+
+					@Override
+					public List<Server> getReachableServers() {
+						return null;
+					}
+
+					@Override
+					public List<Server> getAllServers() {
+						return null;
+					}
+				}, this.config, this.inspector, loadBalancedRetryFactory);
+		ServiceInstance serviceInstance = feignLb.choose("foo");
+		assertThat(serviceInstance.getHost()).isEqualTo("foo");
+		assertThat(serviceInstance.getPort()).isEqualTo(80);
+
+	}
+
+	@Test
+	public void retryListenerTest() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		MyRetryListener myRetryListener = new MyRetryListener();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public RetryListener[] createRetryListeners(String service) {
+				return new RetryListener[] { myRetryListener };
+			}
+
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://listener"));
+		Response response = Response.builder().request(feignRequest).status(200)
+				.headers(new HashMap<>()).build();
+		doThrow(new IOException("boom")).doReturn(response).when(client)
+				.execute(any(Request.class), any(Request.Options.class));
+
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+		assertThat(myRetryListener.getOnError()).isEqualTo(1);
+	}
+
+	@Test(expected = TerminatedRetryException.class)
+	public void retryListenerTestNoRetry() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		MyRetryListenerNotRetry myRetryListenerNotRetry = new MyRetryListenerNotRetry();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public RetryListener[] createRetryListeners(String service) {
+				return new RetryListener[] { myRetryListenerNotRetry };
+			}
+
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://listener"));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+	}
+
+	@Test
+	public void retryWithDefaultConstructorTest() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryPolicyFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://listener"));
+		Response response = Response.builder().request(feignRequest).status(200)
+				.headers(new HashMap<>()).build();
+		doThrow(new IOException("boom")).doReturn(response).when(client)
+				.execute(any(Request.class), any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryPolicyFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		assertThat(ribbonResponse.toResponse().status()).isEqualTo(200);
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+	}
+
+	@Test
+	public void executeRetryFail() throws Exception {
+		RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(this.lb,
+				this.config);
+		lbContext.setRetryHandler(new DefaultLoadBalancerRetryHandler(1, 0, true));
+		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
+		IClientConfig config = mock(IClientConfig.class);
+		doReturn(1).when(config).get(eq(CommonClientConfigKey.MaxAutoRetries), anyInt());
+		doReturn(0).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer),
+				anyInt());
+		doReturn(true).when(config)
+				.get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
+		doReturn(this.defaultConnectTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ConnectTimeout));
+		doReturn(this.defaultReadTimeout).when(config)
+				.get(eq(CommonClientConfigKey.ReadTimeout));
+		doReturn("404").when(config).getPropertyAsString(
+				eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES), eq(""));
+		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
+		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
+		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
+		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
+				clientFactory) {
+			@Override
+			public BackOffPolicy createBackOffPolicy(String service) {
+				return backOffPolicy;
+			}
+		};
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+				new byte[] {}, UTF_8, null);
+		Client client = mock(Client.class);
+		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
+				client, feignRequest, new URI("https://foo"));
+		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
+				.headers(new HashMap<>()).body(new Response.Body() { // set content into
+																		// response
+					@Override
+					public Integer length() {
+						return "test".getBytes().length;
+					}
+
+					@Override
+					public boolean isRepeatable() {
+						return true;
+					}
+
+					@Override
+					public InputStream asInputStream() throws IOException {
+						return new ByteArrayInputStream("test".getBytes());
+					}
+
+					@Override
+					public Reader asReader() throws IOException {
+						return new InputStreamReader(asInputStream(), UTF_8);
+					}
+
+					@Override
+					public Reader asReader(Charset charset) throws IOException {
+						return new InputStreamReader(asInputStream(), charset);
+					}
+
+					@Override
+					public void close() throws IOException {
+					}
+				}).build();
+		doReturn(fourOFourResponse).when(client).execute(any(Request.class),
+				any(Request.Options.class));
+		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
+				config, this.inspector, loadBalancedRetryFactory);
+		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
+		verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
+		assertThat(backOffPolicy.getCount()).isEqualTo(1);
+		InputStream inputStream = ribbonResponse.toResponse().body().asInputStream();
+		byte[] buf = new byte[100];
+		int read = inputStream.read(buf);
+		assertThat(new String(buf, 0, read)).isEqualTo("test");
+	}
+
+	class MyBackOffPolicy implements BackOffPolicy {
+
+		private int count = 0;
+
+		@Override
+		public BackOffContext start(RetryContext retryContext) {
+			return null;
+		}
+
+		@Override
+		public void backOff(BackOffContext backOffContext)
+				throws BackOffInterruptedException {
+			this.count++;
+		}
+
+		public int getCount() {
+			return this.count;
+		}
+
+	}
+
+	class MyRetryListener implements RetryListener {
+
+		private int onError = 0;
+
+		@Override
+		public <T, E extends Throwable> boolean open(RetryContext context,
+				RetryCallback<T, E> callback) {
+			return true;
+		}
+
+		@Override
+		public <T, E extends Throwable> void close(RetryContext context,
+				RetryCallback<T, E> callback, Throwable throwable) {
+
+		}
+
+		@Override
+		public <T, E extends Throwable> void onError(RetryContext context,
+				RetryCallback<T, E> callback, Throwable throwable) {
+			this.onError++;
+		}
+
+		public int getOnError() {
+			return this.onError;
+		}
+
+	}
+
+	class MyRetryListenerNotRetry implements RetryListener {
+
+		@Override
+		public <T, E extends Throwable> boolean open(RetryContext context,
+				RetryCallback<T, E> callback) {
+			return false;
+		}
+
+		@Override
+		public <T, E extends Throwable> void close(RetryContext context,
+				RetryCallback<T, E> callback, Throwable throwable) {
+
+		}
+
+		@Override
+		public <T, E extends Throwable> void onError(RetryContext context,
+				RetryCallback<T, E> callback, Throwable throwable) {
+		}
+
+	}
+
+}
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.ribbon;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+import 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<>();
+		List<String> fooValues = new ArrayList<>();
+		fooValues.add("bar");
+		headers.put("foo", fooValues);
+		Request request = Request.create(GET, "https://service.com", new HashMap<>(),
+				new byte[] {}, Charset.defaultCharset(), null);
+		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");
+	}
+
+}
@@ -68,8 +68,13 @@ 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);
 	}

@@ -87,8 +92,13 @@ 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");
 	}

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.support;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.openfeign.CollectionFormat;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Olga Maciaszek-Sharma
+ */
+@SpringBootTest(classes = PageableSupportTest.Config.class,
+		webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class PageableSupportTest {
+
+	@Autowired
+	private PageableFeignClient feignClient;
+
+	@BeforeAll
+	public static void beforeClass() {
+		System.setProperty("server.port",
+				String.valueOf(SocketUtils.findAvailableTcpPort()));
+	}
+
+	@Test
+	void shouldProperlyFormatPageable() {
+		String direction = feignClient.performRequest(
+				PageRequest.of(1, 10, Sort.by(Sort.Order.desc("property"))));
+
+		assertThat(direction).isEqualTo("DESC");
+	}
+
+	@FeignClient(name = "pageable", url = "http://localhost:${server.port}/")
+	protected interface PageableFeignClient {
+
+		@CollectionFormat(feign.CollectionFormat.CSV)
+		@GetMapping(path = "/page")
+		String performRequest(Pageable page);
+
+	}
+
+	@SuppressWarnings("ConstantConditions")
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@RestController
+	@EnableFeignClients(clients = PageableFeignClient.class)
+	@Import(NoSecurityConfiguration.class)
+	protected static class Config {
+
+		@GetMapping(path = "/page")
+		String performRequest(Pageable page) {
+			return page.getSort().getOrderFor("property").getDirection().toString();
+		}
+
+	}
+
+}
@@ -31,12 +31,10 @@ 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.CollectionFormat;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -62,6 +60,7 @@ 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 feign.CollectionFormat.SSV;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;

@@ -71,8 +70,8 @@ import static org.junit.Assume.assumeTrue;
 * @author Aram Peres
 * @author Aaron Whiteside
 * @author Artyom Romanenko
+ * @author Olga Maciaszek-Sharma
 */
-@RunWith(JUnitParamsRunner.class)
 public class SpringMvcContractTests {

 	private static final Class<?> EXECUTABLE_TYPE;
@@ -123,14 +122,14 @@ public class SpringMvcContractTests {
 		conversionServiceFactoryBean.afterPropertiesSet();
 		ConversionService conversionService = conversionServiceFactoryBean.getObject();

-		this.contract = new SpringMvcContract(Collections.emptyList(), conversionService);
+		contract = new SpringMvcContract(Collections.emptyList(), conversionService);
 	}

 	@Test
 	public void testProcessAnnotationOnMethod_Simple() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest",
 				String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test/{id}");
@@ -143,7 +142,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_Simple() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest",
 				String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test/{id}");
@@ -158,7 +157,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_SimpleGetMapping() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("getMappingTest",
 				String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test/{id}");
@@ -174,7 +173,7 @@ public class SpringMvcContractTests {
 			throws Exception {
 		Method method = TestTemplate_Class_Annotations.class
 				.getDeclaredMethod("getSpecificTest", String.class, String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/prepend/{classId}/test/{testId}");
@@ -188,7 +187,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_Class_AnnotationsGetAllTests() throws Exception {
 		Method method = TestTemplate_Class_Annotations.class
 				.getDeclaredMethod("getAllTests", String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/prepend/{classId}");
@@ -201,12 +200,12 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_ExtendedInterface() throws Exception {
 		Method extendedMethod = TestTemplate_Extended.class.getMethod("getAllTests",
 				String.class);
-		MethodMetadata extendedData = this.contract.parseAndValidateMetadata(
+		MethodMetadata extendedData = contract.parseAndValidateMetadata(
 				extendedMethod.getDeclaringClass(), extendedMethod);

 		Method method = TestTemplate_Class_Annotations.class
 				.getDeclaredMethod("getAllTests", String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo(extendedData.template().url());
@@ -220,7 +219,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_SimplePost() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("postTest",
 				TestObject.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/");
@@ -234,7 +233,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_SimplePostMapping() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("postMappingTest",
 				TestObject.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/");
@@ -248,7 +247,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotationsOnMethod_Advanced() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest",
 				String.class, String.class, Integer.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url())
@@ -263,16 +262,28 @@ public class SpringMvcContractTests {
 			throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest",
 				String.class, String.class, Integer.class);
-		this.contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		contract.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		// Don't throw an exception and this passes
 	}

+	@Test
+	public void testProcessAnnotationsOnMethod_CollectionFormat()
+			throws NoSuchMethodException {
+		Method method = TestTemplate_Advanced.class
+				.getDeclaredMethod("getWithCollectionFormat");
+
+		MethodMetadata data = contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertThat(data.template().collectionFormat()).isEqualTo(SSV);
+	}
+
 	@Test
 	public void testProcessAnnotations_Advanced() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest",
 				String.class, String.class, Integer.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url())
@@ -297,7 +308,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_Aliased() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest2",
 				String.class, Integer.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url())
@@ -320,7 +331,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_DateTimeFormatParam() throws Exception {
 		Method method = TestTemplate_DateTimeFormatParameter.class
 				.getDeclaredMethod("getTest", LocalDateTime.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		Param.Expander expander = data.indexToExpander().get(0);
@@ -340,7 +351,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_NumberFormatParam() throws Exception {
 		Method method = TestTemplate_NumberFormatParameter.class
 				.getDeclaredMethod("getTest", BigDecimal.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		Param.Expander expander = data.indexToExpander().get(0);
@@ -360,7 +371,7 @@ public class SpringMvcContractTests {
 	@Test
 	public void testProcessAnnotations_Advanced2() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest");
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/advanced");
@@ -372,7 +383,7 @@ public class SpringMvcContractTests {
 	@Test
 	public void testProcessAnnotations_Advanced3() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest");
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/");
@@ -385,7 +396,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_ListParams() throws Exception {
 		Method method = TestTemplate_ListParams.class.getDeclaredMethod("getTest",
 				List.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test?id=" + "{id}");
@@ -398,7 +409,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_ListParamsWithoutName() throws Exception {
 		Method method = TestTemplate_ListParamsWithoutName.class
 				.getDeclaredMethod("getTest", List.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test?id=" + "{id}");
@@ -411,7 +422,7 @@ public class SpringMvcContractTests {
 	public void testProcessAnnotations_MapParams() throws Exception {
 		Method method = TestTemplate_MapParams.class.getDeclaredMethod("getTest",
 				Map.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test");
@@ -424,12 +435,12 @@ public class SpringMvcContractTests {
 	public void testProcessHeaders() throws Exception {
 		Method method = TestTemplate_Headers.class.getDeclaredMethod("getTest",
 				String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test/{id}");
 		assertThat(data.template().method()).isEqualTo("GET");
-		assertThat(data.template().headers().get("X-Foo").iterator().next())
+		assertThat(data.template().headers().get("x-Foo").iterator().next())
 				.isEqualTo("bar");
 	}

@@ -437,7 +448,7 @@ public class SpringMvcContractTests {
 	public void testProcessHeadersWithoutValues() throws Exception {
 		Method method = TestTemplate_HeadersWithoutValues.class
 				.getDeclaredMethod("getTest", String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/test/{id}");
@@ -453,7 +464,7 @@ public class SpringMvcContractTests {
 		assumeTrue("does not have java 8 parameter names",
 				hasJava8ParameterNames(method));

-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url())
@@ -477,7 +488,7 @@ public class SpringMvcContractTests {
 	public void testProcessHeaderMap() throws Exception {
 		Method method = TestTemplate_HeaderMap.class.getDeclaredMethod("headerMap",
 				MultiValueMap.class, String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/headerMap");
@@ -491,14 +502,14 @@ public class SpringMvcContractTests {
 	public void testProcessHeaderMapMoreThanOnce() throws Exception {
 		Method method = TestTemplate_HeaderMap.class.getDeclaredMethod(
 				"headerMapMoreThanOnce", MultiValueMap.class, MultiValueMap.class);
-		this.contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
 	}

 	@Test
 	public void testProcessQueryMap() throws Exception {
 		Method method = TestTemplate_QueryMap.class.getDeclaredMethod("queryMap",
 				MultiValueMap.class, String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url()).isEqualTo("/queryMap?aParam=" + "{aParam}");
@@ -512,7 +523,7 @@ public class SpringMvcContractTests {
 	public void testProcessQueryMapObject() throws Exception {
 		Method method = TestTemplate_QueryMap.class.getDeclaredMethod("queryMapObject",
 				TestObject.class, String.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().url())
@@ -527,14 +538,14 @@ public class SpringMvcContractTests {
 	public void testProcessQueryMapMoreThanOnce() throws Exception {
 		Method method = TestTemplate_QueryMap.class.getDeclaredMethod(
 				"queryMapMoreThanOnce", MultiValueMap.class, MultiValueMap.class);
-		this.contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		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
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		Map<String, String> testMap = new HashMap<>();
@@ -550,7 +561,7 @@ public class SpringMvcContractTests {
 	public void testMatrixVariable_ObjectParam() throws Exception {
 		Method method = TestTemplate_MatrixVariable.class
 				.getDeclaredMethod("matrixVariableObject", Object.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

 		assertThat(data.template().method()).isEqualTo("GET");
@@ -563,7 +574,7 @@ public class SpringMvcContractTests {
 	public void testMatrixVariableWithNoName() throws NoSuchMethodException {
 		Method method = TestTemplate_MatrixVariable.class
 				.getDeclaredMethod("matrixVariableNotNamed", Map.class);
-		MethodMetadata data = this.contract
+		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 		Map<String, String> testMap = new HashMap<>();

@@ -587,53 +598,6 @@ 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(
@@ -774,6 +738,10 @@ public class SpringMvcContractTests {
 	@RequestMapping("/advanced")
 	public interface TestTemplate_Advanced {

+		@CollectionFormat(SSV)
+		@GetMapping
+		ResponseEntity<TestObject> getWithCollectionFormat();
+
 		@ExceptionHandler
 		@RequestMapping(path = "/test/{id}", method = RequestMethod.PUT,
 				produces = MediaType.APPLICATION_JSON_VALUE)
@@ -822,40 +790,6 @@ 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 {
@@ -883,11 +817,10 @@ public class SpringMvcContractTests {

 			TestObject that = (TestObject) o;

-			if (this.number != null ? !this.number.equals(that.number)
-					: that.number != null) {
+			if (number != null ? !number.equals(that.number) : that.number != null) {
 				return false;
 			}
-			if (this.something != null ? !this.something.equals(that.something)
+			if (something != null ? !something.equals(that.something)
 					: that.something != null) {
 				return false;
 			}
@@ -897,16 +830,16 @@ public class SpringMvcContractTests {

 		@Override
 		public int hashCode() {
-			int result = (this.something != null ? this.something.hashCode() : 0);
-			result = 31 * result + (this.number != null ? this.number.hashCode() : 0);
+			int result = (something != null ? something.hashCode() : 0);
+			result = 31 * result + (number != null ? number.hashCode() : 0);
 			return result;
 		}

 		@Override
 		public String toString() {
 			return new StringBuilder("TestObject{").append("something='")
-					.append(this.something).append("', ").append("number=")
-					.append(this.number).append("}").toString();
+					.append(something).append("', ").append("number=").append(number)
+					.append("}").toString();
 		}

 	}
@@ -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.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
@@ -65,7 +65,8 @@ import static org.mockito.Mockito.mockingDetails;
 * @author Ryan Baxter
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(properties = { "feign.okhttp.enabled: false" })
+@SpringBootTest(
+		properties = { "feign.okhttp.enabled: false", "ribbon.eureka.enabled = false" })
@DirtiesContext
 public class ApacheHttpClientConfigurationTests {

@@ -76,7 +77,7 @@ public class ApacheHttpClientConfigurationTests {
 	ApacheHttpClientFactory httpClientFactory;

 	@Autowired
-	FeignBlockingLoadBalancerClient feignClient;
+	LoadBalancerFeignClient feignClient;

 	@Test
 	public void testFactories() {
@@ -16,6 +16,7 @@

 package org.springframework.cloud.openfeign.test;

+import java.lang.reflect.Field;
 import java.util.concurrent.TimeUnit;

 import feign.Client;
@@ -34,11 +35,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.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -63,7 +64,7 @@ public class OkHttpClientConfigurationTests {
 	OkHttpClientConnectionPoolFactory connectionPoolFactory;

 	@Autowired
-	FeignBlockingLoadBalancerClient feignClient;
+	LoadBalancerFeignClient feignClient;

 	@Test
 	public void testFactories() {
@@ -87,11 +88,13 @@ public class OkHttpClientConfigurationTests {
 	}

 	protected <T> T getField(Object target, String name) {
-		Object value = ReflectionTestUtils.getField(target, target.getClass(), name);
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
 		return (T) value;
 	}

-	@FeignClient(name = "foo")
+	@FeignClient(name = "foo", serviceId = "foo")
 	interface FooClient {

 	}
@@ -18,22 +18,23 @@ package org.springframework.cloud.openfeign.valid;

 import java.util.List;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import feign.Logger;
 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.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -58,6 +59,15 @@ public class FeignClientNotPrimaryTests {

 	public static final String HELLO_WORLD_1 = "hello world 1";

+	public static final String OI_TERRA_2 = "oi terra 2";
+
+	public static final String MYHEADER1 = "myheader1";
+
+	public static final String MYHEADER2 = "myheader2";
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
 	@Autowired
 	private TestClient testClient;

@@ -94,7 +104,7 @@ public class FeignClientNotPrimaryTests {
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class },
 			defaultConfiguration = TestDefaultFeignConfig.class)
-	@LoadBalancerClient(name = "localapp", configuration = LocalClientConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application {

 		@Bean
@@ -152,16 +162,14 @@ public class FeignClientNotPrimaryTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	public static class LocalClientConfiguration {
+	public static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp")
-					.build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

 	}
@@ -17,6 +17,7 @@
 package org.springframework.cloud.openfeign.valid;

 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.text.ParseException;
 import java.time.LocalDate;
@@ -30,20 +31,34 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.Part;

+import com.netflix.hystrix.HystrixCommand;
+import com.netflix.hystrix.HystrixCommandGroupKey;
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.exception.HystrixRuntimeException;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import feign.Client;
+import feign.Feign;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import feign.Target;
 import feign.codec.EncodeException;
+import feign.hystrix.FallbackFactory;
+import feign.hystrix.SetterFactory;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import rx.Observable;
+import rx.Single;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -52,21 +67,20 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+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.FeignFormatterRegistrar;
-import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.cloud.openfeign.support.AbstractFormWriter;
+import org.springframework.cloud.openfeign.support.FallbackCommand;
 import org.springframework.cloud.openfeign.support.JsonFormWriter;
 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.format.Formatter;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -87,7 +101,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;

 /**
 * @author Spencer Gibb
@@ -98,14 +112,14 @@ import static org.hamcrest.Matchers.instanceOf;
 * @author Darren Foong
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = ValidFeignClientTests.Application.class,
+@SpringBootTest(classes = FeignClientTests.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",
 				"feign.hystrix.enabled=true" })
@DirtiesContext
-public class ValidFeignClientTests {
+public class FeignClientTests {

 	public static final String HELLO_WORLD_1 = "hello world 1";

@@ -118,6 +132,16 @@ public class ValidFeignClientTests {
 	@Rule
 	public ExpectedException expected = ExpectedException.none();

+	@Autowired
+	HystrixClient hystrixClient;
+
+	@Autowired
+	@Qualifier("localapp3FeignClient")
+	HystrixClient namedHystrixClient;
+
+	@Autowired
+	HystrixSetterFactoryClient hystrixSetterFactoryClient;
+
 	@Value("${local.server.port}")
 	private int port = 0;

@@ -131,11 +155,16 @@ public class ValidFeignClientTests {
 	private DecodingTestClient decodingTestClient;

 	@Autowired
-	@Qualifier("localapp2FeignClient")
-	private DecodingTestClient namedFeignClient;
+	private Client feignClient;

 	@Autowired
-	private Client feignClient;
+	private HystrixClientWithFallBackFactory hystrixClientWithFallBackFactory;
+
+	@Autowired
+	private InvalidTypeHystrixClientWithFallBackFactory invalidTypeHystrixClientWithFallBackFactory;
+
+	@Autowired
+	private NullHystrixClientWithFallBackFactory nullHystrixClientWithFallBackFactory;

 	@Autowired
 	private MultipartClient multipartClient;
@@ -203,8 +232,8 @@ public class ValidFeignClientTests {

 	@Test
 	public void testFeignClientType() throws IllegalAccessException {
-		assertThat(this.feignClient).isInstanceOf(FeignBlockingLoadBalancerClient.class);
-		FeignBlockingLoadBalancerClient client = (FeignBlockingLoadBalancerClient) this.feignClient;
+		assertThat(this.feignClient).isInstanceOf(LoadBalancerFeignClient.class);
+		LoadBalancerFeignClient client = (LoadBalancerFeignClient) this.feignClient;
 		Client delegate = client.getDelegate();
 		assertThat(delegate).isInstanceOf(Client.Default.class);
 	}
@@ -236,6 +265,33 @@ public class ValidFeignClientTests {
 		assertThat(params).as("params not converted correctly").isEqualTo(list);
 	}

+	@Test
+	public void testHystrixCommand() throws NoSuchMethodException {
+		HystrixCommand<List<Hello>> command = this.testClient.getHellosHystrix();
+		assertThat(command).as("command was null").isNotNull();
+		assertThat(command.getCommandGroup().name()).as(
+				"Hystrix command group name should match the name of the feign client")
+				.isEqualTo("localapp");
+		String configKey = Feign.configKey(TestClient.class,
+				TestClient.class.getMethod("getHellosHystrix", (Class<?>[]) null));
+		assertThat(command.getCommandKey().name())
+				.as("Hystrix command key name should match the feign config key")
+				.isEqualTo(configKey);
+		List<Hello> hellos = command.execute();
+		assertThat(hellos).as("hellos was null").isNotNull();
+		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
+	}
+
+	@Test
+	public void testSingle() {
+		Single<Hello> single = this.testClient.getHelloSingle();
+		assertThat(single).as("single was null").isNotNull();
+		Hello hello = single.toBlocking().value();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match")
+				.isEqualTo(new Hello(HELLO_WORLD_1));
+	}
+
 	@Test
 	public void testNoContentResponse() {
 		ResponseEntity<Void> response = this.testClient.noContent();
@@ -300,9 +356,95 @@ public class ValidFeignClientTests {
 		assertThat(this.testClient.getToString(args)).isEqualTo(expectedResult);
 	}

+	@Test
+	public void testHystrixFallbackWorks() {
+		Hello hello = this.hystrixClient.fail();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("message was wrong").isEqualTo("fallback");
+	}
+
+	@Test
+	public void testHystrixFallbackSingle() {
+		Single<Hello> single = this.hystrixClient.failSingle();
+		assertThat(single).as("single was null").isNotNull();
+		Hello hello = single.toBlocking().value();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("message was wrong")
+				.isEqualTo("fallbacksingle");
+	}
+
+	@Test
+	public void testHystrixFallbackCommand() {
+		HystrixCommand<Hello> command = this.hystrixClient.failCommand();
+		assertThat(command).as("command was null").isNotNull();
+		Hello hello = command.execute();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("message was wrong")
+				.isEqualTo("fallbackcommand");
+	}
+
+	@Test
+	public void testHystrixFallbackObservable() {
+		Observable<Hello> observable = this.hystrixClient.failObservable();
+		assertThat(observable).as("observable was null").isNotNull();
+		Hello hello = observable.toBlocking().first();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("message was wrong")
+				.isEqualTo("fallbackobservable");
+	}
+
+	@Test
+	public void testHystrixFallbackFuture() throws Exception {
+		Future<Hello> future = this.hystrixClient.failFuture();
+		assertThat(future).as("future was null").isNotNull();
+		Hello hello = future.get(1, TimeUnit.SECONDS);
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("message was wrong")
+				.isEqualTo("fallbackfuture");
+	}
+
+	@Test
+	public void testHystrixClientWithFallBackFactory() throws Exception {
+		Hello hello = this.hystrixClientWithFallBackFactory.fail();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello.getMessage()).as("hello#message was null").isNotNull();
+		assertThat(hello.getMessage().contains("500")).as(
+				"hello#message did not contain the cause (status code) of the fallback invocation")
+				.isTrue();
+	}
+
+	@Test(expected = HystrixRuntimeException.class)
+	public void testInvalidTypeHystrixFallbackFactory() throws Exception {
+		this.invalidTypeHystrixClientWithFallBackFactory.fail();
+	}
+
+	@Test(expected = HystrixRuntimeException.class)
+	public void testNullHystrixFallbackFactory() throws Exception {
+		this.nullHystrixClientWithFallBackFactory.fail();
+	}
+
 	@Test
 	public void namedFeignClientWorks() {
-		assertThat(this.namedFeignClient).as("namedFeignClient was null").isNotNull();
+		assertThat(this.namedHystrixClient).as("namedHystrixClient was null").isNotNull();
+	}
+
+	@Test
+	public void testHystrixSetterFactory() {
+		HystrixCommand<List<Hello>> command = this.hystrixSetterFactoryClient
+				.getHellosHystrix();
+		assertThat(command).as("command was null").isNotNull();
+		String setterPrefix = TestHystrixSetterFactoryClientConfig.SETTER_PREFIX;
+		assertThat(command.getCommandGroup().name()).as(
+				"Hystrix command group name should match the name of the feign client with a prefix of "
+						+ setterPrefix)
+				.isEqualTo(setterPrefix + "localapp5");
+		assertThat(command.getCommandKey().name()).as(
+				"Hystrix command key name should match the request method (space) request path with a prefix of "
+						+ setterPrefix)
+				.isEqualTo(setterPrefix + "GET /hellos");
+		List<Hello> hellos = command.execute();
+		assertThat(hellos).as("hellos was null").isNotNull();
+		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
 	}

 	@Test
@@ -401,7 +543,7 @@ public class ValidFeignClientTests {
 	public void testInvalidMultipartFile() {
 		MockMultipartFile file = new MockMultipartFile("file1", "hello1.bin", null,
 				"hello".getBytes());
-		expected.expect(instanceOf(EncodeException.class));
+		expected.expectCause(instanceOf(EncodeException.class));
 		this.multipartClient.invalid(file);
 	}

@@ -416,6 +558,145 @@ public class ValidFeignClientTests {

 	}

+	@FeignClient(name = "localapp", configuration = TestClientConfig.class)
+	protected interface TestClient {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hello")
+		Hello getHello();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hello")
+		Optional<Hello> getOptionalHello();
+
+		@RequestMapping(method = RequestMethod.GET,
+				path = "${feignClient.methodLevelRequestMappingPath}")
+		Hello getHelloUsingPropertyPlaceHolder();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hello")
+		Single<Hello> getHelloSingle();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
+		List<Hello> getHellos();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hellostrings")
+		List<String> getHelloStrings();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/helloheaders")
+		List<String> getHelloHeaders();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders",
+				headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
+		String getHelloHeadersPlaceholders();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/helloparams")
+		List<String> getParams(@RequestParam("params") List<String> params);
+
+		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
+		List<LocalDate> getFormattedParams(@RequestParam("params") @DateTimeFormat(
+				pattern = "dd-MM-yyyy") List<LocalDate> params);
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
+		HystrixCommand<List<Hello>> getHellosHystrix();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/noContent")
+		ResponseEntity<Void> noContent();
+
+		@RequestMapping(method = RequestMethod.HEAD, path = "/head")
+		ResponseEntity<Void> head();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hello")
+		HttpEntity<Hello> getHelloEntity();
+
+		@RequestMapping(method = RequestMethod.POST,
+				consumes = "application/vnd.io.spring.cloud.test.v1+json",
+				produces = "application/vnd.io.spring.cloud.test.v1+json",
+				path = "/complex")
+		String moreComplexContentType(String body);
+
+		@RequestMapping(method = RequestMethod.GET, path = "/tostring")
+		String getToString(@RequestParam("arg") Arg arg);
+
+		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
+		String getToString(@RequestParam("arg") OtherArg arg);
+
+		@RequestMapping(method = RequestMethod.GET, path = "/tostringcollection")
+		Collection<String> getToString(@RequestParam("arg") Collection<OtherArg> args);
+
+	}
+
+	@FeignClient(name = "localapp1")
+	protected interface TestClientServiceId {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hello")
+		Hello getHello();
+
+	}
+
+	@FeignClient(name = "localapp2", decode404 = true)
+	protected interface DecodingTestClient {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/notFound")
+		ResponseEntity<String> notFound();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/notFound")
+		Optional<String> optional();
+
+	}
+
+	@FeignClient(name = "localapp3", fallback = HystrixClientFallback.class)
+	protected interface HystrixClient {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Single<Hello> failSingle();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		HystrixCommand<Hello> failCommand();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Observable<Hello> failObservable();
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Future<Hello> failFuture();
+
+	}
+
+	@FeignClient(name = "localapp4", fallbackFactory = HystrixClientFallbackFactory.class)
+	protected interface HystrixClientWithFallBackFactory {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+
+	}
+
+	@FeignClient(name = "localapp6",
+			fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
+	protected interface InvalidTypeHystrixClientWithFallBackFactory {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+
+	}
+
+	@FeignClient(name = "localapp7",
+			fallbackFactory = NullHystrixClientFallbackFactory.class)
+	protected interface NullHystrixClientWithFallBackFactory {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+
+	}
+
+	@FeignClient(name = "localapp5",
+			configuration = TestHystrixSetterFactoryClientConfig.class)
+	protected interface HystrixSetterFactoryClient {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
+		HystrixCommand<List<Hello>> getHellosHystrix();
+
+	}
+
 	@FeignClient(name = "localapp8")
 	protected interface MultipartClient {

@@ -485,84 +766,6 @@ public class ValidFeignClientTests {

 	}

-	@FeignClient(name = "localapp", configuration = TestClientConfig.class)
-	protected interface TestClient {
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hello")
-		Hello getHello();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hello")
-		Optional<Hello> getOptionalHello();
-
-		@RequestMapping(method = RequestMethod.GET,
-				path = "${feignClient.methodLevelRequestMappingPath}")
-		Hello getHelloUsingPropertyPlaceHolder();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
-		List<Hello> getHellos();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hellostrings")
-		List<String> getHelloStrings();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/helloheaders")
-		List<String> getHelloHeaders();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders",
-				headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
-		String getHelloHeadersPlaceholders();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/helloparams")
-		List<String> getParams(@RequestParam("params") List<String> params);
-
-		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
-		List<LocalDate> getFormattedParams(@RequestParam("params") @DateTimeFormat(
-				pattern = "dd-MM-yyyy") List<LocalDate> params);
-
-		@RequestMapping(method = RequestMethod.GET, path = "/noContent")
-		ResponseEntity<Void> noContent();
-
-		@RequestMapping(method = RequestMethod.HEAD, path = "/head")
-		ResponseEntity<Void> head();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hello")
-		HttpEntity<Hello> getHelloEntity();
-
-		@RequestMapping(method = RequestMethod.POST,
-				consumes = "application/vnd.io.spring.cloud.test.v1+json",
-				produces = "application/vnd.io.spring.cloud.test.v1+json",
-				path = "/complex")
-		String moreComplexContentType(String body);
-
-		@RequestMapping(method = RequestMethod.GET, path = "/tostring")
-		String getToString(@RequestParam("arg") Arg arg);
-
-		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
-		String getToString(@RequestParam("arg") OtherArg arg);
-
-		@RequestMapping(method = RequestMethod.GET, path = "/tostringcollection")
-		Collection<String> getToString(@RequestParam("arg") Collection<OtherArg> args);
-
-	}
-
-	@FeignClient(name = "localapp1")
-	protected interface TestClientServiceId {
-
-		@RequestMapping(method = RequestMethod.GET, path = "/hello")
-		Hello getHello();
-
-	}
-
-	@FeignClient(name = "localapp2", decode404 = true)
-	protected interface DecodingTestClient {
-
-		@RequestMapping(method = RequestMethod.GET, path = "/notFound")
-		ResponseEntity<String> notFound();
-
-		@RequestMapping(method = RequestMethod.GET, path = "/notFound")
-		Optional<String> optional();
-
-	}
-
 	protected static class OtherArg {

 		public final String value;
@@ -602,25 +805,122 @@ public class ValidFeignClientTests {

 	}

+	static class HystrixClientFallbackFactory
+			implements FallbackFactory<HystrixClientWithFallBackFactory> {
+
+		@Override
+		public HystrixClientWithFallBackFactory create(final Throwable cause) {
+			return new HystrixClientWithFallBackFactory() {
+				@Override
+				public Hello fail() {
+					assertThat(cause).isNotNull().as("Cause was null");
+					return new Hello(
+							"Hello from the fallback side: " + cause.getMessage());
+				}
+			};
+		}
+
+	}
+
+	static class InvalidTypeHystrixClientFallbackFactory
+			implements FallbackFactory<String> {
+
+		@Override
+		public String create(final Throwable cause) {
+			return "hello";
+		}
+
+	}
+
+	static class NullHystrixClientFallbackFactory implements FallbackFactory<String> {
+
+		@Override
+		public String create(final Throwable cause) {
+			return null;
+		}
+
+	}
+
+	static class HystrixClientFallback implements HystrixClient {
+
+		@Override
+		public Hello fail() {
+			return new Hello("fallback");
+		}
+
+		@Override
+		public Single<Hello> failSingle() {
+			return Single.just(new Hello("fallbacksingle"));
+		}
+
+		@Override
+		public HystrixCommand<Hello> failCommand() {
+			return new FallbackCommand<>(new Hello("fallbackcommand"));
+		}
+
+		@Override
+		public Observable<Hello> failObservable() {
+			return Observable.just(new Hello("fallbackobservable"));
+		}
+
+		@Override
+		public Future<Hello> failFuture() {
+			return new FallbackCommand<>(new Hello("fallbackfuture")).queue();
+		}
+
+	}
+
+	public static class TestHystrixSetterFactoryClientConfig {
+
+		public static final String SETTER_PREFIX = "SETTER-";
+
+		@Bean
+		public SetterFactory commandKeyIsRequestLineSetterFactory() {
+			return new SetterFactory() {
+				@Override
+				public HystrixCommand.Setter create(Target<?> target, Method method) {
+					String groupKey = SETTER_PREFIX + target.name();
+					RequestMapping requestMapping = method
+							.getAnnotation(RequestMapping.class);
+					String commandKey = SETTER_PREFIX + requestMapping.method()[0] + " "
+							+ requestMapping.path()[0];
+					return HystrixCommand.Setter
+							.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey))
+							.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey));
+				}
+			};
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
-	@EnableFeignClients(
-			clients = { TestClientServiceId.class, TestClient.class,
-					DecodingTestClient.class, MultipartClient.class },
+	@EnableFeignClients(clients = { TestClientServiceId.class, TestClient.class,
+			DecodingTestClient.class, HystrixClient.class,
+			HystrixClientWithFallBackFactory.class, HystrixSetterFactoryClient.class,
+			InvalidTypeHystrixClientWithFallBackFactory.class,
+			NullHystrixClientWithFallBackFactory.class, MultipartClient.class },
 			defaultConfiguration = TestDefaultFeignConfig.class)
-	@LoadBalancerClients({
-
-			@LoadBalancerClient(name = "localapp",
-					configuration = LocalLoadBalancerClientConfiguration.class),
-
-			@LoadBalancerClient(name = "localapp1",
-					configuration = LocalLoadBalancerClientConfiguration.class),
-
-			@LoadBalancerClient(name = "localapp2",
-					configuration = LocalLoadBalancerClientConfiguration.class),
-			@LoadBalancerClient(name = "localapp8",
-					configuration = LocalLoadBalancerClientConfiguration.class) })
+	@RibbonClients({
+			@RibbonClient(name = "localapp",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp2",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp3",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp4",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp5",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp6",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp7",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp8",
+					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

@@ -631,6 +931,27 @@ public class ValidFeignClientTests {
 					.run(args);
 		}

+		// needs to be in parent context to test multiple HystrixClient beans
+		@Bean
+		public HystrixClientFallback hystrixClientFallback() {
+			return new HystrixClientFallback();
+		}
+
+		@Bean
+		public HystrixClientFallbackFactory hystrixClientFallbackFactory() {
+			return new HystrixClientFallbackFactory();
+		}
+
+		@Bean
+		public InvalidTypeHystrixClientFallbackFactory invalidTypeHystrixClientFallbackFactory() {
+			return new InvalidTypeHystrixClientFallbackFactory();
+		}
+
+		@Bean
+		public NullHystrixClientFallbackFactory nullHystrixClientFallbackFactory() {
+			return new NullHystrixClientFallbackFactory();
+		}
+
 		@Bean
 		FeignFormatterRegistrar feignFormatterRegistrar() {
 			return new FeignFormatterRegistrar() {
@@ -885,15 +1206,14 @@ public class ValidFeignClientTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	public static class LocalLoadBalancerClientConfiguration {
+	public static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

 	}
@@ -20,10 +20,11 @@ import org.junit.Test;

 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.loadbalancer.FeignLoadBalancerAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -56,9 +57,8 @@ public class FeignClientValidationTests {
 	@Test
 	public void validLoadBalanced() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				LoadBalancerAutoConfiguration.class,
-				org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration.class,
-				FeignLoadBalancerAutoConfiguration.class,
+				LoadBalancerAutoConfiguration.class, RibbonAutoConfiguration.class,
+				FeignRibbonClientAutoConfiguration.class,
 				GoodServiceIdConfiguration.class);
 		assertThat(context.getBean(GoodServiceIdConfiguration.Client.class)).isNotNull();
 		context.close();
@@ -18,6 +18,8 @@ package org.springframework.cloud.openfeign.valid;

 import java.util.Objects;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import feign.Client;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,17 +29,16 @@ 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.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+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.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 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.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -92,8 +93,8 @@ public class FeignHttpClientTests {

 	@Test
 	public void testFeignClientType() throws IllegalAccessException {
-		assertThat(this.feignClient).isInstanceOf(FeignBlockingLoadBalancerClient.class);
-		FeignBlockingLoadBalancerClient client = (FeignBlockingLoadBalancerClient) this.feignClient;
+		assertThat(this.feignClient).isInstanceOf(LoadBalancerFeignClient.class);
+		LoadBalancerFeignClient client = (LoadBalancerFeignClient) this.feignClient;
 		Client delegate = client.getDelegate();
 		assertThat(delegate).isInstanceOf(feign.httpclient.ApacheHttpClient.class);
 	}
@@ -140,11 +141,11 @@ public class FeignHttpClientTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
-	@LoadBalancerClients({
-			@LoadBalancerClient(name = "localapp",
-					configuration = LocalClientConfiguration.class),
-			@LoadBalancerClient(name = "localapp1",
-					configuration = LocalClientConfiguration.class) })
+	@RibbonClients({
+			@RibbonClient(name = "localapp",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1",
+					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {

@@ -252,15 +253,14 @@ public class FeignHttpClientTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	static class LocalRibbonClientConfiguration {

 		@LocalServerPort
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

 	}
@@ -18,6 +18,8 @@ package org.springframework.cloud.openfeign.valid;

 import java.util.Objects;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import feign.Client;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,18 +29,16 @@ 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.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+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.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 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.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -94,8 +94,8 @@ public class FeignOkHttpTests {

 	@Test
 	public void testFeignClientType() throws IllegalAccessException {
-		assertThat(this.feignClient).isInstanceOf(FeignBlockingLoadBalancerClient.class);
-		FeignBlockingLoadBalancerClient client = (FeignBlockingLoadBalancerClient) this.feignClient;
+		assertThat(this.feignClient).isInstanceOf(LoadBalancerFeignClient.class);
+		LoadBalancerFeignClient client = (LoadBalancerFeignClient) this.feignClient;
 		Client delegate = client.getDelegate();
 		assertThat(delegate).isInstanceOf(feign.okhttp.OkHttpClient.class);
 	}
@@ -140,11 +140,11 @@ public class FeignOkHttpTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
-	@LoadBalancerClients({
-			@LoadBalancerClient(name = "localapp",
-					configuration = FeignHttpClientTests.LocalClientConfiguration.class),
-			@LoadBalancerClient(name = "localapp1",
-					configuration = FeignHttpClientTests.LocalClientConfiguration.class) })
+	@RibbonClients({
+			@RibbonClient(name = "localapp",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1",
+					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {

@@ -252,15 +252,14 @@ public class FeignOkHttpTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

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

 package org.springframework.cloud.openfeign.valid;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import io.vavr.collection.HashSet;
 import io.vavr.collection.Set;
 import org.junit.Test;
@@ -26,15 +28,14 @@ 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.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+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.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -78,8 +79,7 @@ public class IterableParameterTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = TestClient.class)
-	@LoadBalancerClient(name = "localapp",
-			configuration = LocalRibbonClientConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

@@ -97,10 +97,8 @@ public class IterableParameterTests {
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp")
-					.build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

 	}
@@ -16,22 +16,23 @@

 package org.springframework.cloud.openfeign.valid.scanning;

+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.boot.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+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.test.NoSecurityConfiguration;
 import org.springframework.cloud.openfeign.testclients.TestClient;
 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.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -67,7 +68,7 @@ public class FeignClientEnvVarTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(basePackages = { "${basepackage}" })
-	@LoadBalancerClient(name = "localapp", configuration = LocalClientConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

@@ -80,16 +81,14 @@ public class FeignClientEnvVarTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	public static class LocalClientConfiguration {
+	public static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "localapp")
-					.build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

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

 package org.springframework.cloud.openfeign.valid.scanning;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import feign.Client;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,16 +26,14 @@ 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.web.server.LocalServerPort;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
+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.core.env.Environment;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -100,7 +100,7 @@ public class FeignClientScanningTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients // NO clients attribute. That's what this class is testing!
-	@LoadBalancerClients(defaultConfiguration = LocalClientConfiguration.class)
+	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

@@ -113,15 +113,14 @@ public class FeignClientScanningTests {

 	// Load balancer with fixed server list for "local" pointing to localhost
 	@Configuration(proxyBeanMethods = false)
-	static class LocalClientConfiguration {
+	public static class LocalRibbonClientConfiguration {

-		@LocalServerPort
+		@Value("${local.server.port}")
 		private int port = 0;

 		@Bean
-		public ServiceInstanceListSupplier staticServiceInstanceListSupplier(
-				Environment env) {
-			return ServiceInstanceListSupplier.fixed(env).instance(port, "local").build();
+		public ServerList<Server> ribbonServerList() {
+			return new StaticServerList<>(new Server("localhost", this.port));
 		}

 	}
@@ -16,3 +16,5 @@ feign.client.config.form.encoder=org.springframework.cloud.openfeign.FeignClient
 feign.client.config.unwrap.connectTimeout=1000
 feign.client.config.unwrap.readTimeout=1000
 feign.client.config.unwrap.exceptionPropagationPolicy=unwrap
+feign.client.config.readTimeout.readTimeout=1000
+feign.client.config.connectTimeout.connectTimeout=1000
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.0-M2</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.0.0-M2</version>
+	<version>2.2.4.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.0.0-M2</version>
+		<version>2.2.4.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -44,6 +44,20 @@
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-slf4j</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign</groupId>
+			<artifactId>feign-hystrix</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
@@ -5,6 +5,8 @@
 <suppressions>
 	<suppress files=".*FeignClientTests.*" checks="LineLengthCheck" />
 	<suppress files=".*FeignClientsRegistrarTests.*" checks="LineLengthCheck" />
+	<suppress files=".*FeignRibbonHttpClientConfigurationTests.*" checks="LineLengthCheck" />
+	<suppress files=".*FeignRibbonOkHttpClientConfigurationTests.*" checks="LineLengthCheck" />
 	<suppress files=".*InvoiceClient.*" checks="LineLengthCheck" />
 	<suppress files=".*InvoiceResource.*" checks="LineLengthCheck" />
 	<suppress files=".*IterableParameterTests.*" checks="LineLengthCheck" />
Author	SHA1	Message	Date
buildmaster	2f5d63a061	Update SNAPSHOT to 2.2.4.RELEASE	2020-07-31 20:51:47 +00:00
Olga Maciaszek-Sharma	14929cbfee	Revert "Fix double @RequestMapping with empty value (#245 )" This reverts commit `0afb60a72a`. # Conflicts: # spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java # spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java	2020-07-30 16:18:25 +02:00
Olga Maciaszek-Sharma	d3da7e16e8	Add CollectionFormat support (#371 ) * Add CollectionFormat support. Fixes gh-146. * Minor refactoring. * Fix docs.	2020-07-17 15:05:21 +02:00
Olga Maciaszek-Sharma	4e89dd1523	Annotate @FeignClient with @Inherited. Fixes gh-322. (#370 )	2020-07-14 17:38:02 +02:00
Olga Maciaszek-Sharma	63ba4d40ff	Fix checkstyle.	2020-07-14 16:02:28 +02:00
Olga Maciaszek-Sharma	06862ab090	Add test for @MockBean. Fixes gh-343.	2020-07-14 15:19:58 +02:00
Olga Maciaszek-Sharma	72784920d8	Fix read timeout (#369 ) * Fix setting readTimeout and connectionTimeout separately from each other. Fixes gh-324. * Refactor (remove superfluous keywords) and reformat.	2020-07-13 17:19:18 +02:00
Olga Maciaszek-Sharma	bf13ae95c9	Remove superfluous conditional. Fixes gh-323. (#350 )	2020-06-05 18:26:34 +02:00
Olga Maciaszek-Sharma	af06086c30	Fix docs.	2020-06-05 16:28:25 +02:00
Marcin Grzejszczak	5497f5a37c	Migrated to docs.spring.io & updated sc-build	2020-06-04 15:50:09 +02:00
Olga Maciaszek-Sharma	12084de3a9	Fix docs. Fixes gh-340.	2020-06-04 14:54:38 +02:00
chang-chao	84cf97b391	update doc on default retrying behavior	2020-06-04 13:17:58 +02:00
buildmaster	3002643ee7	Bumping versions to 2.2.4.BUILD-SNAPSHOT after release	2020-05-28 17:53:50 +00:00
buildmaster	b1ec55cb01	Going back to snapshots	2020-05-28 17:53:50 +00:00
buildmaster	f0e0e7ea64	Update SNAPSHOT to 2.2.3.RELEASE	2020-05-28 17:52:11 +00:00