Bumping versions to 2.1.6.BUILD-SNAPSHOT after release

Going back to snapshots
Update SNAPSHOT to 2.1.5.RELEASE
2020-01-31 21:53:12 +00:00 · 2020-01-31 21:53:12 +00:00 · 2020-01-31 21:52:25 +00:00 · 2020-01-29 10:57:58 -05:00 · 2020-01-29 10:38:13 -05:00 · 2020-01-09 17:59:15 +01:00
102 changed files with 664 additions and 3523 deletions
@@ -1,134 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-build</artifactId>
    <version>2.2.1.RELEASE</version>
    <relativePath></relativePath>
  </parent>
  <groupId>org.springframework.cloud</groupId>
  <artifactId>spring-cloud-openfeign</artifactId>
  <version>2.2.1.RELEASE</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>
@@ -1,17 +0,0 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
 ---
 **Describe the bug**
 Please provide details of the problem, including the version of Spring Cloud that you
 are using. 
 **Sample**
 If possible, please provide a test case or sample application that reproduces
 the problem. This makes it much easier for us to diagnose the problem and to verify that
 we have fixed it.
@@ -1,20 +0,0 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
 ---
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 **Additional context**
 Add any other context or screenshots about the feature request here.
@@ -18,4 +18,3 @@ _site/
 .shelf
 *.swp
 *.swo
 .vscode/
@@ -10,23 +10,6 @@ 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.
@@ -1,5 +0,0 @@
 # Security Policy
 ## Reporting a Vulnerability
 To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -1,107 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-openfeign</artifactId>
    <version>2.2.1.RELEASE</version>
  </parent>
  <groupId>org.springframework.cloud</groupId>
  <artifactId>spring-cloud-openfeign-docs</artifactId>
  <version>2.2.1.RELEASE</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.1.RELEASE</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
 </project>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.1.6.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -16,14 +16,7 @@
 		<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>
@@ -39,29 +32,28 @@
 			<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.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 						<inherited>false</inherited>
 					</plugin>
 					<plugin>
 						<groupId>com.agilejava.docbkx</groupId>
 						<artifactId>docbkx-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,8 +4,6 @@ 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
@@ -1,16 +0,0 @@
 :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}
@@ -1,24 +0,0 @@
 |===
 |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.
 |===
@@ -0,0 +1,14 @@
 :numbered!:
 [appendix]
 [[common-application-properties]]
 == Common application properties
 include::_attributes.adoc[]
 Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
 This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
 NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
 Also, you can define your own properties.
 include::_configprops.adoc[]
@@ -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
-    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # http://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}]"
-        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # http://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"
@@ -1,26 +0,0 @@
 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,5 +1,11 @@
 :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}*
@@ -9,13 +15,7 @@ include::intro.adoc[]
 [[spring-cloud-feign]]
 == Declarative REST Client: Feign
-https://github.com/OpenFeign/feign[Feign] is a declarative web service client.
+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.
 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,24 +52,22 @@ public interface StoreClient {
 }
 ----
-In the `@FeignClient` annotation the String value ("stores" above) is an arbitrary client name, which is used to create either a https://github.com/Netflix/ribbon[Ribbon] load-balancer (see <<spring-cloud-ribbon,below for details of Ribbon support>>) or https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancer.java[Spring Cloud LoadBalancer].
+In the `@FeignClient` annotation the String value ("stores" above) is
-You can also specify a URL using the `url` attribute
+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
 (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 load-balancer client above will want to discover the physical addresses
+The Ribbon 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
@@ -117,13 +115,10 @@ 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 in the classpath and is enabled it is a `LoadBalancerFeignClient`, otherwise if Spring Cloud LoadBalancer is in the classpath, `FeignBlockingLoadBalancerClient` is used.
+* `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used.
 If none of them is in the classpath, the default feign client is used.
 NOTE: `spring-cloud-starter-openfeign` contains both `spring-cloud-starter-netflix-ribbon` and `spring-cloud-starter-loadbalancer`.
 The OkHttpClient and ApacheHttpClient feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` to `true`, respectively, and having them on the classpath.
-You can customize the HTTP client used by providing a bean of either `org.apache.http.impl.client.CloseableHttpClient` when using Apache or `okhttp3.OkHttpClient` when using OK HTTP.
+You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `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:
@@ -133,7 +128,6 @@ 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:
@@ -263,14 +257,14 @@ class FooController {
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
-				.target(FooClient.class, "https://PROD-SVC");
+				.target(FooClient.class, "http://PROD-SVC");
 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
 				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("admin", "admin"))
-				.target(FooClient.class, "https://PROD-SVC");
+				.target(FooClient.class, "http://PROD-SVC");
    }
 }
 ----
@@ -429,14 +423,6 @@ feign.compression.request.min-request-size=2048
 These properties allow you to be selective about the compressed media types and minimum request threshold length.
 For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
 [source,java]
 ----
 feign.compression.response.enabled=true
 feign.compression.response.useGzipDecoder=true
 ----
 === Feign logging
 A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.
@@ -495,35 +481,22 @@ The following feign client uses the `Params` class by using the `@SpringQueryMap
 [source,java,indent=0]
 ----
@FeignClient("demo")
-public interface DemoTemplate {
+public class DemoTemplate {
    @GetMapping(path = "/demo")
    String demoEndpoint(@SpringQueryMap Params params);
 }
 ----
-If you need more control over the generated query parameter map, you can implement a custom `QueryMapEncoder` bean.
+=== Troubleshooting
-=== HATEOAS support
+==== Early Initialization Errors
-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].
+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.
 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]
 ----
