Update SNAPSHOT to 2.2.0.RC2

Bumping versions
Added maven flatten plugin
2019-11-08 21:54:01 +00:00 · 2019-11-07 14:59:19 +00:00 · 2019-11-07 14:37:32 +01:00 · 2019-11-06 19:06:39 +01:00 · 2019-11-04 17:53:50 +01:00 · 2019-10-24 20:48:10 +00:00
88 changed files with 3077 additions and 601 deletions
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-build</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath></relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-openfeign</artifactId>
+  <version>2.2.0.RC2</version>
+  <packaging>pom</packaging>
+  <name>Spring Cloud OpenFeign</name>
+  <description>Spring Cloud OpenFeign</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-openfeign</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				https://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing, software
+				distributed under the License is distributed on an "AS IS" BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions and
+				limitations under the License.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
+  </scm>
+  <profiles>
+    <profile>
+      <id>spring</id>
+      <repositories>
+        <repository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/libs-snapshot-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-releases</id>
+          <name>Spring Releases</name>
+          <url>https://repo.spring.io/release</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</project>
@@ -18,3 +18,4 @@ _site/
 .shelf
 *.swp
 *.swo
+.vscode/
@@ -10,6 +10,23 @@ image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/gr

 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]

+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud OpenFeign
+:all: {asterisk}{asterisk}
+
 This project provides OpenFeign integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms.

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-openfeign</artifactId>
+    <version>2.2.0.RC2</version>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-openfeign-docs</artifactId>
+  <version>2.2.0.RC2</version>
+  <packaging>pom</packaging>
+  <name>Spring Cloud OpenFeign Docs</name>
+  <description>Spring Cloud Docs</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				https://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing, software
+				distributed under the License is distributed on an "AS IS" BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions and
+				limitations under the License.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-openfeign</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.2.0.RC2</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -16,7 +16,14 @@
 		<docs.main>spring-cloud-openfeign</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
 		<docs.whitelisted.branches>2.0.x,2.1.x</docs.whitelisted.branches>
+		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -32,28 +39,29 @@
 			<id>docs</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>pl.project13.maven</groupId>
+						<artifactId>git-commit-id-plugin</artifactId>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<inherited>false</inherited>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<inherited>false</inherited>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>
@@ -4,6 +4,8 @@ image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/master/gr

 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]

+include::_attributes.adoc[]
+
 include::intro.adoc[]

 == Features