-@FeignClient("demo")
+@Autowired
-public interface DemoTemplate {
+ObjectProvider<TestFeginClient> testFeginClient;
    @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
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://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    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://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.2.1.RELEASE</version>
+	<version>2.1.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.1.11.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.2.1.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-commons.version>2.1.6.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.1.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-netflix.version>2.1.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -39,13 +39,15 @@
 		<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>
@@ -1,392 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-openfeign</artifactId>
    <version>2.2.1.RELEASE</version>
    <relativePath>..</relativePath>
  </parent>
  <groupId>org.springframework.cloud</groupId>
  <artifactId>spring-cloud-openfeign-core</artifactId>
  <version>2.2.1.RELEASE</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.2.RELEASE</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.springframework.cloud</groupId>
      <artifactId>spring-cloud-netflix-ribbon</artifactId>
      <version>2.2.1.RELEASE</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-actuator</artifactId>
      <version>2.2.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-security</artifactId>
      <version>2.2.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-web</artifactId>
      <version>2.2.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-webflux</artifactId>
      <version>2.2.2.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.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-hateoas</artifactId>
      <version>2.2.2.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.1.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.2.RELEASE</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.springframework.cloud</groupId>
      <artifactId>spring-cloud-commons</artifactId>
      <version>2.2.1.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.cloud</groupId>
      <artifactId>spring-cloud-context</artifactId>
      <version>2.2.1.RELEASE</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.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-configuration-processor</artifactId>
      <version>2.2.2.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.data</groupId>
      <artifactId>spring-data-commons</artifactId>
      <version>2.2.3.RELEASE</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>org.springframework.cloud</groupId>
      <artifactId>spring-cloud-loadbalancer</artifactId>
      <version>2.2.1.RELEASE</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.2.1.RELEASE</version>
+		<version>2.1.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -50,11 +50,6 @@
 			<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>
@@ -166,6 +161,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<version>4.1.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -208,11 +204,6 @@
 			<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>
@@ -231,11 +222,6 @@
 			<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,21 +46,18 @@ 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
 * @author Julien Roy
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@ConditionalOnClass(Feign.class)
@EnableConfigurationProperties({ FeignClientProperties.class,
 		FeignHttpClientProperties.class })
@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {
 	@Autowired(required = false)
@@ -78,7 +75,7 @@ public class FeignAutoConfiguration {
 		return context;
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
 	protected static class HystrixFeignTargeterConfiguration {
@@ -90,7 +87,7 @@ public class FeignAutoConfiguration {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
 	protected static class DefaultFeignTargeterConfiguration {
@@ -106,7 +103,7 @@ public class FeignAutoConfiguration {
 	// ribbon is not on the class path.
 	// see corresponding configurations in FeignRibbonClientAutoConfiguration
 	// for load balanced ribbon clients.
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnClass(ApacheHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(CloseableHttpClient.class)
@@ -172,7 +169,7 @@ public class FeignAutoConfiguration {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnClass(OkHttpClient.class)
 	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
 	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
@@ -16,8 +16,6 @@
 package org.springframework.cloud.openfeign;
 import feign.hystrix.FallbackFactory;
 import org.springframework.context.ApplicationContext;
 /**
@@ -59,46 +57,47 @@ 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);
+			this.url("").path("").decode404(false).fallback(void.class)
 					.fallbackFactory(void.class);
 		}
-		public Builder<T> url(final String url) {
+		public Builder url(final String url) {
 			this.feignClientFactoryBean.setUrl(FeignClientsRegistrar.getUrl(url));
 			return this;
 		}
-		public Builder<T> contextId(final String contextId) {
+		public Builder contextId(final String contextId) {
 			this.feignClientFactoryBean.setContextId(contextId);
 			return this;
 		}
-		public Builder<T> path(final String path) {
+		public Builder path(final String path) {
 			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
 			return this;
 		}
-		public Builder<T> decode404(final boolean decode404) {
+		public Builder decode404(final boolean decode404) {
 			this.feignClientFactoryBean.setDecode404(decode404);
 			return this;
 		}
-		public Builder<T> fallback(final Class<? extends T> fallback) {
+		public Builder fallback(final Class<T> fallback) {
 			FeignClientsRegistrar.validateFallback(fallback);
 			this.feignClientFactoryBean.setFallback(fallback);
 			return this;
 		}
-		public Builder<T> fallbackFactory(
+		public Builder fallbackFactory(final Class<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 build() {
+		public <T> T build() {
 			return this.feignClientFactoryBean.getTarget();
 		}
@@ -23,7 +23,6 @@ import feign.Client;
 import feign.Contract;
 import feign.Feign;
 import feign.Logger;
 import feign.QueryMapEncoder;
 import feign.Request;
 import feign.RequestInterceptor;
 import feign.Retryer;
@@ -37,7 +36,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -149,10 +147,7 @@ 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();
 		}
@@ -283,11 +278,6 @@ class FeignClientFactoryBean
 				// but ribbon is on the classpath, so unwrap
 				client = ((LoadBalancerFeignClient) client).getDelegate();
 			}
 			if (client instanceof FeignBlockingLoadBalancerClient) {
 				// not load balancing because we have a url,
 				// but Spring Cloud LoadBalancer is on the classpath, so unwrap
 				client = ((FeignBlockingLoadBalancerClient) client).getDelegate();
 			}
 			builder.client(client);
 		}
 		Targeter targeter = get(context, Targeter.class);
@@ -36,7 +36,6 @@ 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;
@@ -55,7 +54,7 @@ import org.springframework.format.support.FormattingConversionService;
 * @author Dave Syer
 * @author Venil Noronha
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
 public class FeignClientsConfiguration {
 	@Autowired
@@ -70,9 +69,6 @@ public class FeignClientsConfiguration {
 	@Autowired(required = false)
 	private Logger logger;
 	@Autowired(required = false)
 	private SpringDataWebProperties springDataWebProperties;
 	@Bean
 	@ConditionalOnMissingBean
 	public Decoder feignDecoder() {
@@ -91,17 +87,7 @@ public class FeignClientsConfiguration {
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public Encoder feignEncoderPageable() {
-		PageableSpringEncoder encoder = new PageableSpringEncoder(
+		return new PageableSpringEncoder(new SpringEncoder(this.messageConverters));
 				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
@@ -144,7 +130,7 @@ public class FeignClientsConfiguration {
 		return new PageJacksonModule();
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
 	protected static class HystrixFeignConfiguration {
@@ -1,123 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
@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();
 		}
 	}
 }
@@ -1,79 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
@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();
 		}
 	}
 }
@@ -35,12 +35,11 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignAcceptGzipEncodingInterceptor
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled",
+@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
 		matchIfMissing = false)
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@@ -35,15 +35,14 @@ import org.springframework.context.annotation.Configuration;
 * @author Jakub Narloch
 * @see FeignContentGzipEncodingInterceptor
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
@ConditionalOnClass(Feign.class)
@ConditionalOnBean(Client.class)
 // The OK HTTP client uses "transparent" compression.
 // If the content-encoding header is present it disable transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
-@ConditionalOnProperty(value = "feign.compression.request.enabled",
+@ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false)
 		matchIfMissing = false)
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class FeignContentGzipEncodingAutoConfiguration {
@@ -1,96 +0,0 @@
 /*
 * 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(proxyBeanMethods = false)
@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;
 	}
 }
@@ -1,43 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
 class DefaultFeignLoadBalancerConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public Client feignClient(BlockingLoadBalancerClient loadBalancerClient) {
 		return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
 				loadBalancerClient);
 	}
 }
@@ -1,85 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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
 */
 public 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);
 	}
 	public Client getDelegate() {
 		return delegate;
 	}
 }
@@ -1,57 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
 // Order is important here, last should be the default, first should be optional
 // see
 // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
@Import({ HttpClientFeignLoadBalancerConfiguration.class,
 		OkHttpFeignLoadBalancerConfiguration.class,
 		DefaultFeignLoadBalancerConfiguration.class })
 public class FeignLoadBalancerAutoConfiguration {
 }
@@ -1,55 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
@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);
 	}
 }
@@ -1,54 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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(proxyBeanMethods = false)
@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);
 	}
 }
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
 * @author Spencer Gibb
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
 class DefaultFeignLoadBalancedConfiguration {
 	@Bean
@@ -24,7 +24,6 @@ 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;
@@ -40,12 +39,9 @@ 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",
+@Configuration
 		matchIfMissing = true)
@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(FeignAutoConfiguration.class)
@EnableConfigurationProperties({ FeignHttpClientProperties.class })
 // Order is important here, last should be the default, first should be optional
@@ -16,27 +16,37 @@
 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.clientconfig.HttpClientFeignConfiguration;
+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
 * @author Olga Maciaszek-Sharma
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
@Import(HttpClientFeignConfiguration.class)
 class HttpClientFeignLoadBalancedConfiguration {
 	@Bean
@@ -47,4 +57,82 @@ 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,26 +16,30 @@
 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.clientconfig.OkHttpFeignConfiguration;
+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
 * @author Olga Maciaszek-Sharma
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@ConditionalOnClass(OkHttpClient.class)
@ConditionalOnProperty("feign.okhttp.enabled")
@Import(OkHttpFeignConfiguration.class)
 class OkHttpFeignLoadBalancedConfiguration {
 	@Bean
@@ -46,4 +50,45 @@ 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();
 			}
 		}
 	}
 }
@@ -1,85 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.support;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.zip.GZIPInputStream;
 import feign.FeignException;
 import feign.Response;
 import feign.codec.Decoder;
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 /**
 * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder}
 * to decode.
 *
 * @author Jaesik Kim
 */
 public class DefaultGzipDecoder implements Decoder {
 	private Decoder decoder;
 	public DefaultGzipDecoder(Decoder decoder) {
 		this.decoder = decoder;
 	}
 	@Override
 	public Object decode(final Response response, Type type)
 			throws IOException, FeignException {
 		Collection<String> encoding = response.headers()
 				.containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
 						? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER)
 						: null;
 		if (encoding != null) {
 			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
 				String decompressedBody = decompress(response);
 				if (decompressedBody != null) {
 					Response decompressedResponse = response.toBuilder()
 							.body(decompressedBody.getBytes()).build();
 					return decoder.decode(decompressedResponse, type);
 				}
 			}
 		}
 		return decoder.decode(response, type);
 	}
 	private String decompress(Response response) throws IOException {
 		if (response.body() == null) {
 			return null;
 		}
 		try (GZIPInputStream gzipInputStream = new GZIPInputStream(
 				response.body().asInputStream());
 				BufferedReader reader = new BufferedReader(
 						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
 			String outputString = "";
 			String line;
 			while ((line = reader.readLine()) != null) {
 				outputString += line;
 			}
 			return outputString;
 		}
 	}
 }
@@ -1,59 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.support;
 import feign.codec.Decoder;
 import feign.optionals.OptionalDecoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 /**
 * Configures Default Gzip Decoder.
 *
 * @author Jaesik Kim
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty("feign.compression.response.enabled")
 // The OK HTTP client uses "transparent" compression.
 // If the accept-encoding header is present, it disables transparent compression
@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
@AutoConfigureAfter(FeignAutoConfiguration.class)
 public class DefaultGzipDecoderConfiguration {
 	private ObjectFactory<HttpMessageConverters> messageConverters;
 	public DefaultGzipDecoderConfiguration(
 			ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.messageConverters = messageConverters;
 	}
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
 	public Decoder defaultGzipDecoder() {
 		return new OptionalDecoder(new ResponseEntityDecoder(
 				new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
 	}
 }
@@ -62,18 +62,6 @@ 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,6 +40,7 @@ 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;
@@ -50,6 +51,7 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
 /**
 * @author Spencer Gibb
 * @author Scien Jus
 * @author Ahmad Mozafarnia
 */
 public class SpringEncoder implements Encoder {
@@ -68,7 +70,6 @@ public class SpringEncoder implements Encoder {
 			throws EncodeException {
 		// template.body(conversionService.convert(object, String.class));
 		if (requestBody != null) {
 			Class<?> requestType = requestBody.getClass();
 			Collection<String> contentTypes = request.headers()
 					.get(HttpEncoding.CONTENT_TYPE);
@@ -91,31 +92,24 @@ public class SpringEncoder implements Encoder {
 				}
 			}
-			for (HttpMessageConverter<?> messageConverter : this.messageConverters
+			for (HttpMessageConverter messageConverter : this.messageConverters
 					.getObject().getConverters()) {
-				if (messageConverter.canWrite(requestType, requestContentType)) {
+				FeignOutputMessage outputMessage;
-					if (log.isDebugEnabled()) {
+				try {
-						if (requestContentType != null) {
+					if (messageConverter instanceof GenericHttpMessageConverter) {
-							log.debug("Writing [" + requestBody + "] as \""
+						outputMessage = checkAndWrite(requestBody, bodyType,
-									+ requestContentType + "\" using [" + messageConverter
+								requestContentType,
-									+ "]");
+								(GenericHttpMessageConverter) messageConverter, request);
 						}
 						else {
 							log.debug("Writing [" + requestBody + "] using ["
 									+ messageConverter + "]");
 						}
 					}
-
+					else {
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+						outputMessage = checkAndWrite(requestBody, requestContentType,
-					try {
+								messageConverter, request);
 						@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
@@ -141,7 +135,7 @@ public class SpringEncoder implements Encoder {
 				}
 			}
 			String message = "Could not write request: no suitable HttpMessageConverter "
-					+ "found for request type [" + requestType.getName() + "]";
+					+ "found for request type [" + requestBody.getClass().getName() + "]";
 			if (requestContentType != null) {
 				message += " and content type [" + requestContentType + "]";
 			}
@@ -149,6 +143,49 @@ public class SpringEncoder implements Encoder {
 		}
 	}
 	@SuppressWarnings("unchecked")
 	private FeignOutputMessage checkAndWrite(Object body, MediaType contentType,
 			HttpMessageConverter converter, RequestTemplate request) throws IOException {
 		if (converter.canWrite(body.getClass(), contentType)) {
 			logBeforeWrite(body, contentType, converter);
 			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
 			converter.write(body, contentType, outputMessage);
 			return outputMessage;
 		}
 		else {
 			return null;
 		}
 	}
 	@SuppressWarnings("unchecked")
 	private FeignOutputMessage checkAndWrite(Object body, Type genericType,
 			MediaType contentType, GenericHttpMessageConverter converter,
 			RequestTemplate request) throws IOException {
 		if (converter.canWrite(genericType, body.getClass(), contentType)) {
 			logBeforeWrite(body, contentType, converter);
 			FeignOutputMessage outputMessage = new FeignOutputMessage(request);
 			converter.write(body, genericType, contentType, outputMessage);
 			return outputMessage;
 		}
 		else {
 			return null;
 		}
 	}
 	private void logBeforeWrite(Object requestBody, MediaType requestContentType,
 			HttpMessageConverter messageConverter) {
 		if (log.isDebugEnabled()) {
 			if (requestContentType != null) {
 				log.debug("Writing [" + requestBody + "] as \"" + requestContentType
 						+ "\" using [" + messageConverter + "]");
 			}
 			else {
 				log.debug(
 						"Writing [" + requestBody + "] using [" + messageConverter + "]");
 			}
 		}
 	}
 	private final class FeignOutputMessage implements HttpOutputMessage {
 		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -26,12 +26,6 @@
 			"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,7 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration,\
 org.springframework.cloud.openfeign.hateoas.FeignHalAutoConfiguration,\
 org.springframework.cloud.openfeign.FeignAutoConfiguration,\
 org.springframework.cloud.openfeign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\
-org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration,\
+org.springframework.cloud.openfeign.encoding.FeignContentGzipEncodingAutoConfiguration
 org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration
@@ -1,179 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign;
 import java.util.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);
 	}
 	@Test
 	public void testCharsetDecompress() {
 		ResponseEntity<Hello> response = testClient().getUtf8Response();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("wrong status code")
 				.isEqualTo(HttpStatus.OK);
 		Hello hello = response.getBody();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("utf8 hello didn't match")
 				.isEqualTo(new Hello("안녕하세요 means Hello in Korean"));
 	}
 	private static class Hello {
 		private String message;
 		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();
 		@GetMapping("/utf8Response")
 		ResponseEntity<Hello> getUtf8Response();
 	}
 	@Configuration(proxyBeanMethods = false)
 	@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);
 		}
 		@Override
 		public ResponseEntity<Hello> getUtf8Response() {
 			return ResponseEntity.ok(new Hello("안녕하세요 means Hello in Korean"));
 		}
 	}
 }
@@ -48,7 +48,7 @@ public class EnableFeignClientsSpringDataTests {
 				.cast(this.feignContext.getInstance("foo", Encoder.class));
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {
@@ -87,7 +87,7 @@ public class EnableFeignClientsTests {
 		Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {
@@ -24,7 +24,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import feign.hystrix.FallbackFactory;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
@@ -102,11 +101,11 @@ public class FeignClientBuilderTests {
 	public void forType_preinitializedBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient");
+				.forType(FeignClientBuilderTests.class, "TestClient");
 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
 		assertFactoryBeanField(builder, "contextId", "TestClient");
@@ -127,24 +126,21 @@ public class FeignClientBuilderTests {
 	public void forType_allFieldsSetOnBuilder() {
 		// when:
 		final FeignClientBuilder.Builder builder = this.feignClientBuilder
-				.forType(TestFeignClient.class, "TestClient").decode404(true)
+				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
-				.fallback(TestFeignClientFallback.class)
+				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
-				.fallbackFactory(TestFeignClientFallbackFactory.class).path("Path/")
+				.url("Url/");
 				.url("Url/").contextId("TestContext");
 		// then:
 		assertFactoryBeanField(builder, "applicationContext", this.applicationContext);
-		assertFactoryBeanField(builder, "type", TestFeignClient.class);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.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", TestFeignClientFallback.class);
+		assertFactoryBeanField(builder, "fallback", Object.class);
-		assertFactoryBeanField(builder, "fallbackFactory",
+		assertFactoryBeanField(builder, "fallbackFactory", Object.class);
 				TestFeignClientFallbackFactory.class);
 	}
 	@Test
@@ -163,22 +159,4 @@ 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();
 		}
 	}
 }
@@ -16,30 +16,14 @@
 package org.springframework.cloud.openfeign;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import feign.Client;
 import feign.InvocationHandlerFactory;
 import org.junit.Test;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 /**
 * @author Spencer Gibb
@@ -65,74 +49,10 @@ public class FeignClientFactoryTests {
 		assertThat(foobar).as("bar was not null").isNull();
 	}
 	@Test
 	public void shouldRedirectToDelegateWhenUrlSet() {
 		new ApplicationContextRunner().withUserConfiguration(TestConfig.class)
 				.run(this::defaultClientUsed);
 	}
 	@SuppressWarnings({ "unchecked", "ConstantConditions" })
 	private void defaultClientUsed(AssertableApplicationContext context) {
 		Proxy target = context.getBean(FeignClientFactoryBean.class).getTarget();
 		Object invocationHandler = ReflectionTestUtils.getField(target, "h");
 		Map<Method, InvocationHandlerFactory.MethodHandler> dispatch = (Map<Method, InvocationHandlerFactory.MethodHandler>) ReflectionTestUtils
 				.getField(invocationHandler, "dispatch");
 		Method key = new ArrayList<>(dispatch.keySet()).get(0);
 		Object client = ReflectionTestUtils.getField(dispatch.get(key), "client");
 		assertThat(client).isInstanceOf(Client.Default.class);
 	}
 	private FeignClientSpecification getSpec(String name, Class<?> configClass) {
 		return new FeignClientSpecification(name, new Class[] { configClass });
 	}
 	interface TestType {
 		@RequestMapping(value = "/", method = GET)
 		String hello();
 	}
 	@Configuration
 	static class TestConfig {
 		@Bean
 		BlockingLoadBalancerClient loadBalancerClient() {
 			return new BlockingLoadBalancerClient(new LoadBalancerClientFactory());
 		}
 		@Bean
 		FeignContext feignContext() {
 			FeignContext feignContext = new FeignContext();
 			feignContext.setConfigurations(
 					Collections.singletonList(new FeignClientSpecification("test",
 							new Class[] { LoadBalancerAutoConfiguration.class })));
 			return feignContext;
 		}
 		@Bean
 		FeignClientProperties feignClientProperties() {
 			return new FeignClientProperties();
 		}
 		@Bean
 		Targeter targeter() {
 			return new DefaultTargeter();
 		}
 		@Bean
 		FeignClientFactoryBean feignClientFactoryBean() {
 			FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
 			feignClientFactoryBean.setContextId("test");
 			feignClientFactoryBean.setName("test");
 			feignClientFactoryBean.setType(TestType.class);
 			feignClientFactoryBean.setPath("");
 			feignClientFactoryBean.setUrl("http://some.absolute.url");
 			return feignClientFactoryBean;
 		}
 	}
 	static class FooConfig {
 		@Bean
@@ -19,7 +19,6 @@ 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;
@@ -31,7 +30,6 @@ 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;
@@ -135,14 +133,6 @@ 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())
@@ -151,8 +141,7 @@ public class FeignClientOverrideDefaultsTests {
 				.isEqualTo(2);
 	}
-	@FeignClient(name = "foo", url = "https://foo",
+	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
 			configuration = FooConfiguration.class)
 	interface FooClient {
 		@RequestLine("GET /")
@@ -160,8 +149,7 @@ public class FeignClientOverrideDefaultsTests {
 	}
-	@FeignClient(name = "bar", url = "https://bar",
+	@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
 			configuration = BarConfiguration.class)
 	interface BarClient {
 		@RequestMapping(value = "/", method = RequestMethod.GET)
@@ -169,7 +157,7 @@ public class FeignClientOverrideDefaultsTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class })
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			FeignAutoConfiguration.class })
@@ -213,11 +201,6 @@ public class FeignClientOverrideDefaultsTests {
 			return HystrixFeign.builder();
 		}
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new feign.QueryMapEncoder.Default();
 		}
 	}
 	public static class BarConfiguration {
@@ -247,11 +230,6 @@ public class FeignClientOverrideDefaultsTests {
 			return new BasicAuthRequestInterceptor("user", "pass");
 		}
 		@Bean
 		public QueryMapEncoder queryMapEncoder() {
 			return new BeanQueryMapEncoder();
 		}
 	}
 }
@@ -59,8 +59,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Eko Kurniawan Khannedy
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class,
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
 		webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -147,13 +146,12 @@ public class FeignClientUsingPropertiesTests {
 	protected interface FormClient {
-		@RequestMapping(value = "/form", method = RequestMethod.POST,
+		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 		String form(Map<String, String> form);
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -176,8 +174,7 @@ public class FeignClientUsingPropertiesTests {
 			return "OK";
 		}
-		@RequestMapping(value = "/form", method = RequestMethod.POST,
+		@RequestMapping(value = "/form", method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 				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("https://bad_hostname");
+		testGetName("http://bad_hostname");
 	}
 	@Test(expected = IllegalStateException.class)
@@ -63,8 +63,8 @@ public class FeignClientsRegistrarTests {
 	@Test
 	public void goodNameHttpPrefix() {
-		String name = testGetName("https://good-name");
+		String name = testGetName("http://good-name");
-		assertThat(name).as("name was wrong").isEqualTo("https://good-name");
+		assertThat(name).as("name was wrong").isEqualTo("http://good-name");
 	}
 	@Test
@@ -89,8 +89,7 @@ public class FeignClientsRegistrarTests {
 		new AnnotationConfigApplicationContext(FallbackFactoryTestConfig.class);
 	}
-	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/",
+	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
 			fallback = FallbackClient.class)
 	protected interface FallbackClient {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -98,8 +97,7 @@ public class FeignClientsRegistrarTests {
 	}
-	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/",
+	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/", fallbackFactory = FallbackFactoryClient.class)
 			fallbackFactory = FallbackFactoryClient.class)
 	protected interface FallbackFactoryClient {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -107,17 +105,17 @@ public class FeignClientsRegistrarTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
 	protected static class FallbackTestConfig {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
-	@EnableFeignClients(
+	@EnableFeignClients(clients = {
-			clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class })
+			FeignClientsRegistrarTests.FallbackFactoryClient.class })
 	protected static class FallbackFactoryTestConfig {
 	}
@@ -71,7 +71,7 @@ public class FeignCompressionTests {
 				});
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	protected static class PlainConfig {
 		@Autowired
@@ -50,10 +50,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class,
+@SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = DEFINED_PORT, value = {
-		webEnvironment = DEFINED_PORT,
+		"spring.application.name=feignclienturltest", "feign.hystrix.enabled=false",
-		value = { "spring.application.name=feignclienturltest",
+		"feign.okhttp.enabled=false" })
 				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignHttpClientUrlTests {
@@ -129,7 +128,7 @@ public class FeignHttpClientUrlTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class,
@@ -69,13 +69,13 @@ public class FeignLoggerFactoryTests {
 		context.close();
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration1 {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration2 {
@@ -95,7 +95,7 @@ public class FeignLoggerFactoryTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration3 {
@@ -47,9 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringDecoderTests.Application.class,
+@SpringBootTest(classes = SpringDecoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
 				"spring.application.name=springdecodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringDecoderTests extends FeignClientFactoryBean {
@@ -215,7 +214,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@Import(NoSecurityConfiguration.class)
@@ -49,11 +49,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Dave Syer
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientTests.Application.class,
+@SpringBootTest(classes = FeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=feignclienttest",
-		value = { "spring.application.name=feignclienttest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignClientTests {
@@ -112,7 +111,7 @@ public class FeignClientTests {
 		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients
@@ -170,7 +169,7 @@ public class FeignClientTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class TestDefaultFeignConfig {
 	}
@@ -50,9 +50,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class,
+@SpringBootTest(classes = FeignAcceptEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"feign.compression.response.enabled=true" })
 		value = { "feign.compression.response.enabled=true" })
@RunWith(SpringRunner.class)
@DirtiesContext
 public class FeignAcceptEncodingTests {
@@ -76,14 +75,13 @@ public class FeignAcceptEncodingTests {
 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -49,11 +49,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Jakub Narloch
 */
-@SpringBootTest(classes = FeignContentEncodingTests.Application.class,
+@SpringBootTest(classes = FeignContentEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"feign.compression.request.enabled=true",
-		value = { "feign.compression.request.enabled=true",
+		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+		"ribbon.OkToRetryOnAllOperations=false" })
 				"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignContentEncodingTests {
@@ -80,14 +79,13 @@ public class FeignContentEncodingTests {
 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@Import(NoSecurityConfiguration.class)
 	public static class Application {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -27,7 +27,6 @@ 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;
@@ -55,11 +54,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 *
 * @author Charlie Mordant.
 */
-@SpringBootTest(classes = FeignPageableEncodingTests.Application.class,
+@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"feign.compression.request.enabled=true",
-		value = { "feign.compression.request.enabled=true",
+		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+		"ribbon.OkToRetryOnAllOperations=false" })
 				"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignPageableEncodingTests {
@@ -86,16 +84,14 @@ public class FeignPageableEncodingTests {
 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
-	@SpringBootApplication(
+	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 			scanBasePackages = "org.springframework.cloud.openfeign.encoding.app",
 			exclude = { RepositoryRestMvcAutoConfiguration.class })
 	@EnableSpringDataWebSupport
 	@Import({ NoSecurityConfiguration.class, FeignClientsConfiguration.class })
 	public static class Application {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -34,18 +34,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
@FeignClient("local")
 public interface InvoiceClient {
-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable);
-	@RequestMapping(value = "invoices", method = RequestMethod.GET,
+	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> getInvoices();
-	@RequestMapping(value = "invoices", method = RequestMethod.POST,
+	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 			consumes = MediaType.APPLICATION_JSON_VALUE,
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<List<Invoice>> saveInvoices(List<Invoice> invoices);
 }
@@ -39,23 +39,19 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
 public class InvoiceResource {
-	@RequestMapping(value = "invoices", method = RequestMethod.GET,
+	@RequestMapping(value = "invoices", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Invoice>> getInvoices() {
 		return ResponseEntity.ok(createInvoiceList(100));
 	}
-	@RequestMapping(value = "invoices", method = RequestMethod.POST,
+	@RequestMapping(value = "invoices", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 			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,
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable) {
 		Page<Invoice> page = new PageImpl<>(createInvoiceList(pageable.getPageSize()),
@@ -1,75 +0,0 @@
 /*
 * 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"));
 	}
 }
@@ -1,89 +0,0 @@
 /*
 * 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();
 	}
 }
@@ -1,107 +0,0 @@
 /*
 * 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");
 	}
 }
@@ -1,39 +0,0 @@
 /*
 * 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 {
 }
@@ -1,40 +0,0 @@
 /*
 * 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();
 }
@@ -1,59 +0,0 @@
 /*
 * 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);
 	}
 }
@@ -1,44 +0,0 @@
 /*
 * 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;
 	}
 }
@@ -1,34 +0,0 @@
 /*
 * 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;
 	}
 }
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import;
 /**
 * @author Daniel Lavoie
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@EnableAutoConfiguration
@EnableFeignClients(clients = UsernameClient.class)
@Import(NoSecurityConfiguration.class)
@@ -56,8 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@RunWith(SpringRunner.class)
@DirtiesContext
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
-		properties = { "feign.hystrix.enabled=true" })
+		"feign.hystrix.enabled=true" })
@ActiveProfiles("proxysecurity")
 public class HystrixSecurityTests {
@@ -47,6 +47,12 @@ 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(
@@ -122,7 +128,22 @@ public class FeignClientValidationTests {
 		}
 	}
-	@Configuration(proxyBeanMethods = false)
+	@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)
 	protected static class NameAndServiceIdConfiguration {
@@ -137,11 +158,12 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
-	@EnableFeignClients(
+	@EnableFeignClients(clients = {
-			clients = { DuplicatedFeignClientNamesConfiguration.FooClient.class,
+			DuplicatedFeignClientNamesConfiguration.FooClient.class,
-					DuplicatedFeignClientNamesConfiguration.BarClient.class })
+			DuplicatedFeignClientNamesConfiguration.BarClient.class })
 	protected static class DuplicatedFeignClientNamesConfiguration {
 		@FeignClient(contextId = "foo", name = "bar")
@@ -162,7 +184,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = BadHostnameConfiguration.Client.class)
 	protected static class BadHostnameConfiguration {
@@ -177,7 +199,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = MissingFallbackConfiguration.Client.class)
 	protected static class MissingFallbackConfiguration {
@@ -187,8 +209,7 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}
-		@FeignClient(name = "foobar", url = "http://localhost",
+		@FeignClient(name = "foobar", url = "http://localhost", fallback = ClientFallback.class)
 				fallback = ClientFallback.class)
 		interface Client {
 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -207,7 +228,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = WrongFallbackTypeConfiguration.Client.class)
 	protected static class WrongFallbackTypeConfiguration {
@@ -236,7 +257,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = MissingFallbackFactoryConfiguration.Client.class)
 	protected static class MissingFallbackFactoryConfiguration {
@@ -246,8 +267,7 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}
-		@FeignClient(name = "foobar", url = "http://localhost",
+		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = ClientFallback.class)
 				fallbackFactory = ClientFallback.class)
 		interface Client {
 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -266,7 +286,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import(FeignAutoConfiguration.class)
 	@EnableFeignClients(clients = WrongFallbackFactoryTypeConfiguration.Client.class)
 	protected static class WrongFallbackFactoryTypeConfiguration {
@@ -281,8 +301,7 @@ public class FeignClientValidationTests {
 			return HystrixFeign.builder();
 		}
-		@FeignClient(name = "foobar", url = "http://localhost",
+		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = Dummy.class)
 				fallbackFactory = Dummy.class)
 		interface Client {
 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -1,145 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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;
 	}
 }
@@ -1,113 +0,0 @@
 /*
 * Copyright 2013-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.springframework.cloud.openfeign.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("https://foo/")
+		Request request = new RequestTemplate().method(GET).target("http://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("https://foo"));
+		assertThat(resp.getRequestedURI()).isEqualTo(new URI("http://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("https://foo/"));
+				new URI("http://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("https://foo/"));
+				new URI("http://foo/"));
-		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
+		assertThat(uri).isEqualTo(new URI("http://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("https://bar/"));
+				new URI("http://bar/"));
 		assertThat(uri).isEqualTo(new URI("https://foo:443/"));
 	}
 	@Test
 	public void testRibbonRequestURLEncode() throws Exception {
-		String url = "https://foo/?name=%7bcookie"; // name={cookie
+		String url = "http://foo/?name=%7bcookie"; // name={cookie
 		Request request = Request.create(GET, url, new HashMap<>(), null, null);
 		assertThat(request.url()).isEqualTo(url);
@@ -46,14 +46,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Venil Noronha
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class,
+@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"spring.application.name=feignribbonclientpathtest", "feign.okhttp.enabled=false",
-		value = { "spring.application.name=feignribbonclientpathtest",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
+		"test.path.prefix=/base/path" // For pathWithPlaceholder test
-				"feign.hystrix.enabled=false", "test.path.prefix=/base/path" // For
+})
 																				// pathWithPlaceholder
 																				// test
 		})
@DirtiesContext
 public class FeignRibbonClientPathTests {
@@ -139,7 +136,7 @@ public class FeignRibbonClientPathTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@RequestMapping("/base/path")
@@ -177,7 +174,7 @@ public class FeignRibbonClientPathTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -52,12 +52,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class,
+@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"spring.application.name=feignclientretrytest", "feign.okhttp.enabled=false",
-		value = { "spring.application.name=feignclientretrytest",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
+		"localapp.ribbon.MaxAutoRetries=2",
-				"feign.hystrix.enabled=false", "localapp.ribbon.MaxAutoRetries=2",
+		"localapp.ribbon.MaxAutoRetriesNextServer=3" })
 				"localapp.ribbon.MaxAutoRetriesNextServer=3" })
@DirtiesContext
 public class FeignRibbonClientRetryTests {
@@ -95,7 +94,7 @@ public class FeignRibbonClientRetryTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = TestClient.class)
@@ -142,7 +141,7 @@ public class FeignRibbonClientRetryTests {
 // Load balancer with fixed server list for "local" pointing to localhost
 // some bogus servers are thrown in to test retry
-@Configuration(proxyBeanMethods = false)
+@Configuration
 class LocalRibbonClientConfiguration {
 	@Value("${local.server.port}")
@@ -44,10 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Ryan Baxter
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(
+@SpringBootTest(classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
-		classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
+		"debug=true", "feign.httpclient.disableSslValidation=true" })
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = { "debug=true", "feign.httpclient.disableSslValidation=true" })
@DirtiesContext
 public class FeignRibbonHttpClientConfigurationTests {
@@ -88,7 +86,7 @@ public class FeignRibbonHttpClientConfigurationTests {
 		return value;
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	static class FeignRibbonHttpClientConfigurationTestsApplication {
@@ -40,11 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Ryan Baxter
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(
+@SpringBootTest(classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
-		classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class,
+		"debug=true", "feign.httpclient.disableSslValidation=true",
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
 		properties = { "debug=true", "feign.httpclient.disableSslValidation=true",
 				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
@DirtiesContext
 public class FeignRibbonOkHttpClientConfigurationTests {
@@ -67,7 +65,7 @@ public class FeignRibbonOkHttpClientConfigurationTests {
 		return value;
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	static class FeignRibbonOkHttpClientConfigurationTestsApplication {
@@ -41,10 +41,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class,
+@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=loadBalancerFeignClientTests",
-		value = { "spring.application.name=loadBalancerFeignClientTests",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class LoadBalancerFeignClientOverrideTests {
@@ -108,7 +107,7 @@ public class LoadBalancerFeignClientOverrideTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableFeignClients(clients = { FooClient.class, BarClient.class, BazClient.class })
 	@EnableAutoConfiguration
 	protected static class TestConfiguration {
@@ -132,11 +132,11 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
 				clientFactory);
-		Request feignRequest = Request.create(GET, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://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, "https://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
+				client, feignRequest, new URI("http://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, "https://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
+				client, feignRequest, new URI("http://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, "https://listener", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://listener"));
+				client, feignRequest, new URI("http://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, "https://foo", new HashMap<>(),
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
 				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(
-				client, feignRequest, new URI("https://foo"));
+				client, feignRequest, new URI("http://foo"));
 		Response fourOFourResponse = Response.builder().request(feignRequest).status(404)
 				.headers(new HashMap<>()).body(new Response.Body() { // set content into
 																		// response
@@ -91,7 +91,7 @@ public class FeignHttpClientPropertiesTests {
 		return this.context.getBean(FeignHttpClientProperties.class);
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableConfigurationProperties
 	protected static class TestConfiguration {
@@ -39,9 +39,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Charlie Mordant.
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class,
+@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
 				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class PageableEncoderTests {
@@ -16,10 +16,11 @@
 package org.springframework.cloud.openfeign.support;
-import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import feign.RequestTemplate;
@@ -27,7 +28,6 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,12 +35,15 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.openfeign.FeignContext;
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractGenericHttpMessageConverter;
 import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
@@ -60,11 +63,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,
+@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
 				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringEncoderTests {
@@ -75,6 +78,10 @@ public class SpringEncoderTests {
 	@Qualifier("myHttpMessageConverter")
 	private HttpMessageConverter<?> myConverter;
 	@Autowired
 	@Qualifier("myGenericHttpMessageConverter")
 	private GenericHttpMessageConverter<?> myGenericConverter;
 	@Test
 	public void testCustomHttpMessageConverter() {
 		Encoder encoder = this.context.getInstance("foo", Encoder.class);
@@ -94,7 +101,35 @@ public class SpringEncoderTests {
 		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
 		assertThat(request.requestCharset()).as("request charset is wrong")
-				.isEqualTo(Charset.forName("UTF-8"));
+				.isEqualTo(StandardCharsets.UTF_8);
 	}
 	// gh-225
 	@Test
 	public void testCustomGenericHttpMessageConverter() {
 		Encoder encoder = this.context.getInstance("foo", Encoder.class);
 		assertThat(encoder).isNotNull();
 		RequestTemplate request = new RequestTemplate();
 		ParameterizedTypeReference<List<String>> stringListType = new ParameterizedTypeReference<List<String>>() {
 		};
 		request.header(HttpEncoding.CONTENT_TYPE, "application/mygenerictype");
 		encoder.encode(Collections.singletonList("hi"), stringListType.getType(),
 				request);
 		Collection<String> contentTypeHeader = request.headers().get("Content-Type");
 		assertThat(contentTypeHeader).as("missing content type header").isNotNull();
 		assertThat(contentTypeHeader.isEmpty()).as("missing content type header")
 				.isFalse();
 		String header = contentTypeHeader.iterator().next();
 		assertThat(header).as("content type header is wrong")
 				.isEqualTo("application/mygenerictype");
 		assertThat(request.requestCharset()).as("request charset is null").isNotNull();
 		assertThat(request.requestCharset()).as("request charset is wrong")
 				.isEqualTo(StandardCharsets.UTF_8);
 	}
 	@Test
@@ -169,7 +204,7 @@ public class SpringEncoderTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application implements TestClient {
@@ -179,6 +214,11 @@ public class SpringEncoderTests {
 			return new MyHttpMessageConverter();
 		}
 		@Bean
 		GenericHttpMessageConverter<?> myGenericHttpMessageConverter() {
 			return new MyGenericHttpMessageConverter();
 		}
 		private static class MyHttpMessageConverter
 				extends AbstractGenericHttpMessageConverter<Object> {
@@ -204,20 +244,77 @@ public class SpringEncoderTests {
 			@Override
 			protected void writeInternal(Object o, Type type,
 					HttpOutputMessage outputMessage)
-					throws IOException, HttpMessageNotWritableException {
+					throws HttpMessageNotWritableException {
 			}
 			@Override
 			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
-					throws IOException, HttpMessageNotReadableException {
+					throws HttpMessageNotReadableException {
 				return null;
 			}
 			@Override
 			public Object read(Type type, Class<?> contextClass,
 					HttpInputMessage inputMessage)
-					throws IOException, HttpMessageNotReadableException {
+					throws HttpMessageNotReadableException {
 				return null;
 			}
 		}
 		private static class MyGenericHttpMessageConverter
 				extends AbstractGenericHttpMessageConverter<Object> {
 			MyGenericHttpMessageConverter() {
 				super(new MediaType("application", "mygenerictype"));
 			}
 			private boolean isStringList(Type type) {
 				if (type instanceof ParameterizedType) {
 					ParameterizedType parameterizedType = (ParameterizedType) type;
 					return parameterizedType.getRawType() == List.class
 							&& parameterizedType
 									.getActualTypeArguments()[0] == String.class;
 				}
 				else {
 					return false;
 				}
 			}
 			@Override
 			protected boolean supports(Class<?> clazz) {
 				return clazz == List.class;
 			}
 			@Override
 			public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
 				return canWrite(mediaType) && isStringList(type);
 			}
 			@Override
 			public boolean canRead(Type type, Class<?> contextClass,
 					MediaType mediaType) {
 				return canRead(mediaType) && isStringList(type);
 			}
 			@Override
 			protected void writeInternal(Object o, Type type,
 					HttpOutputMessage outputMessage)
 					throws HttpMessageNotWritableException {
 			}
 			@Override
 			public Object read(Type type, Class<?> contextClass,
 					HttpInputMessage inputMessage)
 					throws HttpMessageNotReadableException {
 				return null;
 			}
 			@Override
 			protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
 					throws HttpMessageNotReadableException {
 				return null;
 			}
@@ -225,27 +322,4 @@ public class SpringEncoderTests {
 	}
 	class MediaTypeMatcher implements ArgumentMatcher<MediaType> {
 		private MediaType mediaType;
 		MediaTypeMatcher(String type, String subtype) {
 			this.mediaType = new MediaType(type, subtype);
 		}
 		@Override
 		public boolean matches(MediaType argument) {
 			return this.mediaType.equals(argument);
 		}
 		@Override
 		public String toString() {
 			final StringBuffer sb = new StringBuffer("MediaTypeMatcher{");
 			sb.append("mediaType=").append(this.mediaType);
 			sb.append('}');
 			return sb.toString();
 		}
 	}
 }
@@ -537,19 +537,16 @@ public class SpringMvcContractTests {
 	public interface TestTemplate_Simple {
-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);
-		@RequestMapping(method = RequestMethod.GET,
+		@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 				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,
+		@RequestMapping(method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject postTest(@RequestBody TestObject object);
 		@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@@ -575,16 +572,15 @@ public class SpringMvcContractTests {
 	public interface TestTemplate_Headers {
-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, headers = "X-Foo=bar")
 				headers = "X-Foo=bar")
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);
 	}
 	public interface TestTemplate_HeadersWithoutValues {
-		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET,
+		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, headers = {
-				headers = { "X-Foo", "!X-Bar", "X-Baz!=fooBar" })
+				"X-Foo", "!X-Bar", "X-Baz!=fooBar" })
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);
 	}
@@ -644,25 +640,21 @@ public class SpringMvcContractTests {
 	public interface TestTemplate_Advanced {
 		@ExceptionHandler
-		@RequestMapping(path = "/test/{id}", method = RequestMethod.PUT,
+		@RequestMapping(path = "/test/{id}", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
 				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,
+		@RequestMapping(path = "/test2", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
 				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,
+		@RequestMapping(path = "/testfallback/{id}", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTestFallback(@RequestHeader String Authorization,
 				@PathVariable String id, @RequestParam Integer amount);
-		@RequestMapping(method = RequestMethod.GET,
+		@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject getTest();
 		@GetMapping(produces = "application/json")
@@ -676,8 +668,8 @@ public class SpringMvcContractTests {
 		String CUSTOM_PATTERN = "dd-MM-yyyy HH:mm";
 		@RequestMapping(method = RequestMethod.GET)
-		String getTest(@RequestParam(name = "localDateTime") @DateTimeFormat(
+		String getTest(
-				pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);
+				@RequestParam(name = "localDateTime") @DateTimeFormat(pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);
 	}
@@ -686,13 +678,12 @@ public class SpringMvcContractTests {
 		String CUSTOM_PATTERN = "$###,###.###";
 		@RequestMapping(method = RequestMethod.GET)
-		String getTest(@RequestParam("amount") @NumberFormat(
+		String getTest(
-				pattern = CUSTOM_PATTERN) BigDecimal amount);
+				@RequestParam("amount") @NumberFormat(pattern = CUSTOM_PATTERN) BigDecimal amount);
 	}
-	@JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE,
+	@JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE, setterVisibility = 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(
+@SpringBootTest(properties = { "feign.okhttp.enabled: false",
-		properties = { "feign.okhttp.enabled: false", "ribbon.eureka.enabled = false" })
+		"ribbon.eureka.enabled = false" })
@DirtiesContext
 public class ApacheHttpClientConfigurationTests {
@@ -109,8 +109,8 @@ public class ApacheHttpClientConfigurationTests {
 	@SpringBootConfiguration
 	@EnableAutoConfiguration
-	@EnableFeignClients(
+	@EnableFeignClients(clients = {
-			clients = { ApacheHttpClientConfigurationTestApp.FooClient.class })
+			ApacheHttpClientConfigurationTestApp.FooClient.class })
 	static class ApacheHttpClientConfigurationTestApp {
 		@FeignClient(name = "foo", serviceId = "foo")
@@ -160,7 +160,7 @@ public class ApacheHttpClientConfigurationTests {
 		}
-		@Configuration(proxyBeanMethods = false)
+		@Configuration
 		static class MyConfig {
 			@Bean
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-@Configuration(proxyBeanMethods = false)
+@Configuration
 public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	@Override
@@ -33,7 +33,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 /**
 * @author Spencer Gibb
 */
-@Configuration(proxyBeanMethods = false)
+@Configuration
@Import({ NoopDiscoveryClientAutoConfiguration.class })
@AutoConfigureBefore(SecurityAutoConfiguration.class)
 public class TestAutoConfiguration {
@@ -42,7 +42,7 @@ public class TestAutoConfiguration {
 	public static final String PASSWORD = "{noop}password";
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	protected static class TestSecurityConfiguration
 			extends WebSecurityConfigurerAdapter {
@@ -49,11 +49,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Jakub Narloch
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientNotPrimaryTests.Application.class,
+@SpringBootTest(classes = FeignClientNotPrimaryTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"spring.application.name=feignclientnotprimarytest",
-		value = { "spring.application.name=feignclientnotprimarytest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
 				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignClientNotPrimaryTests {
@@ -99,11 +98,11 @@ public class FeignClientNotPrimaryTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
-	@EnableFeignClients(clients = { TestClient.class },
+	@EnableFeignClients(clients = {
-			defaultConfiguration = TestDefaultFeignConfig.class)
+			TestClient.class }, defaultConfiguration = TestDefaultFeignConfig.class)
 	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application {
@@ -150,7 +149,7 @@ public class FeignClientNotPrimaryTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class TestDefaultFeignConfig {
 		@Bean
@@ -161,7 +160,7 @@ public class FeignClientNotPrimaryTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -93,12 +93,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Halvdan Hoem Grelland
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientTests.Application.class,
+@SpringBootTest(classes = FeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=feignclienttest",
-		value = { "spring.application.name=feignclienttest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
+		"feign.hystrix.enabled=true" })
 				"feign.hystrix.enabled=true" })
@DirtiesContext
 public class FeignClientTests {
@@ -442,8 +441,7 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
 		Optional<Hello> getOptionalHello();
-		@RequestMapping(method = RequestMethod.GET,
+		@RequestMapping(method = RequestMethod.GET, path = "${feignClient.methodLevelRequestMappingPath}")
 				path = "${feignClient.methodLevelRequestMappingPath}")
 		Hello getHelloUsingPropertyPlaceHolder();
 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
@@ -458,16 +456,15 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/helloheaders")
 		List<String> getHelloHeaders();
-		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders",
+		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders", headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
 				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(
+		List<LocalDate> getFormattedParams(
-				pattern = "dd-MM-yyyy") List<LocalDate> params);
+				@RequestParam("params") @DateTimeFormat(pattern = "dd-MM-yyyy") List<LocalDate> params);
 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
 		HystrixCommand<List<Hello>> getHellosHystrix();
@@ -481,10 +478,7 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
 		HttpEntity<Hello> getHelloEntity();
-		@RequestMapping(method = RequestMethod.POST,
+		@RequestMapping(method = RequestMethod.POST, consumes = "application/vnd.io.spring.cloud.test.v1+json", produces = "application/vnd.io.spring.cloud.test.v1+json", path = "/complex")
 				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")
@@ -545,8 +539,7 @@ public class FeignClientTests {
 	}
-	@FeignClient(name = "localapp6",
+	@FeignClient(name = "localapp6", fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
 			fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
 	protected interface InvalidTypeHystrixClientWithFallBackFactory {
 		@RequestMapping(method = RequestMethod.GET, path = "/fail")
@@ -554,8 +547,7 @@ public class FeignClientTests {
 	}
-	@FeignClient(name = "localapp7",
+	@FeignClient(name = "localapp7", fallbackFactory = NullHystrixClientFallbackFactory.class)
 			fallbackFactory = NullHystrixClientFallbackFactory.class)
 	protected interface NullHystrixClientWithFallBackFactory {
 		@RequestMapping(method = RequestMethod.GET, path = "/fail")
@@ -563,8 +555,7 @@ public class FeignClientTests {
 	}
-	@FeignClient(name = "localapp5",
+	@FeignClient(name = "localapp5", configuration = TestHystrixSetterFactoryClientConfig.class)
 			configuration = TestHystrixSetterFactoryClientConfig.class)
 	protected interface HystrixSetterFactoryClient {
 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
@@ -699,32 +690,23 @@ public class FeignClientTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClientServiceId.class, TestClient.class,
 			DecodingTestClient.class, HystrixClient.class,
 			HystrixClientWithFallBackFactory.class, HystrixSetterFactoryClient.class,
 			InvalidTypeHystrixClientWithFallBackFactory.class,
-			NullHystrixClientWithFallBackFactory.class },
+			NullHystrixClientWithFallBackFactory.class }, defaultConfiguration = TestDefaultFeignConfig.class)
 			defaultConfiguration = TestDefaultFeignConfig.class)
 	@RibbonClients({
-			@RibbonClient(name = "localapp",
+			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1",
+			@RibbonClient(name = "localapp2", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp3", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp2",
+			@RibbonClient(name = "localapp4", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp5", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp3",
+			@RibbonClient(name = "localapp6", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp7", 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 {
@@ -827,8 +809,8 @@ public class FeignClientTests {
 		}
 		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
-		public List<LocalDate> getFormattedParams(@RequestParam("params") @DateTimeFormat(
+		public List<LocalDate> getFormattedParams(
-				pattern = "dd-MM-yyyy") List<LocalDate> params) {
+				@RequestParam("params") @DateTimeFormat(pattern = "dd-MM-yyyy") List<LocalDate> params) {
 			return params;
 		}
@@ -852,10 +834,7 @@ public class FeignClientTests {
 			return ResponseEntity.status(HttpStatus.NOT_FOUND).body((String) null);
 		}
-		@RequestMapping(method = RequestMethod.POST,
+		@RequestMapping(method = RequestMethod.POST, consumes = "application/vnd.io.spring.cloud.test.v1+json", produces = "application/vnd.io.spring.cloud.test.v1+json", path = "/complex")
 				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) {
@@ -924,7 +903,7 @@ public class FeignClientTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class TestDefaultFeignConfig {
 		@Bean
@@ -935,7 +914,7 @@ public class FeignClientTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -64,7 +64,7 @@ public class FeignClientValidationTests {
 		context.close();
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = GoodUrlConfiguration.Client.class)
 	protected static class GoodUrlConfiguration {
@@ -80,7 +80,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = PlaceholderUrlConfiguration.Client.class)
 	protected static class PlaceholderUrlConfiguration {
@@ -96,7 +96,7 @@ public class FeignClientValidationTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class })
 	@EnableFeignClients(clients = GoodServiceIdConfiguration.Client.class)
 	protected static class GoodServiceIdConfiguration {
@@ -56,10 +56,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FeignHttpClientTests.Application.class,
+@SpringBootTest(classes = FeignHttpClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
-		value = { "spring.application.name=feignclienttest",
+		"feign.okhttp.enabled=false" })
 				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignHttpClientTests {
@@ -114,20 +113,17 @@ public class FeignHttpClientTests {
 	protected interface BaseTestClient {
-		@RequestMapping(method = RequestMethod.GET, value = "/hello",
+		@RequestMapping(method = RequestMethod.GET, value = "/hello", produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		Hello getHello();
-		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop",
+		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop", consumes = "application/json")
 				consumes = "application/json")
 		ResponseEntity<Void> patchHello(Hello hello);
 	}
 	protected interface UserService {
-		@RequestMapping(method = RequestMethod.GET, value = "/users/{id}",
+		@RequestMapping(method = RequestMethod.GET, value = "/users/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
 				produces = MediaType.APPLICATION_JSON_VALUE)
 		User getUser(@PathVariable("id") long id);
 	}
@@ -137,15 +133,13 @@ public class FeignHttpClientTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
 	@RibbonClients({
-			@RibbonClient(name = "localapp",
+			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) })
 			@RibbonClient(name = "localapp1",
 					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {
@@ -252,7 +246,7 @@ public class FeignHttpClientTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class LocalRibbonClientConfiguration {
 		@LocalServerPort
@@ -55,12 +55,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignOkHttpTests.Application.class,
+@SpringBootTest(classes = FeignOkHttpTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=feignclienttest", "feign.hystrix.enabled=false",
-		value = { "spring.application.name=feignclienttest",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=true",
-				"feign.hystrix.enabled=false", "feign.httpclient.enabled=false",
+		"spring.cloud.httpclientfactories.ok.enabled=true" })
 				"feign.okhttp.enabled=true",
 				"spring.cloud.httpclientfactories.ok.enabled=true" })
@DirtiesContext
 public class FeignOkHttpTests {
@@ -118,8 +116,7 @@ public class FeignOkHttpTests {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		Hello getHello();
-		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop",
+		@RequestMapping(method = RequestMethod.PATCH, value = "/hellop", consumes = "application/json")
 				consumes = "application/json")
 		ResponseEntity<Void> patchHello(Hello hello);
 	}
@@ -136,15 +133,13 @@ public class FeignOkHttpTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
 	@RibbonClients({
-			@RibbonClient(name = "localapp",
+			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-					configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) })
 			@RibbonClient(name = "localapp1",
 					configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements UserService {
@@ -251,7 +246,7 @@ public class FeignOkHttpTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -48,12 +48,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = IterableParameterTests.Application.class,
+@SpringBootTest(classes = IterableParameterTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-		webEnvironment = WebEnvironment.RANDOM_PORT,
+		"spring.application.name=iterableparametertest",
-		value = { "spring.application.name=iterableparametertest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false",
+		"feign.hystrix.enabled=false" })
 				"feign.hystrix.enabled=false" })
@DirtiesContext
 public class IterableParameterTests {
@@ -75,7 +74,7 @@ public class IterableParameterTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = TestClient.class)
@@ -46,11 +46,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Ryan Baxter
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientEnvVarTests.Application.class,
+@SpringBootTest(classes = FeignClientEnvVarTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT,
+		"spring.application.name=feignclienttest", "feign.httpclient.enabled=false",
-		value = { "spring.application.name=feignclienttest",
+		"basepackage=org.springframework.cloud.openfeign.testclients" })
 				"feign.httpclient.enabled=false",
 				"basepackage=org.springframework.cloud.openfeign.testclients" })
@DirtiesContext
 public class FeignClientEnvVarTests {
@@ -64,7 +62,7 @@ public class FeignClientEnvVarTests {
 		assertThat(hello).as("first hello didn't match").isEqualTo("hello world 1");
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(basePackages = { "${basepackage}" })
@@ -80,7 +78,7 @@ public class FeignClientEnvVarTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -47,9 +47,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientScanningTests.Application.class,
+@SpringBootTest(classes = FeignClientScanningTests.Application.class, webEnvironment = RANDOM_PORT, value = {
-		webEnvironment = RANDOM_PORT, value = { "spring.application.name=feignclienttest",
+		"spring.application.name=feignclienttest", "feign.httpclient.enabled=false" })
 				"feign.httpclient.enabled=false" })
@DirtiesContext
 public class FeignClientScanningTests {
@@ -96,7 +95,7 @@ public class FeignClientScanningTests {
 	}
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients // NO clients attribute. That's what this class is testing!
@@ -112,7 +111,7 @@ public class FeignClientScanningTests {
 	}
 	// Load balancer with fixed server list for "local" pointing to localhost
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	public static class LocalRibbonClientConfiguration {
 		@Value("${local.server.port}")
@@ -1,235 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-dependencies-parent</artifactId>
    <version>2.2.1.RELEASE</version>
    <relativePath></relativePath>
  </parent>
  <groupId>org.springframework.cloud</groupId>
  <artifactId>spring-cloud-openfeign-dependencies</artifactId>
  <version>2.2.1.RELEASE</version>
  <packaging>pom</packaging>
  <name>spring-cloud-openfeign-dependencies</name>
  <description>Spring Cloud OpenFeign Dependencies</description>
  <url>https://projects.spring.io/spring-cloud/spring-cloud-openfeign-dependencies/</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>Project 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>Project lead</role>
      </roles>
    </developer>
  </developers>
  <scm>
    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies</connection>
    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies</developerConnection>
    <url>https://github.com/spring-cloud/spring-cloud-build/spring-cloud-openfeign-dependencies</url>
  </scm>
  <distributionManagement>
    <repository>
      <id>repo.spring.io</id>
      <name>Spring Release Repository</name>
      <url>https://repo.spring.io/libs-release-local</url>
    </repository>
    <snapshotRepository>
      <id>repo.spring.io</id>
      <name>Spring Snapshot Repository</name>
      <url>https://repo.spring.io/libs-snapshot-local</url>
    </snapshotRepository>
    <site>
      <id>spring-docs</id>
      <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/2.2.1.RELEASE/spring-cloud-openfeign-dependencies</url>
    </site>
    <downloadUrl>https://github.com/spring-cloud</downloadUrl>
  </distributionManagement>
  <properties>
    <feign-form.version>3.8.0</feign-form.version>
    <feign.version>10.4.0</feign.version>
  </properties>
  <dependencyManagement>
    <dependencies>
      <dependency>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-openfeign-core</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-starter-openfeign</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-core</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign.form</groupId>
        <artifactId>feign-form-spring</artifactId>
        <version>${feign-form.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-slf4j</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-httpclient</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-hystrix</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-java8</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-okhttp</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-gson</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-jackson-jaxb</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-jackson</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-jaxb</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-jaxrs</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-ribbon</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-sax</artifactId>
        <version>${feign.version}</version>
      </dependency>
      <dependency>
        <groupId>io.github.openfeign</groupId>
        <artifactId>feign-mock</artifactId>
        <version>${feign.version}</version>
      </dependency>
    </dependencies>
  </dependencyManagement>
  <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>
      <pluginRepositories>
        <pluginRepository>
          <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>
        </pluginRepository>
        <pluginRepository>
          <snapshots>
            <enabled>false</enabled>
          </snapshots>
          <id>spring-milestones</id>
          <name>Spring Milestones</name>
          <url>https://repo.spring.io/libs-milestone-local</url>
        </pluginRepository>
      </pluginRepositories>
    </profile>
  </profiles>
 </project>
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.1.11.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.1.RELEASE</version>
+	<version>2.1.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
buildmaster	6f4179ed91	Bumping versions to 2.1.6.BUILD-SNAPSHOT after release	2020-01-31 21:53:12 +00:00
buildmaster	553c563836	Going back to snapshots	2020-01-31 21:53:12 +00:00
buildmaster	01f4808035	Update SNAPSHOT to 2.1.5.RELEASE	2020-01-31 21:52:25 +00:00
Ryan Baxter	a85294a835	Add documentation about early initialization errors. Fixes #221	2020-01-29 10:57:58 -05:00
Ryan Baxter	73a75fd8b2	Add appendix.adoc. Fixes #255	2020-01-29 10:38:13 -05:00
Olga Maciaszek-SharmaandAhmad Mozafarnia	80d2067134	Merge fix 255 to 21x (#273 ) * Fix bug in SpringEncoder (#225) This commit fixes a bug in the SpringEncoder that causes the bodyType to be ignored and not passed to generic message converters. Fixes gh-225 * Fix after cherry-pick. * Add Ahmad Mozafarnia to authors. * Refactor tests. Co-authored-by: Ahmad Mozafarnia <ahmad.mozafarnia@gmail.com>	2020-01-09 17:59:15 +01:00
buildmaster	f97cbb9a73	Bumping versions to 2.1.5.BUILD-SNAPSHOT after release	2019-11-18 15:11:21 +00:00
buildmaster	de39e67e18	Going back to snapshots	2019-11-18 15:11:21 +00:00
buildmaster	78037a1161	Update SNAPSHOT to 2.1.4.RELEASE	2019-11-18 15:10:50 +00:00