@@ -0,0 +1,16 @@
+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud OpenFeign
+:all: {asterisk}{asterisk}
@@ -0,0 +1,24 @@
+|===
+|Name | Default | Description
+
+|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 | 
+|feign.httpclient.connection-timer-repeat | 3000 | 
+|feign.httpclient.disable-ssl-validation | false | 
+|feign.httpclient.enabled | true | Enables the use of the Apache HTTP Client by Feign.
+|feign.httpclient.follow-redirects | true | 
+|feign.httpclient.max-connections | 200 | 
+|feign.httpclient.max-connections-per-route | 50 | 
+|feign.httpclient.time-to-live | 900 | 
+|feign.httpclient.time-to-live-unit |  | 
+|feign.hystrix.enabled | false | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.
+|feign.okhttp.enabled | false | Enables the use of the OK HTTP Client by Feign.
+
+|===
@@ -1,14 +0,0 @@
-:numbered!:
-[appendix]
-[[common-application-properties]]
-== Common application properties
-
-include::_attributes.adoc[]
-
-Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
-This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
-
-NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
-Also, you can define your own properties.
-
-include::_configprops.adoc[]
@@ -40,7 +40,7 @@ function check_if_anything_to_sync() {

 function retrieve_current_branch() {
    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
    # If there is a branch already passed will reuse it - otherwise will try to find it
    CURRENT_BRANCH=${BRANCH}
    if [[ -z "${CURRENT_BRANCH}" ]] ; then
@@ -147,7 +147,7 @@ function copy_docs_for_current_version() {
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
@@ -0,0 +1,26 @@
+This project provides https://github.com/OpenFeign/feign[OpenFeign] integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms.
+
+## Features
+
+* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
+
+## Getting Started
+
+
+```java
+@SpringBootApplication
+@EnableFeignClients
+public class WebApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(WebApplication.class, args);
+	}
+
+	@FeignClient("name")
+	static interface NameService {
+		@RequestMapping("/")
+		public String getName();
+	}
+}
+
+```
@@ -1,11 +1,5 @@
-:github-tag: master
-:github-repo: spring-cloud/spring-cloud-openfeign
-:github-raw: https://raw.github.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-:all: {asterisk}{asterisk}
-:nofooter:
-:branch: master
 = Spring Cloud OpenFeign
+include::_attributes.adoc[]

 *{spring-cloud-version}*

@@ -15,7 +9,13 @@ include::intro.adoc[]
 [[spring-cloud-feign]]
 == Declarative REST Client: Feign

-https://github.com/Netflix/feign[Feign] is a declarative web service client.  It makes writing web service clients easier.  To use Feign create an interface and annotate it.  It has pluggable annotation support including Feign annotations and JAX-RS annotations. Feign also supports pluggable encoders and decoders.  Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.  Spring Cloud integrates Ribbon and Eureka to provide a load balanced http client when using Feign.
+https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
+It makes writing web service clients easier.
+To use Feign create an interface and annotate it.
+It has pluggable annotation support including Feign annotations and JAX-RS annotations.
+Feign also supports pluggable encoders and decoders.
+Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.
+Spring Cloud integrates Ribbon and Eureka, as well as Spring Cloud LoadBalancer to provide a load-balanced http client when using Feign.

 [[netflix-feign-starter]]
 === How to Include Feign
@@ -52,22 +52,24 @@ public interface StoreClient {
 }
 ----

-In the `@FeignClient` annotation the String value ("stores" above) is
-an arbitrary client name, which is used to create a Ribbon load
-balancer (see <<spring-cloud-ribbon,below for details of Ribbon
-support>>). You can also specify a URL using the `url` attribute
+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.
 To specify your own alias value you can use the `qualifier` value
 of the `@FeignClient` annotation.

-The Ribbon client above will want to discover the physical addresses
+The load-balancer client above will want to discover the physical addresses
 for the "stores" service. If your application is a Eureka client then
 it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can simply configure a list of servers
 in your external configuration (see
 <<spring-cloud-ribbon-without-eureka,above for example>>).

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

@@ -115,10 +117,13 @@ Spring Cloud Netflix provides the following beans by default for feign (`BeanTyp
 * `Logger` feignLogger: `Slf4jLogger`
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `HystrixFeign.Builder`
-* `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client 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` contains both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`.

 The OkHttpClient and ApacheHttpClient feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` to `true`, respectively, and having them on the classpath.
-You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `OkHttpClient` when using OK HTTP.
+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.

 Spring Cloud Netflix _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:

@@ -128,6 +133,7 @@ Spring Cloud Netflix _does not_ provide the following beans by default for feign
 * `Request.Options`
 * `Collection<RequestInterceptor>`
 * `SetterFactory`
+* `QueryMapEncoder`

 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:

@@ -257,14 +263,14 @@ class FooController {
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");

 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "http://PROD-SVC");
+				.target(FooClient.class, "https://PROD-SVC");
    }
 }
 ----
@@ -423,6 +429,14 @@ feign.compression.request.min-request-size=2048

 These properties allow you to be selective about the compressed media types and minimum request threshold length.

+For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in ISO-8859-1 encoding:
+
+[source,java]
+---
+feign.compression.response.enabled=true
+feign.compression.response.useGzipDecoder=true
+---
+
 === Feign logging

 A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
@@ -481,22 +495,35 @@ The following feign client uses the `Params` class by using the `@SpringQueryMap
 [source,java,indent=0]
 ----
@FeignClient("demo")
-public class DemoTemplate {
+public interface DemoTemplate {

    @GetMapping(path = "/demo")
    String demoEndpoint(@SpringQueryMap Params params);
 }
 ----

-=== Troubleshooting
+If you need more control over the generated query parameter map, you can implement a custom `QueryMapEncoder` bean.

-==== Early Initialization Errors
+=== HATEOAS support

-Depending on how you are using your Feign clients you may see initialization errors when starting your application.
-To work around this problem you can use an `ObjectProvider` when autowiring your client.
+Spring provides some APIs to create REST representations that follow the https://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle, https://spring.io/projects/spring-hateoas[Spring Hateoas] and https://spring.io/projects/spring-data-rest[Spring Data REST].
+
+If your project use the `org.springframework.boot:spring-boot-starter-hateoas` starter
+or the `org.springframework.boot:spring-boot-starter-data-rest` starter, Feign HATEOAS support is enabled by default.
+
+When HATEOAS support is enabled, Feign clients are allowed to serialize
+and deserialize HATEOAS representation models: https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/EntityModel.html[EntityModel], https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/CollectionModel.html[CollectionModel] and https://docs.spring.io/spring-hateoas/docs/1.0.0.M1/apidocs/org/springframework/hateoas/PagedModel.html[PagedModel].

 [source,java,indent=0]
 ----
-@Autowired
-ObjectProvider<TestFeginClient> testFeginClient;
+@FeignClient("demo")
+public interface DemoTemplate {
+
+    @GetMapping(path = "/stores")
+    CollectionModel<Store> getStores();
+}
 ----
+
+== Configuration properties
+
+To see the list of all Sleuth related configuration properties please check link:appendix.html[the Appendix page].
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    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
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.1.5.RELEASE</version>
+	<version>2.2.0.RC2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.10.RELEASE</version>
+		<version>2.2.0.RC2</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.1.5.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.1.5.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.2.0.RC2</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.0.RC2</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -39,15 +39,13 @@
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec
 		</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
-
-		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
-		<maven-checkstyle-plugin.failsOnViolation>true
-		</maven-checkstyle-plugin.failsOnViolation>
-		<maven-checkstyle-plugin.includeTestSourceDirectory>true
-		</maven-checkstyle-plugin.includeTestSourceDirectory>
 	</properties>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-openfeign</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-openfeign-core</artifactId>
+  <version>2.2.0.RC2</version>
+  <name>Spring Cloud OpenFeign Core</name>
+  <description>Spring Cloud OpenFeign Core</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				https://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing, software
+				distributed under the License is distributed on an "AS IS" BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions and
+				limitations under the License.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-netflix-ribbon</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-reactor-netty</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-hateoas</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>4.1.43.Final</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+      <version>3.3.0.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava-reactive-streams</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.retry</groupId>
+      <artifactId>spring-retry</artifactId>
+      <version>1.2.4.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-commons</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-context</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.ribbon</groupId>
+      <artifactId>ribbon-loadbalancer</artifactId>
+      <version>2.3.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-core</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign.form</groupId>
+      <artifactId>feign-form-spring</artifactId>
+      <version>3.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-slf4j</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-httpclient</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-hystrix</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-okhttp</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-java8</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.hystrix</groupId>
+      <artifactId>hystrix-core</artifactId>
+      <version>1.5.18</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.hystrix</groupId>
+      <artifactId>hystrix-serialization</artifactId>
+      <version>1.5.18</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.hystrix</groupId>
+      <artifactId>hystrix-metrics-event-stream</artifactId>
+      <version>1.5.18</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.hystrix</groupId>
+      <artifactId>hystrix-javanica</artifactId>
+      <version>1.5.18</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jsr305</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aspectjrt</artifactId>
+          <groupId>org.aspectj</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.ribbon</groupId>
+      <artifactId>ribbon-core</artifactId>
+      <version>2.3.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.ribbon</groupId>
+      <artifactId>ribbon-httpclient</artifactId>
+      <version>2.3.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>1.3.8</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>3.14.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure-processor</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-loadbalancer</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.2.0.RC2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -50,6 +50,11 @@
 			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-hateoas</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
@@ -161,7 +166,6 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>4.1.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -204,6 +208,11 @@
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.googlecode.protobuf-java-format</groupId>
 			<artifactId>protobuf-java-format</artifactId>
@@ -222,6 +231,11 @@
 			<version>0.10.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -46,9 +46,11 @@ import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionMa
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 /**
 * @author Spencer Gibb
@@ -58,6 +60,7 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnClass(Feign.class)
@EnableConfigurationProperties({ FeignClientProperties.class,
 		FeignHttpClientProperties.class })
+@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {

 	@Autowired(required = false)
@@ -16,6 +16,8 @@

 package org.springframework.cloud.openfeign;

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

 /**
@@ -57,47 +59,46 @@ public class FeignClientBuilder {
 			this.feignClientFactoryBean.setContextId(FeignClientsRegistrar.getName(name));
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
-			this.url("").path("").decode404(false).fallback(void.class)
-					.fallbackFactory(void.class);
+			this.url("").path("").decode404(false);
 		}

-		public Builder url(final String url) {
+		public Builder<T> url(final String url) {
 			this.feignClientFactoryBean.setUrl(FeignClientsRegistrar.getUrl(url));
 			return this;
 		}

-		public Builder contextId(final String contextId) {
+		public Builder<T> contextId(final String contextId) {
 			this.feignClientFactoryBean.setContextId(contextId);
 			return this;
 		}

-		public Builder path(final String path) {
+		public Builder<T> path(final String path) {
 			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
 			return this;
 		}

-		public Builder decode404(final boolean decode404) {
+		public Builder<T> decode404(final boolean decode404) {
 			this.feignClientFactoryBean.setDecode404(decode404);
 			return this;
 		}

-		public Builder fallback(final Class<T> fallback) {
+		public Builder<T> fallback(final Class<? extends T> fallback) {
 			FeignClientsRegistrar.validateFallback(fallback);
 			this.feignClientFactoryBean.setFallback(fallback);
 			return this;
 		}

-		public Builder fallbackFactory(final Class<T> fallbackFactory) {
+		public Builder<T> fallbackFactory(
+				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
 			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
 			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
 			return this;
 		}

 		/**
-		 * @param <T> the target type of the Feign client to be created
 		 * @return the created Feign client
 		 */
-		public <T> T build() {
+		public T build() {
 			return this.feignClientFactoryBean.getTarget();
 		}

@@ -23,6 +23,7 @@ import feign.Client;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
+import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -147,7 +148,10 @@ class FeignClientFactoryBean
 		if (requestInterceptors != null) {
 			builder.requestInterceptors(requestInterceptors.values());
 		}
-
+		QueryMapEncoder queryMapEncoder = getOptional(context, QueryMapEncoder.class);
+		if (queryMapEncoder != null) {
+			builder.queryMapEncoder(queryMapEncoder);
+		}
 		if (this.decode404) {
 			builder.decode404();
 		}
@@ -36,6 +36,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
@@ -69,6 +70,9 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private Logger logger;

+	@Autowired(required = false)
+	private SpringDataWebProperties springDataWebProperties;
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
@@ -87,7 +91,17 @@ public class FeignClientsConfiguration {
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public Encoder feignEncoderPageable() {
-		return new PageableSpringEncoder(new SpringEncoder(this.messageConverters));
+		PageableSpringEncoder encoder = new PageableSpringEncoder(
+				new SpringEncoder(this.messageConverters));
+		if (springDataWebProperties != null) {
+			encoder.setPageParameter(
+					springDataWebProperties.getPageable().getPageParameter());
+			encoder.setSizeParameter(
+					springDataWebProperties.getPageable().getSizeParameter());
+			encoder.setSortParameter(
+					springDataWebProperties.getSort().getSortParameter());
+		}
+		return encoder;
 	}

 	@Bean
@@ -22,8 +22,6 @@ import feign.hystrix.FallbackFactory;
 import feign.hystrix.HystrixFeign;
 import feign.hystrix.SetterFactory;

-import org.springframework.util.StringUtils;
-
 /**
 * @author Spencer Gibb
 * @author Erik Kringen
@@ -38,19 +36,19 @@ class HystrixTargeter implements Targeter {
 			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);
+		SetterFactory setterFactory = getOptional(factory.getName(), context,
+				SetterFactory.class);
 		if (setterFactory != null) {
 			builder.setterFactory(setterFactory);
 		}
 		Class<?> fallback = factory.getFallback();
 		if (fallback != void.class) {
-			return targetWithFallback(name, context, target, builder, fallback);
+			return targetWithFallback(factory.getName(), context, target, builder,
+					fallback);
 		}
 		Class<?> fallbackFactory = factory.getFallbackFactory();
 		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(name, context, target, builder,
+			return targetWithFallbackFactory(factory.getName(), context, target, builder,
 					fallbackFactory);
 		}

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.clientconfig;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.annotation.PreDestroy;
+
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Default configuration for {@link CloseableHttpClient}.
+ *
+ * @author Ryan Baxter
+ * @author Marcin Grzejszczak
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@Configuration
+@ConditionalOnMissingBean(CloseableHttpClient.class)
+public class HttpClientFeignConfiguration {
+
+	private final Timer connectionManagerTimer = new Timer(
+			"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
+
+	private CloseableHttpClient httpClient;
+
+	@Autowired(required = false)
+	private RegistryBuilder registryBuilder;
+
+	@Bean
+	@ConditionalOnMissingBean(HttpClientConnectionManager.class)
+	public HttpClientConnectionManager connectionManager(
+			ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
+			FeignHttpClientProperties httpClientProperties) {
+		final HttpClientConnectionManager connectionManager = connectionManagerFactory
+				.newConnectionManager(httpClientProperties.isDisableSslValidation(),
+						httpClientProperties.getMaxConnections(),
+						httpClientProperties.getMaxConnectionsPerRoute(),
+						httpClientProperties.getTimeToLive(),
+						httpClientProperties.getTimeToLiveUnit(), this.registryBuilder);
+		this.connectionManagerTimer.schedule(new TimerTask() {
+			@Override
+			public void run() {
+				connectionManager.closeExpiredConnections();
+			}
+		}, 30000, httpClientProperties.getConnectionTimerRepeat());
+		return connectionManager;
+	}
+
+	@Bean
+	@ConditionalOnProperty(value = "feign.compression.response.enabled",
+			havingValue = "true")
+	public CloseableHttpClient customHttpClient(
+			HttpClientConnectionManager httpClientConnectionManager,
+			FeignHttpClientProperties httpClientProperties) {
+		HttpClientBuilder builder = HttpClientBuilder.create().disableCookieManagement()
+				.useSystemProperties();
+		this.httpClient = createClient(builder, httpClientConnectionManager,
+				httpClientProperties);
+		return this.httpClient;
+	}
+
+	@Bean
+	@ConditionalOnProperty(value = "feign.compression.response.enabled",
+			havingValue = "false", matchIfMissing = true)
+	public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
+			HttpClientConnectionManager httpClientConnectionManager,
+			FeignHttpClientProperties httpClientProperties) {
+		this.httpClient = createClient(httpClientFactory.createBuilder(),
+				httpClientConnectionManager, httpClientProperties);
+		return this.httpClient;
+	}
+
+	private CloseableHttpClient createClient(HttpClientBuilder builder,
+			HttpClientConnectionManager httpClientConnectionManager,
+			FeignHttpClientProperties httpClientProperties) {
+		RequestConfig defaultRequestConfig = RequestConfig.custom()
+				.setConnectTimeout(httpClientProperties.getConnectionTimeout())
+				.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build();
+		CloseableHttpClient httpClient = builder
+				.setDefaultRequestConfig(defaultRequestConfig)
+				.setConnectionManager(httpClientConnectionManager).build();
+		return httpClient;
+	}
+
+	@PreDestroy
+	public void destroy() throws Exception {
+		this.connectionManagerTimer.cancel();
+		if (this.httpClient != null) {
+			this.httpClient.close();
+		}
+	}
+
+}
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.clientconfig;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.PreDestroy;
+
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Defualt configuration for {@link OkHttpClient}.
+ *
+ * @author Ryan Baxter
+ * @author Marcin Grzejszczak
+ * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
+ */
+@Configuration
+@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
+public class OkHttpFeignConfiguration {
+
+	private okhttp3.OkHttpClient okHttpClient;
+
+	@Bean
+	@ConditionalOnMissingBean(ConnectionPool.class)
+	public ConnectionPool httpClientConnectionPool(
+			FeignHttpClientProperties httpClientProperties,
+			OkHttpClientConnectionPoolFactory connectionPoolFactory) {
+		Integer maxTotalConnections = httpClientProperties.getMaxConnections();
+		Long timeToLive = httpClientProperties.getTimeToLive();
+		TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
+		return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
+	}
+
+	@Bean
+	public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
+			ConnectionPool connectionPool,
+			FeignHttpClientProperties httpClientProperties) {
+		Boolean followRedirects = httpClientProperties.isFollowRedirects();
+		Integer connectTimeout = httpClientProperties.getConnectionTimeout();
+		this.okHttpClient = httpClientFactory
+				.createBuilder(httpClientProperties.isDisableSslValidation())
+				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+				.followRedirects(followRedirects).connectionPool(connectionPool).build();
+		return this.okHttpClient;
+	}
+
+	@PreDestroy
+	public void destroy() {
+		if (this.okHttpClient != null) {
+			this.okHttpClient.dispatcher().executorService().shutdown();
+			this.okHttpClient.connectionPool().evictAll();
+		}
+	}
+
+}
@@ -39,7 +39,8 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.response.enabled",
+		matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@@ -42,7 +42,8 @@ import org.springframework.context.annotation.Configuration;
 // The OK HTTP client uses "transparent" compression.
 // If the content-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "feign.compression.request.enabled",
+		matchIfMissing = false)
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+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.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
+import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.server.LinkRelationProvider;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
+
+/**
+ * @author Hector Espert
+ */
+@Configuration
+@ConditionalOnWebApplication
+@ConditionalOnClass(RepresentationModel.class)
+@AutoConfigureAfter({ JacksonAutoConfiguration.class,
+		HttpMessageConvertersAutoConfiguration.class,
+		RepositoryRestMvcAutoConfiguration.class })
+@AutoConfigureBefore(HypermediaAutoConfiguration.class)
+public class FeignHalAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
+			ObjectProvider<ObjectMapper> objectMapper,
+			ObjectProvider<HalConfiguration> halConfiguration,
+			ObjectProvider<MessageResolver> messageResolver,
+			ObjectProvider<CurieProvider> curieProvider,
+			ObjectProvider<LinkRelationProvider> linkRelationProvider) {
+
+		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
+		mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+
+		HalConfiguration configuration = halConfiguration
+				.getIfAvailable(HalConfiguration::new);
+
+		CurieProvider curieProviderInstance = curieProvider
+				.getIfAvailable(() -> new DefaultCurieProvider(Collections.emptyMap()));
+
+		Jackson2HalModule.HalHandlerInstantiator halHandlerInstantiator = new Jackson2HalModule.HalHandlerInstantiator(
+				linkRelationProvider.getIfAvailable(), curieProviderInstance,
+				messageResolver.getIfAvailable(), configuration);
+
+		mapper.setHandlerInstantiator(halHandlerInstantiator);
+
+		if (!Jackson2HalModule.isAlreadyRegisteredIn(mapper)) {
+			Jackson2HalModule halModule = new Jackson2HalModule();
+			mapper.registerModule(halModule);
+		}
+
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
+				RepresentationModel.class);
+		converter.setSupportedMediaTypes(Arrays.asList(HAL_JSON));
+		converter.setObjectMapper(mapper);
+		return converter;
+	}
+
+}
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import feign.Client;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link Client.Default} under the hood.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@Configuration
+class DefaultFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
+		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
+				loadBalancerClient);
+	}
+
+}
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
+import feign.Client;
+import feign.Request;
+import feign.Response;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.http.HttpStatus;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link Client} implementation that uses {@link BlockingLoadBalancerClient} to select
+ * a {@link ServiceInstance} to use while resolving the request host.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+class FeignBlockingLoadBalancerClient implements Client {
+
+	private static final Log LOG = LogFactory
+			.getLog(FeignBlockingLoadBalancerClient.class);
+
+	private final Client delegate;
+
+	private final BlockingLoadBalancerClient loadBalancerClient;
+
+	FeignBlockingLoadBalancerClient(Client delegate,
+			BlockingLoadBalancerClient loadBalancerClient) {
+		this.delegate = delegate;
+		this.loadBalancerClient = loadBalancerClient;
+	}
+
+	@Override
+	public Response execute(Request request, Request.Options options) throws IOException {
+		final URI originalUri = URI.create(request.url());
+		String serviceId = originalUri.getHost();
+		Assert.state(serviceId != null,
+				"Request URI does not contain a valid hostname: " + originalUri);
+		ServiceInstance instance = loadBalancerClient.choose(serviceId);
+		if (instance == null) {
+			String message = "Load balancer does not contain an instance for the service "
+					+ serviceId;
+			if (LOG.isWarnEnabled()) {
+				LOG.warn(message);
+			}
+			return Response.builder().request(request)
+					.status(HttpStatus.SERVICE_UNAVAILABLE.value())
+					.body(message, StandardCharsets.UTF_8).build();
+		}
+		String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri)
+				.toString();
+		Request newRequest = Request.create(request.httpMethod(), reconstructedUrl,
+				request.headers(), request.requestBody());
+
+		return delegate.execute(newRequest, options);
+	}
+
+	// Visible for tests
+	Client getDelegate() {
+		return delegate;
+	}
+
+}
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import feign.Client;
+import feign.Feign;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * An autoconfiguration that instantiates {@link BlockingLoadBalancerClient}-based
+ * implementations of {@link Client}. In order to use this load-balancing mechanism, the
+ * Ribbon-based implementation has to be disabled by setting
+ * <code>spring.cloud.loadbalancer.ribbon.enabled</code> to <code>true</code>.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@ConditionalOnClass(Feign.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+@AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class)
+@EnableConfigurationProperties(FeignHttpClientProperties.class)
+@Configuration
+// Order is important here, last should be the default, first should be optional
+// see
+// https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
+@Import({ HttpClientFeignLoadBalancerConfiguration.class,
+		OkHttpFeignLoadBalancerConfiguration.class,
+		DefaultFeignLoadBalancerConfiguration.class })
+class FeignLoadBalancerAutoConfiguration {
+
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
+import org.apache.http.client.HttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link ApacheHttpClient} under the hood.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@Configuration
+@ConditionalOnClass(ApacheHttpClient.class)
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Import(HttpClientFeignConfiguration.class)
+class HttpClientFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient,
+			HttpClient httpClient) {
+		ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+	}
+
+}
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import feign.Client;
+import feign.okhttp.OkHttpClient;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * Configuration instantiating a {@link BlockingLoadBalancerClient}-based {@link Client}
+ * object that uses {@link OkHttpClient} under the hood.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.0
+ */
+@Configuration
+@ConditionalOnClass(OkHttpClient.class)
+@ConditionalOnProperty("feign.okhttp.enabled")
+@ConditionalOnBean(BlockingLoadBalancerClient.class)
+@Import(OkHttpFeignConfiguration.class)
+class OkHttpFeignLoadBalancerConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Client feignClient(okhttp3.OkHttpClient okHttpClient,
+			BlockingLoadBalancerClient loadBalancerClient) {
+		OkHttpClient delegate = new OkHttpClient(okHttpClient);
+		return new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient);
+	}
+
+}
@@ -24,6 +24,7 @@ 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;
@@ -39,8 +40,11 @@ import org.springframework.context.annotation.Primary;
 * load balancer.
 *
 * @author Dave Syer
+ * @author Olga Maciaszek-Sharma
 */
@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
+@ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled",
+		matchIfMissing = true)
@Configuration
@AutoConfigureBefore(FeignAutoConfiguration.class)
@EnableConfigurationProperties({ FeignHttpClientProperties.class })
@@ -16,37 +16,27 @@

 package org.springframework.cloud.openfeign.ribbon;

-import java.util.Timer;
-import java.util.TimerTask;
-
-import javax.annotation.PreDestroy;
-
 import feign.Client;
 import feign.httpclient.ApacheHttpClient;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;

-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.ConditionalOnProperty;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.cloud.openfeign.clientconfig.HttpClientFeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
@Configuration
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
+@Import(HttpClientFeignConfiguration.class)
 class HttpClientFeignLoadBalancedConfiguration {

 	@Bean
@@ -57,82 +47,4 @@ class HttpClientFeignLoadBalancedConfiguration {
 		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 	}

-	@Configuration
-	@ConditionalOnMissingBean(CloseableHttpClient.class)
-	protected static class HttpClientFeignConfiguration {
-
-		private final Timer connectionManagerTimer = new Timer(
-				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
-
-		private CloseableHttpClient httpClient;
-
-		@Autowired(required = false)
-		private RegistryBuilder registryBuilder;
-
-		@Bean
-		@ConditionalOnMissingBean(HttpClientConnectionManager.class)
-		public HttpClientConnectionManager connectionManager(
-				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
-				FeignHttpClientProperties httpClientProperties) {
-			final HttpClientConnectionManager connectionManager = connectionManagerFactory
-					.newConnectionManager(httpClientProperties.isDisableSslValidation(),
-							httpClientProperties.getMaxConnections(),
-							httpClientProperties.getMaxConnectionsPerRoute(),
-							httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLiveUnit(),
-							this.registryBuilder);
-			this.connectionManagerTimer.schedule(new TimerTask() {
-				@Override
-				public void run() {
-					connectionManager.closeExpiredConnections();
-				}
-			}, 30000, httpClientProperties.getConnectionTimerRepeat());
-			return connectionManager;
-		}
-
-		@Bean
-		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
-		public CloseableHttpClient customHttpClient(
-				HttpClientConnectionManager httpClientConnectionManager,
-				FeignHttpClientProperties httpClientProperties) {
-			HttpClientBuilder builder = HttpClientBuilder.create()
-					.disableCookieManagement().useSystemProperties();
-			this.httpClient = createClient(builder, httpClientConnectionManager,
-					httpClientProperties);
-			return this.httpClient;
-		}
-
-		@Bean
-		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
-		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
-				HttpClientConnectionManager httpClientConnectionManager,
-				FeignHttpClientProperties httpClientProperties) {
-			this.httpClient = createClient(httpClientFactory.createBuilder(),
-					httpClientConnectionManager, httpClientProperties);
-			return this.httpClient;
-		}
-
-		private CloseableHttpClient createClient(HttpClientBuilder builder,
-				HttpClientConnectionManager httpClientConnectionManager,
-				FeignHttpClientProperties httpClientProperties) {
-			RequestConfig defaultRequestConfig = RequestConfig.custom()
-					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
-					.build();
-			CloseableHttpClient httpClient = builder
-					.setDefaultRequestConfig(defaultRequestConfig)
-					.setConnectionManager(httpClientConnectionManager).build();
-			return httpClient;
-		}
-
-		@PreDestroy
-		public void destroy() throws Exception {
-			this.connectionManagerTimer.cancel();
-			if (this.httpClient != null) {
-				this.httpClient.close();
-			}
-		}
-
-	}
-
 }
@@ -16,30 +16,26 @@

 package org.springframework.cloud.openfeign.ribbon;

-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PreDestroy;
-
 import feign.Client;
 import feign.okhttp.OkHttpClient;
-import okhttp3.ConnectionPool;

 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.commons.httpclient.OkHttpClientConnectionPoolFactory;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.cloud.openfeign.clientconfig.OkHttpFeignConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
@Configuration
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty("feign.okhttp.enabled")
+@Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancedConfiguration {

 	@Bean
@@ -50,45 +46,4 @@ class OkHttpFeignLoadBalancedConfiguration {
 		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 	}

-	@Configuration
-	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	protected static class OkHttpFeignConfiguration {
-
-		private okhttp3.OkHttpClient okHttpClient;
-
-		@Bean
-		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(
-				FeignHttpClientProperties httpClientProperties,
-				OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
-			Long timeToLive = httpClientProperties.getTimeToLive();
-			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
-			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
-		}
-
-		@Bean
-		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
-				ConnectionPool connectionPool,
-				FeignHttpClientProperties httpClientProperties) {
-			Boolean followRedirects = httpClientProperties.isFollowRedirects();
-			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
-			this.okHttpClient = httpClientFactory
-					.createBuilder(httpClientProperties.isDisableSslValidation())
-					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-					.followRedirects(followRedirects).connectionPool(connectionPool)
-					.build();
-			return this.okHttpClient;
-		}
-
-		@PreDestroy
-		public void destroy() {
-			if (this.okHttpClient != null) {
-				this.okHttpClient.dispatcher().executorService().shutdown();
-				this.okHttpClient.connectionPool().evictAll();
-			}
-		}
-
-	}
-
 }
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.support;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.zip.GZIPInputStream;
+
+import feign.FeignException;
+import feign.Response;
+import feign.Util;
+import feign.codec.Decoder;
+
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
+
+/**
+ * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder}
+ * to decode.
+ *
+ * @author Jaesik Kim
+ */
+public class DefaultGzipDecoder implements Decoder {
+
+	private Decoder decoder;
+
+	public DefaultGzipDecoder(Decoder decoder) {
+		this.decoder = decoder;
+	}
+
+	@Override
+	public Object decode(final Response response, Type type)
+			throws IOException, FeignException {
+		Collection<String> encoding = response.headers()
+				.containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
+						? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER)
+						: null;
+
+		if (encoding != null) {
+			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
+				String decompressedBody = decompress(response);
+				if (decompressedBody != null) {
+					Response decompressedResponse = response.toBuilder()
+							.body(decompressedBody.getBytes()).build();
+					return decoder.decode(decompressedResponse, type);
+				}
+			}
+		}
+		return decoder.decode(response, type);
+	}
+
+	private String decompress(Response response) throws IOException {
+		if (response.body() == null) {
+			return null;
+		}
+		try (GZIPInputStream gzipInputStream = new GZIPInputStream(
+				response.body().asInputStream());
+				BufferedReader reader = new BufferedReader(
+						new InputStreamReader(gzipInputStream, Util.ISO_8859_1))) {
+			String outputString = "";
+			String line;
+			while ((line = reader.readLine()) != null) {
+				outputString += line;
+			}
+			return outputString;
+		}
+	}
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.support;
+
+import feign.codec.Decoder;
+import feign.optionals.OptionalDecoder;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configures Default Gzip Decoder.
+ *
+ * @author Jaesik Kim
+ */
+@Configuration
+@ConditionalOnProperty("feign.compression.response.enabled")
+// The OK HTTP client uses "transparent" compression.
+// If the accept-encoding header is present, it disables transparent compression
+@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
+@AutoConfigureAfter(FeignAutoConfiguration.class)
+public class DefaultGzipDecoderConfiguration {
+
+	private ObjectFactory<HttpMessageConverters> messageConverters;
+
+	public DefaultGzipDecoderConfiguration(
+			ObjectFactory<HttpMessageConverters> messageConverters) {
+		this.messageConverters = messageConverters;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
+	public Decoder defaultGzipDecoder() {
+		return new OptionalDecoder(new ResponseEntityDecoder(
+				new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
+	}
+
+}
@@ -62,6 +62,18 @@ public class PageableSpringEncoder implements Encoder {
 		this.delegate = delegate;
 	}

+	public void setPageParameter(String pageParameter) {
+		this.pageParameter = pageParameter;
+	}
+
+	public void setSizeParameter(String sizeParameter) {
+		this.sizeParameter = sizeParameter;
+	}
+
+	public void setSortParameter(String sortParameter) {
+		this.sortParameter = sortParameter;
+	}
+
 	@Override
 	public void encode(Object object, Type bodyType, RequestTemplate template)
 			throws EncodeException {
@@ -40,7 +40,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,7 +50,6 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
 /**
 * @author Spencer Gibb
 * @author Scien Jus
- * @author Ahmad Mozafarnia
 */
 public class SpringEncoder implements Encoder {

@@ -70,6 +68,7 @@ public class SpringEncoder implements Encoder {
 			throws EncodeException {
 		// template.body(conversionService.convert(object, String.class));
 		if (requestBody != null) {
+			Class<?> requestType = requestBody.getClass();
 			Collection<String> contentTypes = request.headers()
 					.get(HttpEncoding.CONTENT_TYPE);

@@ -92,24 +91,31 @@ public class SpringEncoder implements Encoder {
 				}
 			}

-			for (HttpMessageConverter messageConverter : this.messageConverters
+			for (HttpMessageConverter<?> messageConverter : this.messageConverters
 					.getObject().getConverters()) {
-				FeignOutputMessage outputMessage;
-				try {
-					if (messageConverter instanceof GenericHttpMessageConverter) {
-						outputMessage = checkAndWrite(requestBody, bodyType,
-								requestContentType,
-								(GenericHttpMessageConverter) messageConverter, request);
+				if (messageConverter.canWrite(requestType, requestContentType)) {
+					if (log.isDebugEnabled()) {
+						if (requestContentType != null) {
+							log.debug("Writing [" + requestBody + "] as \""
+									+ requestContentType + "\" using [" + messageConverter
+									+ "]");
+						}
+						else {
+							log.debug("Writing [" + requestBody + "] using ["
+									+ messageConverter + "]");
+						}
+
 					}
-					else {
-						outputMessage = checkAndWrite(requestBody, requestContentType,
-								messageConverter, request);
+
+					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+					try {
+						@SuppressWarnings("unchecked")
+						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
+						copy.write(requestBody, requestContentType, outputMessage);
+					}
+					catch (IOException ex) {
+						throw new EncodeException("Error converting request body", ex);
 					}
-				}
-				catch (IOException ex) {
-					throw new EncodeException("Error converting request body", ex);
-				}
-				if (outputMessage != null) {
 					// clear headers
 					request.headers(null);
 					// converters can modify headers, so update the request
@@ -135,7 +141,7 @@ public class SpringEncoder implements Encoder {
 				}
 			}
 			String message = "Could not write request: no suitable HttpMessageConverter "
-					+ "found for request type [" + requestBody.getClass().getName() + "]";
+					+ "found for request type [" + requestType.getName() + "]";
 			if (requestContentType != null) {
 				message += " and content type [" + requestContentType + "]";
 			}
@@ -143,49 +149,6 @@ public class SpringEncoder implements Encoder {
 		}
 	}

-	@SuppressWarnings("unchecked")
-	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType,
-			HttpMessageConverter converter, RequestTemplate request) throws IOException {
-		if (converter.canWrite(body.getClass(), contentType)) {
-			logBeforeWrite(body, contentType, converter);
-			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-			converter.write(body, contentType, outputMessage);
-			return outputMessage;
-		}
-		else {
-			return null;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private FeignOutputMessage checkAndWrite(Object body, Type genericType,
-			MediaType contentType, GenericHttpMessageConverter converter,
-			RequestTemplate request) throws IOException {
-		if (converter.canWrite(genericType, body.getClass(), contentType)) {
-			logBeforeWrite(body, contentType, converter);
-			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-			converter.write(body, genericType, contentType, outputMessage);
-			return outputMessage;
-		}
-		else {
-			return null;
-		}
-	}
-
-	private void logBeforeWrite(Object requestBody, MediaType requestContentType,
-			HttpMessageConverter messageConverter) {
-		if (log.isDebugEnabled()) {
-			if (requestContentType != null) {
-				log.debug("Writing [" + requestBody + "] as \"" + requestContentType
-						+ "\" using [" + messageConverter + "]");
-			}
-			else {
-				log.debug(
-						"Writing [" + requestBody + "] using [" + messageConverter + "]");
-			}
-		}
-	}
-
 	private final class FeignOutputMessage implements HttpOutputMessage {

 		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -26,6 +26,12 @@
 			"description": "Enables the response from Feign to be compressed.",
 			"defaultValue": "false"
 		},
+		{
+			"name": "feign.compression.response.useGzipDecoder",
+			"type": "java.lang.Boolean",
+			"description": "Enables the default gzip decoder to be used.",
+			"defaultValue": "false"
+		},
 		{
 			"name": "feign.compression.request.enabled",
 			"type": "java.lang.Boolean",
@@ -1,5 +1,7 @@
 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,\
-org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration
+org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration,\
+org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.util.Objects;
+
+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.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Jaesik Kim
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = DefaultGzipDecoderTests.Application.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		value = { "spring.application.name=defaultGzipDecoderTests",
+				"feign.compression.response.enabled=true",
+				"feign.compression.response.useGzipDecoder=true",
+				"feign.client.config.default.loggerLevel=full",
+				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
+@DirtiesContext
+public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
+
+	@Autowired
+	FeignContext context;
+
+	@Value("${local.server.port}")
+	private int port = 0;
+
+	public DefaultGzipDecoderTests() {
+		setName("tests");
+		setContextId("test");
+	}
+
+	public TestClient testClient() {
+		setType(this.getClass());
+		return feign(context).target(TestClient.class, "http://localhost:" + this.port);
+	}
+
+	@Test
+	public void testBodyDecompress() {
+		ResponseEntity<Hello> response = testClient().getGzipResponse();
+		assertThat(response).as("response was null").isNotNull();
+		assertThat(response.getStatusCode()).as("wrong status code")
+				.isEqualTo(HttpStatus.OK);
+		Hello hello = response.getBody();
+		assertThat(hello).as("hello was null").isNotNull();
+		assertThat(hello).as("first hello didn't match")
+				.isEqualTo(new Hello("hello world via response"));
+	}
+
+	@Test
+	public void testNullBodyDecompress() {
+		ResponseEntity<Hello> response = testClient().getNullResponse();
+		assertThat(response).as("response was null").isNotNull();
+		assertThat(response.getStatusCode()).as("wrong status code")
+				.isEqualTo(HttpStatus.OK);
+		Hello hello = response.getBody();
+		assertThat(hello).as("hello was not null").isNull();
+		assertThat(hello).as("null hello didn't match").isEqualTo(null);
+	}
+
+	private static class Hello {
+
+		private String message;
+
+		Hello() {
+		}
+
+		Hello(String message) {
+			this.message = message;
+		}
+
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Hello that = (Hello) o;
+			return Objects.equals(message, that.message);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(message);
+		}
+
+	}
+
+	protected interface TestClient {
+
+		@GetMapping("/helloGzipResponse")
+		ResponseEntity<Hello> getGzipResponse();
+
+		@GetMapping("/nullGzipResponse")
+		ResponseEntity<Hello> getNullResponse();
+
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@RestController
+	@Import(NoSecurityConfiguration.class)
+	protected static class Application implements TestClient {
+
+		@Override
+		public ResponseEntity<Hello> getGzipResponse() {
+			return ResponseEntity.ok(new Hello("hello world via response"));
+		}
+
+		@Override
+		public ResponseEntity<Hello> getNullResponse() {
+			return ResponseEntity.ok(null);
+		}
+
+	}
+
+}
@@ -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;
@@ -101,11 +102,11 @@ public class FeignClientBuilderTests {
 	public void forType_preinitializedBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(FeignClientBuilderTests.class, "TestClient");
+				.forType(TestFeignClient.class, "TestClient");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
+		assertFactoryBeanField(builder, "type", TestFeignClient.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
 		assertFactoryBeanField(builder, "contextId", "TestClient");

@@ -126,21 +127,24 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
-				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
-				.url("Url/");
+				.forType(TestFeignClient.class, "TestClient").decode404(true)
+				.fallback(TestFeignClientFallback.class)
+				.fallbackFactory(TestFeignClientFallbackFactory.class).path("Path/")
+				.url("Url/").contextId("TestContext");

 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
+		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);
-		assertFactoryBeanField(builder, "fallback", Object.class);
-		assertFactoryBeanField(builder, "fallbackFactory", Object.class);
+		assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class);
+		assertFactoryBeanField(builder, "fallbackFactory",
+				TestFeignClientFallbackFactory.class);
 	}

 	@Test
@@ -159,4 +163,22 @@ public class FeignClientBuilderTests {
 		builder.build();
 	}

+	private interface TestFeignClient {
+
+	}
+
+	private class TestFeignClientFallback implements TestFeignClient {
+
+	}
+
+	private class TestFeignClientFallbackFactory
+			implements FallbackFactory<TestFeignClient> {
+
+		@Override
+		public TestFeignClientFallback create(Throwable throwable) {
+			return new TestFeignClientFallback();
+		}
+
+	}
+
 }
@@ -19,6 +19,7 @@ package org.springframework.cloud.openfeign;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
+import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestLine;
@@ -30,6 +31,7 @@ import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.hystrix.HystrixFeign;
 import feign.optionals.OptionalDecoder;
+import feign.querymap.BeanQueryMapEncoder;
 import feign.slf4j.Slf4jLogger;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -133,6 +135,14 @@ public class FeignClientOverrideDefaultsTests {
 		assertThat(options.readTimeoutMillis()).isEqualTo(1);
 	}

+	@Test
+	public void overrideQueryMapEncoder() {
+		QueryMapEncoder.Default.class
+				.cast(this.context.getInstance("foo", QueryMapEncoder.class));
+		BeanQueryMapEncoder.class
+				.cast(this.context.getInstance("bar", QueryMapEncoder.class));
+	}
+
 	@Test
 	public void addRequestInterceptor() {
 		assertThat(this.context.getInstances("foo", RequestInterceptor.class).size())
@@ -141,7 +151,8 @@ public class FeignClientOverrideDefaultsTests {
 				.isEqualTo(2);
 	}

-	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
+	@FeignClient(name = "foo", url = "https://foo",
+			configuration = FooConfiguration.class)
 	interface FooClient {

 		@RequestLine("GET /")
@@ -149,7 +160,8 @@ public class FeignClientOverrideDefaultsTests {

 	}

-	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
+	@FeignClient(name = "bar", url = "https://bar",
+			configuration = BarConfiguration.class)
 	interface BarClient {

 		@RequestMapping(value = "/", method = RequestMethod.GET)
@@ -201,6 +213,11 @@ public class FeignClientOverrideDefaultsTests {
 			return HystrixFeign.builder();
 		}

+		@Bean
+		public QueryMapEncoder queryMapEncoder() {
+			return new feign.QueryMapEncoder.Default();
+		}
+
 	}

 	public static class BarConfiguration {
@@ -230,6 +247,11 @@ public class FeignClientOverrideDefaultsTests {
 			return new BasicAuthRequestInterceptor("user", "pass");
 		}

+		@Bean
+		public QueryMapEncoder queryMapEncoder() {
+			return new BeanQueryMapEncoder();
+		}
+
 	}

 }
@@ -59,7 +59,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Eko Kurniawan Khannedy
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
+		webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -146,7 +147,8 @@ public class FeignClientUsingPropertiesTests {

 	protected interface FormClient {

-		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		@RequestMapping(value = "/form", method = RequestMethod.POST,
+				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		String form(Map<String, String> form);

 	}
@@ -174,7 +176,8 @@ public class FeignClientUsingPropertiesTests {
 			return "OK";
 		}

-		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		@RequestMapping(value = "/form", method = RequestMethod.POST,
+				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		public String form(HttpServletRequest request) {
 			return request.getParameter("form");
 		}
@@ -37,7 +37,7 @@ public class FeignClientsRegistrarTests {

 	@Test(expected = IllegalStateException.class)
 	public void badNameHttpPrefix() {
-		testGetName("http://bad_hostname");
+		testGetName("https://bad_hostname");
 	}

 	@Test(expected = IllegalStateException.class)
@@ -63,8 +63,8 @@ public class FeignClientsRegistrarTests {

 	@Test
 	public void goodNameHttpPrefix() {
-		String name = testGetName("http://good-name");
-		assertThat(name).as("name was wrong").isEqualTo("http://good-name");
+		String name = testGetName("https://good-name");
+		assertThat(name).as("name was wrong").isEqualTo("https://good-name");
 	}

 	@Test
@@ -89,7 +89,8 @@ public class FeignClientsRegistrarTests {
 		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}

-	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
+	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/",
+			fallback = FallbackClient.class)
 	protected interface FallbackClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -97,7 +98,8 @@ public class FeignClientsRegistrarTests {

 	}

-	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/", fallbackFactory = FallbackFactoryClient.class)
+	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/",
+			fallbackFactory = FallbackFactoryClient.class)
 	protected interface FallbackFactoryClient {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -114,8 +116,8 @@ public class FeignClientsRegistrarTests {

 	@Configuration
 	@EnableAutoConfiguration
-	@EnableFeignClients(clients = {
-			FeignClientsRegistrarTests.FallbackFactoryClient.class })
+	@EnableFeignClients(
+			clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class })
 	protected static class FallbackFactoryTestConfig {

 	}
@@ -50,9 +50,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = DEFINED_PORT, value = {
-		"spring.application.name=feignclienturltest", "feign.hystrix.enabled=false",
-		"feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class,
+		webEnvironment = DEFINED_PORT,
+		value = { "spring.application.name=feignclienturltest",
+				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignHttpClientUrlTests {

@@ -47,8 +47,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringDecoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringDecoderTests.Application.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+				"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringDecoderTests extends FeignClientFactoryBean {

@@ -49,10 +49,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Dave Syer
 */
@RunWith(SpringJUnit4ClassRunner.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" })
+@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 FeignClientTests {

@@ -50,8 +50,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"feign.compression.response.enabled=true" })
+@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "feign.compression.response.enabled=true" })
@RunWith(SpringRunner.class)
@DirtiesContext
 public class FeignAcceptEncodingTests {
@@ -75,7 +76,8 @@ public class FeignAcceptEncodingTests {

 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
+	@SpringBootApplication(
+			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {

@@ -49,10 +49,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignContentEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"feign.compression.request.enabled=true",
-		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-		"ribbon.OkToRetryOnAllOperations=false" })
+@SpringBootTest(classes = FeignContentEncodingTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "feign.compression.request.enabled=true",
+				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+				"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignContentEncodingTests {

@@ -79,7 +80,8 @@ public class FeignContentEncodingTests {

 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
+	@SpringBootApplication(
+			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {

@@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -54,10 +55,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Charlie Mordant.
 */
-@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"feign.compression.request.enabled=true",
-		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-		"ribbon.OkToRetryOnAllOperations=false" })
+@SpringBootTest(classes = FeignPageableEncodingTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "feign.compression.request.enabled=true",
+				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+				"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignPageableEncodingTests {

@@ -84,7 +86,9 @@ public class FeignPageableEncodingTests {

 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
+	@SpringBootApplication(
+			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
+			exclude = { RepositoryRestMvcAutoConfiguration.class })
 	@EnableSpringDataWebSupport
 	@Import({ NoSecurityConfiguration.class, FeignClientsConfiguration.class })
 	public static class Application {
@@ -34,14 +34,18 @@ import org.springframework.web.bind.annotation.RequestMethod;
@FeignClient("local")
 public interface InvoiceClient {

-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable);

-	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.GET,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> getInvoices();

-	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> saveInvoices(List<Invoice> invoices);

 }
@@ -39,19 +39,23 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
 public class InvoiceResource {

-	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.GET,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Invoice>> getInvoices() {

 		return ResponseEntity.ok(createInvoiceList(100));
 	}

-	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoices", method = RequestMethod.POST,
+			consumes = MediaType.APPLICATION_JSON_VALUE,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> saveInvoices(@RequestBody List<Invoice> invoices) {

 		return ResponseEntity.ok(invoices);
 	}

-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
+			produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable) {
 		Page<Invoice> page = new PageImpl<>(createInvoiceList(pageable.getPageSize()),
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
+import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
+import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
+import org.springframework.hateoas.RepresentationModel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Hector Espert
+ */
+public class FeignHalAutoConfigurationContextTests {
+
+	private WebApplicationContextRunner contextRunner;
+
+	@Before
+	public void setUp() {
+		contextRunner = new WebApplicationContextRunner()
+				.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
+						HttpMessageConvertersAutoConfiguration.class,
+						HypermediaAutoConfiguration.class,
+						RepositoryRestMvcAutoConfiguration.class,
+						FeignHalAutoConfiguration.class))
+				.withPropertyValues("debug=true");
+	}
+
+	@Test
+	public void testHalJacksonHttpMessageConverterIsNotLoaded() {
+		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(
+				RepositoryRestMvcConfiguration.class, RepresentationModel.class);
+		contextRunner.withClassLoader(filteredClassLoader)
+				.run(context -> assertThat(context)
+						.doesNotHaveBean("halJacksonHttpMessageConverter"));
+	}
+
+	@Test
+	public void testHalJacksonHttpMessageConverterIsLoaded() {
+		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(
+				RepositoryRestMvcConfiguration.class);
+		contextRunner.withClassLoader(filteredClassLoader).run(
+				context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
+	}
+
+	@Test
+	public void testHalJacksonHttpMessageConverterIsNotLoadedUseRestDataMessageConverterInstead() {
+		contextRunner.run(
+				context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
+	}
+
+}
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.server.LinkRelationProvider;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
+
+/**
+ * @author Hector Espert
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class FeignHalAutoConfigurationTests {
+
+	@Mock
+	private ObjectProvider<ObjectMapper> objectMapper;
+
+	@Mock
+	private ObjectProvider<HalConfiguration> halConfiguration;
+
+	@Mock
+	private ObjectProvider<LinkRelationProvider> relProvider;
+
+	@Mock
+	private ObjectProvider<CurieProvider> curieProvider;
+
+	@Mock
+	private ObjectProvider<MessageResolver> messageResolver;
+
+	@InjectMocks
+	private FeignHalAutoConfiguration feignHalAutoConfiguration;
+
+	@Test
+	public void halJacksonHttpMessageConverter() {
+		ObjectMapper mapper = new ObjectMapper();
+		when(objectMapper.getIfAvailable(any())).thenReturn(mapper);
+
+		when(halConfiguration.getIfAvailable(any()))
+				.thenReturn(mock(HalConfiguration.class));
+		when(relProvider.getIfAvailable()).thenReturn(mock(LinkRelationProvider.class));
+		when(curieProvider.getIfAvailable(any())).thenReturn(mock(CurieProvider.class));
+		when(messageResolver.getIfAvailable()).thenReturn(mock(MessageResolver.class));
+
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = feignHalAutoConfiguration
+				.halJacksonHttpMessageConverter(objectMapper, halConfiguration,
+						messageResolver, curieProvider, relProvider);
+
+		assertThat(converter).isNotNull();
+		assertThat(converter.getObjectMapper()).isNotNull();
+		assertThat(converter.getSupportedMediaTypes()).isEqualTo(Arrays.asList(HAL_JSON));
+
+		assertThat(Jackson2HalModule.isAlreadyRegisteredIn(converter.getObjectMapper()))
+				.isTrue();
+	}
+
+}
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas;
+
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.openfeign.hateoas.app.FeignHalApplication;
+import org.springframework.cloud.openfeign.hateoas.app.FeignHalClient;
+import org.springframework.cloud.openfeign.hateoas.app.MarsRover;
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.PagedModel;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * Test HATEOAS support.
+ *
+ * @author Hector Espert
+ */
+@SpringBootTest(classes = FeignHalApplication.class, webEnvironment = RANDOM_PORT,
+		value = "debug=true")
+@RunWith(SpringRunner.class)
+@DirtiesContext
+public class FeignHalTests {
+
+	@Autowired
+	private FeignHalClient feignHalClient;
+
+	@Test
+	public void testEntityModel() {
+		EntityModel<MarsRover> entity = feignHalClient.entity();
+		assertThat(entity).isNotNull();
+
+		assertThat(entity.hasLinks()).isTrue();
+		assertThat(entity.hasLink("self")).isTrue();
+
+		assertThat(entity.getLink("self")).map(Link::getHref).contains("/entity");
+
+		MarsRover marsRover = entity.getContent();
+		assertThat(marsRover).isNotNull();
+		assertThat(marsRover.getName()).isEqualTo("Sojourner");
+	}
+
+	@Test
+	public void testCollectionModel() {
+		CollectionModel<MarsRover> collectionModel = feignHalClient.collection();
+		assertThat(collectionModel).isNotNull();
+		assertThat(collectionModel).isNotEmpty();
+
+		assertThat(collectionModel.hasLinks()).isTrue();
+		assertThat(collectionModel.hasLink("self")).isTrue();
+
+		assertThat(collectionModel.getLink("self")).map(Link::getHref)
+				.contains("/collection");
+
+		Collection<MarsRover> collection = collectionModel.getContent();
+		assertThat(collection).isNotEmpty();
+
+		MarsRover marsRover = collection.stream().findAny().orElse(null);
+		assertThat(marsRover).isNotNull();
+		assertThat(marsRover.getName()).isEqualTo("Opportunity");
+	}
+
+	@Test
+	public void testPagedModel() {
+		PagedModel<MarsRover> paged = feignHalClient.paged();
+		assertThat(paged).isNotNull();
+		assertThat(paged).isNotEmpty();
+
+		assertThat(paged.hasLinks()).isTrue();
+		assertThat(paged.hasLink("self")).isTrue();
+
+		assertThat(paged.getLink("self")).map(Link::getHref).contains("/paged");
+
+		Collection<MarsRover> collection = paged.getContent();
+		assertThat(collection).isNotEmpty();
+
+		MarsRover marsRover = collection.stream().findAny().orElse(null);
+		assertThat(marsRover).isNotNull();
+		assertThat(marsRover.getName()).isEqualTo("Curiosity");
+	}
+
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas.app;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * Test HATEOAS application.
+ *
+ * @author Hector Espert
+ */
+@EnableFeignClients(clients = FeignHalClient.class)
+@RibbonClient(name = "local", configuration = FeignHalRibbonConfiguration.class)
+@SpringBootApplication(
+		scanBasePackages = "org.springframework.cloud.openfeign.hateoas.app",
+		exclude = RepositoryRestMvcAutoConfiguration.class)
+@Import(NoSecurityConfiguration.class)
+public class FeignHalApplication {
+
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas.app;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.PagedModel;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author Hector Espert
+ */
+@FeignClient("local")
+public interface FeignHalClient {
+
+	@GetMapping("entity")
+	EntityModel<MarsRover> entity();
+
+	@GetMapping("collection")
+	CollectionModel<MarsRover> collection();
+
+	@GetMapping("paged")
+	PagedModel<MarsRover> paged();
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas.app;
+
+import java.util.Collections;
+
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.PagedModel;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Hector Espert
+ */
+@RestController
+public class FeignHalController {
+
+	@GetMapping("/entity")
+	public EntityModel<MarsRover> getEntity() {
+		MarsRover marsRover = new MarsRover();
+		marsRover.setName("Sojourner");
+		Link link = new Link("/entity", "self");
+		return new EntityModel<>(marsRover, link);
+	}
+
+	@GetMapping("/collection")
+	public CollectionModel<MarsRover> getCollection() {
+		MarsRover marsRover = new MarsRover();
+		marsRover.setName("Opportunity");
+		Link link = new Link("/collection", "self");
+		return new CollectionModel<>(Collections.singleton(marsRover), link);
+	}
+
+	@GetMapping("/paged")
+	public CollectionModel<MarsRover> getPaged() {
+		MarsRover marsRover = new MarsRover();
+		marsRover.setName("Curiosity");
+		Link link = new Link("/paged", "self");
+		PagedModel.PageMetadata metadata = new PagedModel.PageMetadata(1, 1, 1);
+		return new PagedModel<>(Collections.singleton(marsRover), metadata, link);
+	}
+
+}
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.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
+ */
+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,34 @@
+/*
+ * Copyright 2016-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.hateoas.app;
+
+/**
+ * @author Hector Espert
+ */
+public class MarsRover {
+
+	private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
@@ -56,8 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@RunWith(SpringRunner.class)
@DirtiesContext
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
-		"feign.hystrix.enabled=true" })
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
+		properties = { "feign.hystrix.enabled=true" })
@ActiveProfiles("proxysecurity")
 public class HystrixSecurityTests {

@@ -47,12 +47,6 @@ public class FeignClientValidationTests {
 	@Rule
 	public ExpectedException expected = ExpectedException.none();

-	@Test
-	public void testNameAndValue() {
-		this.expected.expectMessage("only one is permitted");
-		new AnnotationConfigApplicationContext(NameAndValueConfiguration.class);
-	}
-
 	@Test
 	public void testServiceIdAndValue() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
@@ -128,21 +122,6 @@ public class FeignClientValidationTests {
 		}
 	}

-	@Configuration
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = NameAndValueConfiguration.Client.class)
-	protected static class NameAndValueConfiguration {
-
-		@FeignClient(value = "foo", name = "bar")
-		interface Client {
-
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-
-		}
-
-	}
-
 	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
@@ -161,9 +140,9 @@ public class FeignClientValidationTests {
 	@Configuration

 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
-	@EnableFeignClients(clients = {
-			DuplicatedFeignClientNamesConfiguration.FooClient.class,
-			DuplicatedFeignClientNamesConfiguration.BarClient.class })
+	@EnableFeignClients(
+			clients = { DuplicatedFeignClientNamesConfiguration.FooClient.class,
+					DuplicatedFeignClientNamesConfiguration.BarClient.class })
 	protected static class DuplicatedFeignClientNamesConfiguration {

 		@FeignClient(contextId = "foo", name = "bar")
@@ -209,7 +188,8 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}

-		@FeignClient(name = "foobar", url = "http://localhost", fallback = ClientFallback.class)
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallback = ClientFallback.class)
 		interface Client {

 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -267,7 +247,8 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}

-		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = ClientFallback.class)
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallbackFactory = ClientFallback.class)
 		interface Client {

 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -301,7 +282,8 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}

-		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = Dummy.class)
+		@FeignClient(name = "foobar", url = "http://localhost",
+				fallbackFactory = Dummy.class)
 		interface Client {

 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import feign.Client;
+import feign.Request;
+import feign.Response;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link FeignBlockingLoadBalancerClient}. Note: the underlying
+ * {@link BlockingLoadBalancerClient} is already extensively tested in the Spring Cloud
+ * Commons project, so here we are only testing the interactions between
+ * {@link FeignBlockingLoadBalancerClient} and its delegates.
+ *
+ * @see <a href=
+ * "https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
+ * @author Olga Maciaszek-Sharma
+ */
+@ExtendWith(MockitoExtension.class)
+class FeignBlockingLoadBalancerClientTests {
+
+	private Client delegate = mock(Client.class);
+
+	private BlockingLoadBalancerClient loadBalancerClient = mock(
+			BlockingLoadBalancerClient.class);
+
+	private FeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new FeignBlockingLoadBalancerClient(
+			delegate, loadBalancerClient);
+
+	@Test
+	void shouldExtractServiceIdFromRequestUrl() throws IOException {
+		Request request = testRequest();
+
+		feignBlockingLoadBalancerClient.execute(request, new Request.Options());
+
+		verify(loadBalancerClient).choose("test");
+	}
+
+	@Test
+	void shouldThrowExceptionIfNoServiceId() {
+		Request request = testRequest("");
+
+		assertThatIllegalStateException()
+				.isThrownBy(() -> feignBlockingLoadBalancerClient.execute(request,
+						new Request.Options()))
+				.withMessage(
+						"Request URI does not contain a valid hostname: http:///path");
+	}
+
+	@Test
+	void shouldRespondWithServiceUnavailableIfInstanceNotFound() throws IOException {
+		Request request = testRequest();
+
+		Response response = feignBlockingLoadBalancerClient.execute(request,
+				new Request.Options());
+
+		assertThat(response.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.value());
+		assertThat(response.body().toString()).isEqualTo(
+				"Load balancer does not contain an instance for the service test");
+	}
+
+	@Test
+	void shouldPassCorrectRequestToDelegate() throws IOException {
+		Request request = testRequest();
+		Request.Options options = new Request.Options();
+		String url = "http://127.0.0.1/path";
+		ServiceInstance serviceInstance = new DefaultServiceInstance("test-1", "test",
+				"test-host", 8888, false);
+		when(loadBalancerClient.choose("test")).thenReturn(serviceInstance);
+		when(loadBalancerClient.reconstructURI(serviceInstance,
+				URI.create("http://test/path"))).thenReturn(URI.create(url));
+
+		feignBlockingLoadBalancerClient.execute(request, options);
+
+		ArgumentCaptor<Request> captor = ArgumentCaptor.forClass(Request.class);
+		verify(delegate, times(1)).execute(captor.capture(), eq(options));
+		Request actualRequest = captor.getValue();
+		assertThat(actualRequest.httpMethod()).isEqualTo(Request.HttpMethod.GET);
+		assertThat(actualRequest.url()).isEqualTo(url);
+		assertThat(actualRequest.headers()).hasSize(1);
+		assertThat(actualRequest.headers()).containsEntry(HttpHeaders.CONTENT_TYPE,
+				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
+		assertThat(actualRequest.requestBody().asString()).isEqualTo("hello");
+	}
+
+	private Request testRequest() {
+		return testRequest("test");
+	}
+
+	private Request testRequest(String host) {
+		return Request.create(Request.HttpMethod.GET, "http://" + host + "/path",
+				testHeaders(),
+				Request.Body.encoded("hello".getBytes(), StandardCharsets.UTF_8));
+	}
+
+	private Map<String, Collection<String>> testHeaders() {
+		Map<String, Collection<String>> feignHeaders = new HashMap<>();
+		feignHeaders.put(HttpHeaders.CONTENT_TYPE,
+				Collections.singletonList(MediaType.APPLICATION_JSON_VALUE));
+		return feignHeaders;
+
+	}
+
+}
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign.loadbalancer;
+
+import java.util.Map;
+
+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
+import feign.okhttp.OkHttpClient;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+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;
+
+/**
+ * @author Olga Maciaszek-Sharma
+ */
+class FeignLoadBalancerAutoConfigurationTests {
+
+	@Test
+	void shouldInstantiateDefaultFeignBlockingLoadBalancerClientWhenHttpClientDisabled() {
+		ConfigurableApplicationContext context = initContext(
+				"spring.cloud.loadbalancer.ribbon.enabled=false",
+				"feign.httpclient.enabled=false");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, Client.Default.class);
+		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
+	}
+
+	@Test
+	void shouldInstantiateHttpFeignClientWhenEnabled() {
+		ConfigurableApplicationContext context = initContext(
+				"spring.cloud.loadbalancer.ribbon.enabled=false");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, ApacheHttpClient.class);
+		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
+	}
+
+	@Test
+	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
+		ConfigurableApplicationContext context = initContext(
+				"spring.cloud.loadbalancer.ribbon.enabled=false",
+				"feign.httpclient.enabled=false", "feign.okhttp.enabled=true");
+		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
+		assertLoadBalanced(context, OkHttpClient.class);
+		assertThatBeanNotPresent(context, LoadBalancerFeignClient.class);
+	}
+
+	@Test
+	void shouldNotProcessLoadBalancerConfigurationWhenRibbonEnabled() {
+		ConfigurableApplicationContext context = initContext(
+				"spring.cloud.loadbalancer.ribbon.enabled=true");
+		assertThatOneBeanPresent(context, LoadBalancerFeignClient.class);
+		assertThatBeanNotPresent(context, BlockingLoadBalancerClient.class);
+		assertThatBeanNotPresent(context, FeignBlockingLoadBalancerClient.class);
+	}
+
+	private ConfigurableApplicationContext initContext(String... properties) {
+		return new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties(properties)
+				.sources(HttpClientConfiguration.class, RibbonAutoConfiguration.class,
+						LoadBalancerAutoConfiguration.class,
+						BlockingLoadBalancerClientAutoConfiguration.class,
+						FeignRibbonClientAutoConfiguration.class,
+						FeignLoadBalancerAutoConfiguration.class)
+				.run();
+	}
+
+	private void assertThatOneBeanPresent(ConfigurableApplicationContext context,
+			Class<?> beanClass) {
+		Map<String, ?> beans = context.getBeansOfType(beanClass);
+		assertThat(beans).hasSize(1);
+	}
+
+	private void assertLoadBalanced(ConfigurableApplicationContext context,
+			Class delegateClass) {
+		Map<String, FeignBlockingLoadBalancerClient> beans = context
+				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
+		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();
+	}
+
+}
@@ -96,7 +96,7 @@ public class FeignLoadBalancerTests {

 		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
 				this.inspector);
-		Request request = new RequestTemplate().method(GET).target("http://foo/")
+		Request request = new RequestTemplate().method(GET).target("https://foo/")
 				.resolve(new HashMap<>()).request();
 		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
 				new URI(request.url()));
@@ -108,7 +108,7 @@ public class FeignLoadBalancerTests {

 		RibbonResponse resp = this.feignLoadBalancer.execute(ribbonRequest, null);

-		assertThat(resp.getRequestedURI()).isEqualTo(new URI("http://foo"));
+		assertThat(resp.getRequestedURI()).isEqualTo(new URI("https://foo"));
 	}

 	@Test
@@ -118,7 +118,7 @@ public class FeignLoadBalancerTests {
 				this.inspector);
 		Server server = new Server("foo", 7777);
 		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("http://foo/"));
+				new URI("https://foo/"));
 		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
 	}

@@ -140,8 +140,8 @@ public class FeignLoadBalancerTests {
 				});
 		Server server = new Server("foo", 7777);
 		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("http://foo/"));
-		assertThat(uri).isEqualTo(new URI("http://foo:7777/"));
+				new URI("https://foo/"));
+		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
 	}

 	@Test
@@ -152,13 +152,13 @@ public class FeignLoadBalancerTests {
 		when(server.getPort()).thenReturn(443);
 		when(server.getHost()).thenReturn("foo");
 		URI uri = this.feignLoadBalancer.reconstructURIWithServer(server,
-				new URI("http://bar/"));
+				new URI("https://bar/"));
 		assertThat(uri).isEqualTo(new URI("https://foo:443/"));
 	}

 	@Test
 	public void testRibbonRequestURLEncode() throws Exception {
-		String url = "http://foo/?name=%7bcookie"; // name={cookie
+		String url = "https://foo/?name=%7bcookie"; // name={cookie
 		Request request = Request.create(GET, url, new HashMap<>(), null, null);

 		assertThat(request.url()).isEqualTo(url);
@@ -46,11 +46,14 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @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
-})
+@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 {

@@ -52,11 +52,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @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" })
+@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 {

@@ -44,8 +44,10 @@ 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" })
+@SpringBootTest(
+		classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = { "debug=true", "feign.httpclient.disableSslValidation=true" })
@DirtiesContext
 public class FeignRibbonHttpClientConfigurationTests {

@@ -40,9 +40,11 @@ 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" })
+@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 {

@@ -41,9 +41,10 @@ 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" })
+@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 {

@@ -132,11 +132,11 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
 				clientFactory);
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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),
@@ -150,11 +150,11 @@ public class RetryableFeignLoadBalancerTests {

 	@Test
 	public void executeNeverRetry() throws Exception {
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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,
@@ -214,11 +214,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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)
@@ -259,11 +259,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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)
@@ -309,11 +309,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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)
@@ -338,11 +338,11 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
 				clientFactory);
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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),
@@ -364,11 +364,11 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
 				clientFactory);
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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),
@@ -445,11 +445,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://listener"));
+				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)
@@ -497,11 +497,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://listener"));
+				client, feignRequest, new URI("https://listener"));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(this.lb,
 				config, this.inspector, loadBalancedRetryFactory);
 		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
@@ -534,11 +534,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://listener"));
+				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)
@@ -579,11 +579,11 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("http://foo"));
+				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
@@ -39,8 +39,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Charlie Mordant.
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringEncoderTests.Application.class,
+		webEnvironment = RANDOM_PORT, value = {
+				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class PageableEncoderTests {

@@ -16,11 +16,10 @@

 package org.springframework.cloud.openfeign.support;

-import java.lang.reflect.ParameterizedType;
+import java.io.IOException;
 import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;

 import feign.RequestTemplate;
@@ -28,6 +27,7 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,15 +35,12 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.openfeign.FeignContext;
-import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractGenericHttpMessageConverter;
-import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
@@ -63,11 +60,11 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
 /**
 * @author Spencer Gibb
 * @author Olga Maciaszek-Sharma
- * @author Ahmad Mozafarnia
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringEncoderTests.Application.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringEncoderTests {

@@ -78,10 +75,6 @@ public class SpringEncoderTests {
 	@Qualifier("myHttpMessageConverter")
 	private HttpMessageConverter<?> myConverter;

-	@Autowired
-	@Qualifier("myGenericHttpMessageConverter")
-	private GenericHttpMessageConverter<?> myGenericConverter;
-
 	@Test
 	public void testCustomHttpMessageConverter() {
 		Encoder encoder = this.context.getInstance("foo", Encoder.class);
@@ -101,35 +94,7 @@ public class SpringEncoderTests {

 		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
 		assertThat(request.requestCharset()).as("request charset is wrong")
-				.isEqualTo(StandardCharsets.UTF_8);
-	}
-
-	// gh-225
-	@Test
-	public void testCustomGenericHttpMessageConverter() {
-		Encoder encoder = this.context.getInstance("foo", Encoder.class);
-		assertThat(encoder).isNotNull();
-		RequestTemplate request = new RequestTemplate();
-
-		ParameterizedTypeReference<List<String>> stringListType = new ParameterizedTypeReference<List<String>>() {
-		};
-
-		request.header(HttpEncoding.CONTENT_TYPE, "application/mygenerictype");
-		encoder.encode(Collections.singletonList("hi"), stringListType.getType(),
-				request);
-
-		Collection<String> contentTypeHeader = request.headers().get("Content-Type");
-		assertThat(contentTypeHeader).as("missing content type header").isNotNull();
-		assertThat(contentTypeHeader.isEmpty()).as("missing content type header")
-				.isFalse();
-
-		String header = contentTypeHeader.iterator().next();
-		assertThat(header).as("content type header is wrong")
-				.isEqualTo("application/mygenerictype");
-
-		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
-		assertThat(request.requestCharset()).as("request charset is wrong")
-				.isEqualTo(StandardCharsets.UTF_8);
+				.isEqualTo(Charset.forName("UTF-8"));
 	}

 	@Test
@@ -214,11 +179,6 @@ public class SpringEncoderTests {
 			return new MyHttpMessageConverter();
 		}

-		@Bean
-		GenericHttpMessageConverter<?> myGenericHttpMessageConverter() {
-			return new MyGenericHttpMessageConverter();
-		}
-
 		private static class MyHttpMessageConverter
 				extends AbstractGenericHttpMessageConverter<Object> {

@@ -244,77 +204,20 @@ public class SpringEncoderTests {
 			@Override
 			protected void writeInternal(Object o, Type type,
 					HttpOutputMessage outputMessage)
-					throws HttpMessageNotWritableException {
+					throws IOException, HttpMessageNotWritableException {

 			}

 			@Override
 			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
-					throws HttpMessageNotReadableException {
+					throws IOException, HttpMessageNotReadableException {
 				return null;
 			}

 			@Override
 			public Object read(Type type, Class<?> contextClass,
 					HttpInputMessage inputMessage)
-					throws HttpMessageNotReadableException {
-				return null;
-			}
-
-		}
-
-		private static class MyGenericHttpMessageConverter
-				extends AbstractGenericHttpMessageConverter<Object> {
-
-			MyGenericHttpMessageConverter() {
-				super(new MediaType("application", "mygenerictype"));
-			}
-
-			private boolean isStringList(Type type) {
-				if (type instanceof ParameterizedType) {
-					ParameterizedType parameterizedType = (ParameterizedType) type;
-					return parameterizedType.getRawType() == List.class
-							&& parameterizedType
-									.getActualTypeArguments()[0] == String.class;
-				}
-				else {
-					return false;
-				}
-			}
-
-			@Override
-			protected boolean supports(Class<?> clazz) {
-				return clazz == List.class;
-			}
-
-			@Override
-			public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
-				return canWrite(mediaType) && isStringList(type);
-			}
-
-			@Override
-			public boolean canRead(Type type, Class<?> contextClass,
-					MediaType mediaType) {
-				return canRead(mediaType) && isStringList(type);
-			}
-
-			@Override
-			protected void writeInternal(Object o, Type type,
-					HttpOutputMessage outputMessage)
-					throws HttpMessageNotWritableException {
-
-			}
-
-			@Override
-			public Object read(Type type, Class<?> contextClass,
-					HttpInputMessage inputMessage)
-					throws HttpMessageNotReadableException {
-				return null;
-			}
-
-			@Override
-			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
-					throws HttpMessageNotReadableException {
+					throws IOException, HttpMessageNotReadableException {
 				return null;
 			}

@@ -322,4 +225,27 @@ public class SpringEncoderTests {

 	}

+	class MediaTypeMatcher implements ArgumentMatcher<MediaType> {
+
+		private MediaType mediaType;
+
+		MediaTypeMatcher(String type, String subtype) {
+			this.mediaType = new MediaType(type, subtype);
+		}
+
+		@Override
+		public boolean matches(MediaType argument) {
+			return this.mediaType.equals(argument);
+		}
+
+		@Override
+		public String toString() {
+			final StringBuffer sb = new StringBuffer("MediaTypeMatcher{");
+			sb.append("mediaType=").append(this.mediaType);
+			sb.append('}');
+			return sb.toString();
+		}
+
+	}
+
 }
@@ -537,16 +537,19 @@ public class SpringMvcContractTests {

 	public interface TestTemplate_Simple {

-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);

-		@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(method = RequestMethod.GET,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject getTest();

 		@GetMapping(value = "/test/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getMappingTest(@PathVariable("id") String id);

-		@RequestMapping(method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(method = RequestMethod.POST,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject postTest(@RequestBody TestObject object);

 		@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@@ -572,15 +575,16 @@ public class SpringMvcContractTests {

 	public interface TestTemplate_Headers {

-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, headers = "X-Foo=bar")
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+				headers = "X-Foo=bar")
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);

 	}

 	public interface TestTemplate_HeadersWithoutValues {

-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, headers = {
-				"X-Foo", "!X-Bar", "X-Baz!=fooBar" })
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+				headers = { "X-Foo", "!X-Bar", "X-Baz!=fooBar" })
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);

 	}
@@ -640,21 +644,25 @@ public class SpringMvcContractTests {
 	public interface TestTemplate_Advanced {

 		@ExceptionHandler
-		@RequestMapping(path = "/test/{id}", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(path = "/test/{id}", method = RequestMethod.PUT,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTest(@RequestHeader("Authorization") String auth,
 				@PathVariable("id") String id, @RequestParam("amount") Integer amount);

-		@RequestMapping(path = "/test2", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(path = "/test2", method = RequestMethod.PUT,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTest2(
 				@RequestHeader(name = "Authorization") String auth,
 				@RequestParam(name = "amount") Integer amount);

 		@ExceptionHandler
-		@RequestMapping(path = "/testfallback/{id}", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(path = "/testfallback/{id}", method = RequestMethod.PUT,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTestFallback(@RequestHeader String Authorization,
 				@PathVariable String id, @RequestParam Integer amount);

-		@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(method = RequestMethod.GET,
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject getTest();

 		@GetMapping(produces = "application/json")
@@ -668,8 +676,8 @@ public class SpringMvcContractTests {
 		String CUSTOM_PATTERN = "dd-MM-yyyy HH:mm";

 		@RequestMapping(method = RequestMethod.GET)
-		String getTest(
-				@RequestParam(name = "localDateTime") @DateTimeFormat(pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);
+		String getTest(@RequestParam(name = "localDateTime") @DateTimeFormat(
+				pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);

 	}

@@ -678,12 +686,13 @@ public class SpringMvcContractTests {
 		String CUSTOM_PATTERN = "$###,###.###";

 		@RequestMapping(method = RequestMethod.GET)
-		String getTest(
-				@RequestParam("amount") @NumberFormat(pattern = CUSTOM_PATTERN) BigDecimal amount);
+		String getTest(@RequestParam("amount") @NumberFormat(
+				pattern = CUSTOM_PATTERN) BigDecimal amount);

 	}

-	@JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE, setterVisibility = NONE)
+	@JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE,
+			setterVisibility = NONE)
 	public class TestObject {

 		public String something;
@@ -65,8 +65,8 @@ import static org.mockito.Mockito.mockingDetails;
 * @author Ryan Baxter
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(properties = { "feign.okhttp.enabled: false",
-		"ribbon.eureka.enabled = false" })
+@SpringBootTest(
+		properties = { "feign.okhttp.enabled: false", "ribbon.eureka.enabled = false" })
@DirtiesContext
 public class ApacheHttpClientConfigurationTests {

@@ -109,8 +109,8 @@ public class ApacheHttpClientConfigurationTests {

 	@SpringBootConfiguration
 	@EnableAutoConfiguration
-	@EnableFeignClients(clients = {
-			ApacheHttpClientConfigurationTestApp.FooClient.class })
+	@EnableFeignClients(
+			clients = { ApacheHttpClientConfigurationTestApp.FooClient.class })
 	static class ApacheHttpClientConfigurationTestApp {

 		@FeignClient(name = "foo", serviceId = "foo")
@@ -49,10 +49,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Jakub Narloch
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientNotPrimaryTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"spring.application.name=feignclientnotprimarytest",
-		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignClientNotPrimaryTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "spring.application.name=feignclientnotprimarytest",
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignClientNotPrimaryTests {

@@ -101,8 +102,8 @@ public class FeignClientNotPrimaryTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
-	@EnableFeignClients(clients = {
-			TestClient.class }, defaultConfiguration = TestDefaultFeignConfig.class)
+	@EnableFeignClients(clients = { TestClient.class },
+			defaultConfiguration = TestDefaultFeignConfig.class)
 	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application {

@@ -93,11 +93,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Halvdan Hoem Grelland
 */
@RunWith(SpringJUnit4ClassRunner.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" })
+@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 FeignClientTests {

@@ -441,7 +442,8 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
 		Optional<Hello> getOptionalHello();

-		@RequestMapping(method = RequestMethod.GET, path = "${feignClient.methodLevelRequestMappingPath}")
+		@RequestMapping(method = RequestMethod.GET,
+				path = "${feignClient.methodLevelRequestMappingPath}")
 		Hello getHelloUsingPropertyPlaceHolder();

 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
@@ -456,15 +458,16 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/helloheaders")
 		List<String> getHelloHeaders();

-		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders", headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
+		@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);
+		List<LocalDate> getFormattedParams(@RequestParam("params") @DateTimeFormat(
+				pattern = "dd-MM-yyyy") List<LocalDate> params);

 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
 		HystrixCommand<List<Hello>> getHellosHystrix();
@@ -478,7 +481,10 @@ public class FeignClientTests {
 		@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")
+		@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")
@@ -539,7 +545,8 @@ public class FeignClientTests {

 	}

-	@FeignClient(name = "localapp6", fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
+	@FeignClient(name = "localapp6",
+			fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
 	protected interface InvalidTypeHystrixClientWithFallBackFactory {

 		@RequestMapping(method = RequestMethod.GET, path = "/fail")
@@ -547,7 +554,8 @@ public class FeignClientTests {

 	}

-	@FeignClient(name = "localapp7", fallbackFactory = NullHystrixClientFallbackFactory.class)
+	@FeignClient(name = "localapp7",
+			fallbackFactory = NullHystrixClientFallbackFactory.class)
 	protected interface NullHystrixClientWithFallBackFactory {

 		@RequestMapping(method = RequestMethod.GET, path = "/fail")
@@ -555,7 +563,8 @@ public class FeignClientTests {

 	}

-	@FeignClient(name = "localapp5", configuration = TestHystrixSetterFactoryClientConfig.class)
+	@FeignClient(name = "localapp5",
+			configuration = TestHystrixSetterFactoryClientConfig.class)
 	protected interface HystrixSetterFactoryClient {

 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
@@ -697,16 +706,25 @@ public class FeignClientTests {
 			DecodingTestClient.class, HystrixClient.class,
 			HystrixClientWithFallBackFactory.class, HystrixSetterFactoryClient.class,
 			InvalidTypeHystrixClientWithFallBackFactory.class,
-			NullHystrixClientWithFallBackFactory.class }, defaultConfiguration = TestDefaultFeignConfig.class)
+			NullHystrixClientWithFallBackFactory.class },
+			defaultConfiguration = TestDefaultFeignConfig.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 = "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) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

@@ -809,8 +827,8 @@ public class FeignClientTests {
 		}

 		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
-		public List<LocalDate> getFormattedParams(
-				@RequestParam("params") @DateTimeFormat(pattern = "dd-MM-yyyy") List<LocalDate> params) {
+		public List<LocalDate> getFormattedParams(@RequestParam("params") @DateTimeFormat(
+				pattern = "dd-MM-yyyy") List<LocalDate> params) {
 			return params;
 		}

@@ -834,7 +852,10 @@ public class FeignClientTests {
 			return ResponseEntity.status(HttpStatus.NOT_FOUND).body((String) null);
 		}

-		@RequestMapping(method = RequestMethod.POST, consumes = "application/vnd.io.spring.cloud.test.v1+json", produces = "application/vnd.io.spring.cloud.test.v1+json", path = "/complex")
+		@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 complex(@RequestBody String body,
 				@RequestHeader("Content-Length") int contentLength) {
 			if (contentLength <= 0) {
@@ -56,9 +56,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignHttpClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		"spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
-		"feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignHttpClientTests.Application.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT,
+		value = { "spring.application.name=feignclienttest",
+				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignHttpClientTests {

@@ -113,17 +114,20 @@ public class FeignHttpClientTests {

 	protected interface BaseTestClient {

-		@RequestMapping(method = RequestMethod.GET, value = "/hello", produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(method = RequestMethod.GET, value = "/hello",
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		Hello getHello();

-		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop", consumes = "application/json")
+		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop",
+				consumes = "application/json")
 		ResponseEntity<Void> patchHello(Hello hello);

 	}

 	protected interface UserService {

-		@RequestMapping(method = RequestMethod.GET, value = "/users/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+		@RequestMapping(method = RequestMethod.GET, value = "/users/{id}",
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		User getUser(@PathVariable("id") long id);

 	}
@@ -138,8 +142,10 @@ public class FeignHttpClientTests {
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
 	@RibbonClients({
-			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) })
+			@RibbonClient(name = "localapp",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1",
+					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {

@@ -55,10 +55,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignOkHttpTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		"spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
-		"feign.httpclient.enabled=false", "feign.okhttp.enabled=true",
-		"spring.cloud.httpclientfactories.ok.enabled=true" })
+@SpringBootTest(classes = FeignOkHttpTests.Application.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT,
+		value = { "spring.application.name=feignclienttest",
+				"feign.hystrix.enabled=false", "feign.httpclient.enabled=false",
+				"feign.okhttp.enabled=true",
+				"spring.cloud.httpclientfactories.ok.enabled=true" })
@DirtiesContext
 public class FeignOkHttpTests {

@@ -116,7 +118,8 @@ public class FeignOkHttpTests {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		Hello getHello();

-		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop", consumes = "application/json")
+		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop",
+				consumes = "application/json")
 		ResponseEntity<Void> patchHello(Hello hello);

 	}
@@ -138,8 +141,10 @@ public class FeignOkHttpTests {
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
 	@RibbonClients({
-			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) })
+			@RibbonClient(name = "localapp",
+					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1",
+					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {

@@ -48,11 +48,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = IterableParameterTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		"spring.application.name=iterableparametertest",
-		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
-		"feign.hystrix.enabled=false" })
+@SpringBootTest(classes = IterableParameterTests.Application.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT,
+		value = { "spring.application.name=iterableparametertest",
+				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
+				"feign.hystrix.enabled=false" })
@DirtiesContext
 public class IterableParameterTests {

@@ -46,9 +46,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Ryan Baxter
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientEnvVarTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"spring.application.name=feignclienttest", "feign.httpclient.enabled=false",
-		"basepackage=org.springframework.cloud.openfeign.testclients" })
+@SpringBootTest(classes = FeignClientEnvVarTests.Application.class,
+		webEnvironment = RANDOM_PORT,
+		value = { "spring.application.name=feignclienttest",
+				"feign.httpclient.enabled=false",
+				"basepackage=org.springframework.cloud.openfeign.testclients" })
@DirtiesContext
 public class FeignClientEnvVarTests {

@@ -47,8 +47,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientScanningTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		"spring.application.name=feignclienttest", "feign.httpclient.enabled=false" })
+@SpringBootTest(classes = FeignClientScanningTests.Application.class,
+		webEnvironment = RANDOM_PORT, value = { "spring.application.name=feignclienttest",
+				"feign.httpclient.enabled=false" })
@DirtiesContext
 public class FeignClientScanningTests {

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.10.RELEASE</version>
+		<version>2.2.0.RC2</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.1.5.RELEASE</version>
+	<version>2.2.0.RC2</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-openfeign</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-starter-openfeign</artifactId>
+  <version>2.2.0.RC2</version>
+  <name>Spring Cloud Starter OpenFeign</name>
+  <description>Spring Cloud Starter OpenFeign</description>
+  <url>https://projects.spring.io/spring-cloud</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				https://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing, software
+				distributed under the License is distributed on an "AS IS" BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions and
+				limitations under the License.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-starter-openfeign</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-starter-openfeign</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-starter-openfeign</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-openfeign-core</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>5.2.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-commons</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-core</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-slf4j</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-hystrix</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-java8</artifactId>
+      <version>10.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.2.0.RC2</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -62,5 +62,10 @@
 			<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 </project>
Author	SHA1	Message	Date
buildmaster	3046af2b42	Update SNAPSHOT to 2.2.0.RC2	2019-11-08 21:54:01 +00:00
buildmaster	8973f4286b	Bumping versions	2019-11-07 14:59:19 +00:00
Marcin Grzejszczak	ef5f9d6858	Added maven flatten plugin	2019-11-07 14:37:32 +01:00
Olga Maciaszek-Sharma	f661105e63	Fix gh 177 add sc loadbalancer support (#239 ) * Add FeignBlockingLoadBalancerClient, configurations for default, apache httpclient and okhttp setup. Add autoconfiguration. Init fix for gh-177. * Fix SC loadbalancer dependencies. * Fix generating Feign response when instance not found. * Fix configuration. * Add tests for FeignBlockingLoadBalancerClient and FeignLoadBalancerAutoConfiguration. * Fix checkstyle and formatting. * Refactor, add docs and javadocs. * Fix author name. * Fix docs after code review.	2019-11-06 19:06:39 +01:00
kingj	bc10583bf3	Adding gzip support for Spring Decoder (#230 ) * Adding gzip support for Spring Decoder * Restoring test config * Switch to medium resource class in circleci. (#231) * Adding gzip support for Spring Decoder * Restoring test config * Creating extra property for Gzip Decoder * Fixing requested changes and updating doc * Missed one change request * Removing some properties	2019-11-04 17:53:50 +01:00
buildmaster	cb1ea20f3f	Going back to snapshots	2019-10-24 20:48:10 +00:00
buildmaster	6bfc684967	Update SNAPSHOT to 2.2.0.RC1	2019-10-24 20:47:44 +00:00
Olga Maciaszek-Sharma	63a9245f13	Switch to medium resource class in circleci. (#231 )	2019-10-16 18:38:29 +02:00
buildmaster	64d63cbb39	Going back to snapshots	2019-10-03 19:31:32 +00:00
buildmaster	d963ebd0f0	Update SNAPSHOT to 2.2.0.M3	2019-10-03 19:31:06 +00:00
Robert Resch	1e1562b24a	FeignClientBuilder.Builder should always return the generic builder (#215 ) * FeignClientBuilder should always return the generic builder * Test also FeignClientBuilder.Builder ContextId	2019-09-26 17:00:54 +02:00
buildmaster	7eb7067752	Bumping versions	2019-09-26 11:37:31 +00:00
李家奉	bc4bfb5b7a	Fix FeignClientBuilder fallback (#197 ) * fix FeignClientBuilder fallback * Fix FeignClientBuilder fallback * Fix FeignClientBuilder fallback * Update FeignClientBuilderTests.java * Update FeignClientBuilderTests.java * Update FeignClientBuilderTests.java	2019-09-26 13:11:27 +02:00
Olga Maciaszek-Sharma	94977691b8	Merge remote-tracking branch 'origin/master'	2019-09-18 14:01:50 +02:00
Olga Maciaszek-Sharma	b2791605b7	Upgrade feign-core to 10.4.0. Fixes gh-220.	2019-09-18 14:01:34 +02:00
Ryan Baxter	3e5d7f84aa	Merge remote-tracking branch 'origin/2.1.x'	2019-09-17 17:18:23 -04:00
Olga Maciaszek-Sharma	9dfc820306	Merge branch '2.1.x' # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-openfeign-core/pom.xml # spring-cloud-openfeign-dependencies/pom.xml # spring-cloud-starter-openfeign/pom.xml	2019-09-17 15:49:25 +02:00
buildmaster	ecfd1b4cee	Bumping versions	2019-09-17 11:37:46 +00:00
Marcin Grzejszczak	5ce9fcf9f8	Added configprops; fixes gh-218	2019-09-10 15:29:19 +02:00
Olga Maciaszek-Sharma	21a2a59461	Remove unnecessary property.	2019-08-30 17:03:08 +02:00
Olga Maciaszek-Sharma	39dfa0ef7f	Merge branch '2.1.x' # Conflicts: # spring-cloud-openfeign-core/pom.xml	2019-08-30 16:57:50 +02:00
Marcin Grzejszczak	37fd2d4448	Hardcoded the jersey-apache-client4 version	2019-08-30 09:30:00 +02:00
Ryan Baxter	6493eab98a	Merge branch 'nertzy-docs-fully-qualify-http-client-bean-names'	2019-08-22 11:23:33 -04:00
Ryan Baxter	caacee575c	Polish	2019-08-22 11:23:05 -04:00
Ryan Baxter	8abbf0a343	Merge branch 'docs-fully-qualify-http-client-bean-names' of https://github.com/nertzy/spring-cloud-openfeign into nertzy-docs-fully-qualify-http-client-bean-names	2019-08-22 11:20:08 -04:00
buildmaster	c32b8568cf	Going back to snapshots	2019-08-14 15:04:54 +00:00
buildmaster	654479a696	Update SNAPSHOT to 2.2.0.M2	2019-08-14 15:03:56 +00:00
Spencer Gibb	35b9de7f6e	Updates to support latest hateoas changes.	2019-08-01 13:11:43 -04:00
buildmaster	2294dee616	Bumping versions	2019-07-30 11:38:32 +00:00
Marcin Grzejszczak	dabbfb7220	Merge pull request #202 from Glosur/fix-unpaged-serialization Fix serialization of Pageable.unpaged	2019-07-29 16:43:51 +02:00
Marcin Grzejszczak	3e069b41af	Added symbolic link of index.adoc	2019-07-29 14:43:19 +02:00
Glosur	ead4c47fcb	Fix serialization of Pageable.unpaged	2019-07-28 21:55:30 +00:00
Ryan Baxter	eda905684d	Merge remote-tracking branch 'origin/2.1.x'	2019-07-24 11:12:53 -04:00
buildmaster	ebd80b5115	Bumping versions	2019-07-23 10:51:04 +00:00
buildmaster	866d20d976	Going back to snapshots	2019-07-03 18:11:32 +00:00
buildmaster	0d891d284a	Update SNAPSHOT to 2.2.0.M1	2019-07-03 18:10:51 +00:00
Ryan Baxter	9b8a3c6c1b	Merge remote-tracking branch 'origin/2.1.x'	2019-06-13 20:06:00 -04:00
hectorespert	2e8a5833a9	Fix GH-127 add support for HATEOAS (#140 ) * Fix gh-127, HATEOAS support * Fix gh-127, HATEOAS support tests * Add DefaultCurieProvider for HAL Jackson http converter	2019-06-13 20:04:25 -04:00
Zhan Bin	f76a81fe6b	Improve pageable parameter names. (#181 ) Improve pageable parameter names by reusing spring boot properties.	2019-06-05 14:32:06 -04:00
Jánoky László Viktor	3a60921794	Overridable QueryMapEncoder (#183 ) Added the possibility to override the default QueryMapEncoder by defining a custom one in the ApplicationContext.	2019-06-03 11:12:52 -04:00
Ryan Baxter	e531539e77	Fixing formatting	2019-05-21 16:26:00 -04:00
Ryan Baxter	7afd62dd32	Merge branch 'master' of github.com:spring-cloud/spring-cloud-openfeign	2019-05-21 15:43:45 -04:00
Ryan Baxter	2e21175087	Formatting	2019-05-21 15:43:33 -04:00
Ryan Baxter	10dda1601e	Remove test, as the framework now catches this case at startup.	2019-05-21 15:43:14 -04:00
Olga Maciaszek-Sharma	84b0d0ca40	Merge branch '2.1.x'	2019-05-17 10:54:28 +02:00
Olga Maciaszek-Sharma	50c799a4a0	Add sagan .adoc files.	2019-04-30 15:38:42 +02:00
Olga Maciaszek-Sharma	aba2abba8a	Merge branch '2.1.x' # Conflicts: # pom.xml # spring-cloud-openfeign-dependencies/pom.xml	2019-04-02 18:00:43 +02:00
Ryan Baxter	f6fee55411	Merge branch 'spring-operator-polish-urls-remaining-master'	2019-03-28 16:14:55 -04:00
Ryan Baxter	4092cb10cc	Fixing tests	2019-03-28 16:14:38 -04:00
Ryan Baxter	0169a3c3f3	Merge branch 'polish-urls-remaining-master' of https://github.com/spring-operator/spring-cloud-openfeign into spring-operator-polish-urls-remaining-master	2019-03-28 16:08:17 -04:00
Ryan Baxter	fff4975c1e	Fixing test	2019-03-25 20:09:14 -04:00
Spring Operator	75faca6c17	URL Cleanup (#157 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * [ ] http://www.apache.org/licenses/LICENSE-2.0 with 114 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).	2019-03-21 16:35:12 -04:00
Spring Operator	a81c53a55c	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://foo.com:8000/ (ConnectTimeoutException) with 2 occurrences migrated to: https://foo.com:8000/ ([https](https://foo.com:8000/) result ConnectTimeoutException). * [ ] http://foo.com:8000/abc/bcd.json (ConnectTimeoutException) with 1 occurrences migrated to: https://foo.com:8000/abc/bcd.json ([https](https://foo.com:8000/abc/bcd.json) result ConnectTimeoutException). * [ ] http://PROD-SVC (UnknownHostException) with 2 occurrences migrated to: https://PROD-SVC ([https](https://PROD-SVC) result UnknownHostException). * [ ] http://Url/ (UnknownHostException) with 1 occurrences migrated to: https://Url/ ([https](https://Url/) result UnknownHostException). * [ ] http://bad_hostname (UnknownHostException) with 1 occurrences migrated to: https://bad_hostname ([https](https://bad_hostname) result UnknownHostException). * [ ] http://bar (UnknownHostException) with 1 occurrences migrated to: https://bar ([https](https://bar) result UnknownHostException). * [ ] http://bar/ (UnknownHostException) with 1 occurrences migrated to: https://bar/ ([https](https://bar/) result UnknownHostException). * [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). * [ ] http://foo (UnknownHostException) with 19 occurrences migrated to: https://foo ([https](https://foo) result UnknownHostException). * [ ] http://foo/ (UnknownHostException) with 4 occurrences migrated to: https://foo/ ([https](https://foo/) result UnknownHostException). * [ ] http://foo/?name=%7bcookie (UnknownHostException) with 1 occurrences migrated to: https://foo/?name=%7bcookie ([https](https://foo/?name=%7bcookie) result UnknownHostException). * [ ] http://foo:7777/ (UnknownHostException) with 1 occurrences migrated to: https://foo:7777/ ([https](https://foo:7777/) result UnknownHostException). * [ ] http://good-name (UnknownHostException) with 2 occurrences migrated to: https://good-name ([https](https://good-name) result UnknownHostException). * [ ] http://listener (UnknownHostException) with 6 occurrences migrated to: https://listener ([https](https://listener) result UnknownHostException). * [ ] http://tp/abc/bcd.json (UnknownHostException) with 1 occurrences migrated to: https://tp/abc/bcd.json ([https](https://tp/abc/bcd.json) result UnknownHostException). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://EditorConfig.org with 1 occurrences migrated to: https://EditorConfig.org ([https](https://EditorConfig.org) result 200). * [ ] http://asciidoctor.org with 1 occurrences migrated to: https://asciidoctor.org ([https](https://asciidoctor.org) result 200). * [ ] http://example.com with 2 occurrences migrated to: https://example.com ([https](https://example.com) result 200). * [ ] http://github.com/ with 1 occurrences migrated to: https://github.com/ ([https](https://github.com/) result 200). * [ ] http://projects.spring.io/spring-cloud/ with 1 occurrences migrated to: https://projects.spring.io/spring-cloud/ ([https](https://projects.spring.io/spring-cloud/) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://raw.github.com/ with 1 occurrences migrated to: https://raw.github.com/ ([https](https://raw.github.com/) result 301). * [ ] http://service.com with 1 occurrences migrated to: https://service.com ([https](https://service.com) result 301). * [ ] http://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 11 occurrences * http://localhost:8080/ with 1 occurrences * http://localhost:8081/ with 1 occurrences	2019-03-20 15:47:23 -05:00
Spring Operator	43c53739cf	URL Cleanup (#153 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://maven.apache.org/xsd/maven-4.0.0.xsd with 5 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 10 occurrences * http://www.w3.org/2001/XMLSchema-instance with 5 occurrences	2019-03-20 10:29:58 -04:00
Spring Operator	115e87b6ce	URL Cleanup (#144 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch migrated to: https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch ([https](https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch) result 200). * http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin migrated to: https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin ([https](https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin) result 200). * http://www.apache.org/licenses/LICENSE-2.0 migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 * http://maven.apache.org/xsd/maven-4.0.0.xsd * http://www.w3.org/2001/XMLSchema-instance	2019-03-11 19:08:45 -04:00
Marcin Grzejszczak	33fa5b1b6b	Bumped openfeign to 2.2.0	2019-03-08 11:56:51 +01:00
Grant Hutchins	ca55e95c8f	Docs: Fully qualify names for HTTP client beans This addresses the ambiguity around whether to provide a Bean of feign.okhttp.OkHttpClient or okhttp3.OkHttpClient	2018-10-10 14:25:59 -05:00