Update SNAPSHOT to 2.1.5.RELEASE

Add documentation about early initialization errors. Fixes #221
Add appendix.adoc. Fixes #255
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 · 2019-11-18 15:11:21 +00:00 · 2019-11-18 15:11:21 +00:00
69 changed files with 458 additions and 1159 deletions
@@ -9,7 +9,6 @@ jobs:
    branches:
      ignore:
        - gh-pages # list of branches to ignore
-    resource_class: large
    steps:
      - checkout
      - restore_cache:
@@ -36,4 +35,4 @@ jobs:
          destination: artifacts
      - store_test_results:
          path: /junit/
-          destination: testartifacts
+          destination: testartifacts
@@ -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.

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.0.M3</version>
+		<version>2.1.5.RELEASE</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,23 +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.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}*

@@ -112,7 +118,7 @@ Spring Cloud Netflix provides the following beans by default for feign (`BeanTyp
 * `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used.

 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:

@@ -122,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:

@@ -252,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");
    }
 }
 ----
@@ -476,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].
-
-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].
+Depending on how you are using your Feign clients you may see initialization errors when starting your application.
+To work around this problem you can use an `ObjectProvider` when autowiring your client.

 [source,java,indent=0]
 ----
-@FeignClient("demo")
-public interface DemoTemplate {
-
-    @GetMapping(path = "/stores")
-    CollectionModel<Store> getStores();
-}
+@Autowired
+ObjectProvider<TestFeginClient> testFeginClient;
 ----
-
-== 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.0.M3</version>
+	<version>2.1.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M6</version>
+		<version>2.1.10.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.2.0.M3</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.0.M3</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.1.5.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.1.5.RELEASE</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -39,6 +39,12 @@
 		<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>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.0.M3</version>
+		<version>2.1.5.RELEASE</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>
@@ -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(
-				final Class<? extends FallbackFactory<? extends T>> fallbackFactory) {
+		public Builder fallbackFactory(final Class<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;
@@ -148,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();
 		}
@@ -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;
@@ -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(
-				new SpringEncoder(this.messageConverters));
-		if (springDataWebProperties != null) {
-			encoder.setPageParameter(
-					springDataWebProperties.getPageable().getPageParameter());
-			encoder.setSizeParameter(
-					springDataWebProperties.getPageable().getSizeParameter());
-			encoder.setSortParameter(
-					springDataWebProperties.getSort().getSortParameter());
-		}
-		return encoder;
+		return new PageableSpringEncoder(new SpringEncoder(this.messageConverters));
 	}

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

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

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

@@ -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
-@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;
-	}
-
-}
@@ -91,8 +91,7 @@ class HttpClientFeignLoadBalancedConfiguration {
 		}

 		@Bean
-		@ConditionalOnProperty(value = "feign.compression.response.enabled",
-				havingValue = "true")
+		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "true")
 		public CloseableHttpClient customHttpClient(
 				HttpClientConnectionManager httpClientConnectionManager,
 				FeignHttpClientProperties httpClientProperties) {
@@ -104,8 +103,7 @@ class HttpClientFeignLoadBalancedConfiguration {
 		}

 		@Bean
-		@ConditionalOnProperty(value = "feign.compression.response.enabled",
-				havingValue = "false", matchIfMissing = true)
+		@ConditionalOnProperty(value = "feign.compression.response.enabled", havingValue = "false", matchIfMissing = true)
 		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
 				HttpClientConnectionManager httpClientConnectionManager,
 				FeignHttpClientProperties httpClientProperties) {
@@ -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 {
@@ -35,10 +35,12 @@ import org.apache.commons.logging.LogFactory;

 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 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;
@@ -49,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 {

@@ -67,8 +70,8 @@ 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("Content-Type");
+			Collection<String> contentTypes = request.headers()
+					.get(HttpEncoding.CONTENT_TYPE);

 			MediaType requestContentType = null;
 			if (contentTypes != null && !contentTypes.isEmpty()) {
@@ -89,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)) {
-					if (log.isDebugEnabled()) {
-						if (requestContentType != null) {
-							log.debug("Writing [" + requestBody + "] as \""
-									+ requestContentType + "\" using [" + messageConverter
-									+ "]");
-						}
-						else {
-							log.debug("Writing [" + requestBody + "] using ["
-									+ messageConverter + "]");
-						}
-
+				FeignOutputMessage outputMessage;
+				try {
+					if (messageConverter instanceof GenericHttpMessageConverter) {
+						outputMessage = checkAndWrite(requestBody, bodyType,
+								requestContentType,
+								(GenericHttpMessageConverter) messageConverter, request);
 					}
-
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-					try {
-						@SuppressWarnings("unchecked")
-						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
-						copy.write(requestBody, requestContentType, outputMessage);
-					}
-					catch (IOException ex) {
-						throw new EncodeException("Error converting request body", ex);
+					else {
+						outputMessage = checkAndWrite(requestBody, requestContentType,
+								messageConverter, request);
 					}
+				}
+				catch (IOException 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
@@ -139,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 + "]";
 			}
@@ -147,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();
@@ -1,6 +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
@@ -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)
-				.fallback(TestFeignClientFallback.class)
-				.fallbackFactory(TestFeignClientFallbackFactory.class).path("Path/")
-				.url("Url/").contextId("TestContext");
+				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
+				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
+				.url("Url/");

 		// 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, "fallbackFactory",
-				TestFeignClientFallbackFactory.class);
+		assertFactoryBeanField(builder, "fallback", Object.class);
+		assertFactoryBeanField(builder, "fallbackFactory", Object.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();
-		}
-
-	}
-
 }
@@ -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",
-			configuration = FooConfiguration.class)
+	@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
 	interface FooClient {

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

 	}

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

 		@RequestMapping(value = "/", method = RequestMethod.GET)
@@ -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,
-		webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = FeignClientUsingPropertiesTests.Application.class, webEnvironment = RANDOM_PORT)
@TestPropertySource("classpath:feign-properties.properties")
@DirtiesContext
 public class FeignClientUsingPropertiesTests {
@@ -147,8 +146,7 @@ public class FeignClientUsingPropertiesTests {

 	protected interface FormClient {

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

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

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

 	@Test(expected = IllegalStateException.class)
 	public void badNameHttpPrefix() {
-		testGetName("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");
-		assertThat(name).as("name was wrong").isEqualTo("https://good-name");
+		String name = testGetName("http://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/",
-			fallback = FallbackClient.class)
+	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", 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/",
-			fallbackFactory = FallbackFactoryClient.class)
+	@FeignClient(name = "fallbackFactoryTestClient", url = "http://localhost:8081/", fallbackFactory = FallbackFactoryClient.class)
 	protected interface FallbackFactoryClient {

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

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

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

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

@@ -49,11 +49,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Dave Syer
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignClientTests.Application.class,
-		webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=feignclienttest",
-				"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
+@SpringBootTest(classes = FeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=feignclienttest",
+		"logging.level.org.springframework.cloud.openfeign.valid=DEBUG",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class FeignClientTests {

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

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

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

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

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

@@ -27,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,
-		webEnvironment = RANDOM_PORT,
-		value = { "feign.compression.request.enabled=true",
-				"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
-				"ribbon.OkToRetryOnAllOperations=false" })
+@SpringBootTest(classes = FeignPageableEncodingTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"feign.compression.request.enabled=true",
+		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
+		"ribbon.OkToRetryOnAllOperations=false" })
@RunWith(SpringJUnit4ClassRunner.class)
 public class FeignPageableEncodingTests {

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

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

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

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

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

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

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

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

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

 		return ResponseEntity.ok(invoices);
 	}

-	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "invoicesPaged", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<Invoice>> getInvoicesPaged(
 			org.springframework.data.domain.Pageable pageable) {
 		Page<Invoice> page = new PageImpl<>(createInvoiceList(pageable.getPageSize()),
@@ -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;
-	}
-
-}
@@ -56,8 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@RunWith(SpringRunner.class)
@DirtiesContext
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
-		properties = { "feign.hystrix.enabled=true" })
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
+		"feign.hystrix.enabled=true" })
@ActiveProfiles("proxysecurity")
 public class HystrixSecurityTests {

@@ -47,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,6 +128,21 @@ public class FeignClientValidationTests {
 		}
 	}

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

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

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

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

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

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

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

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

 			@RequestMapping(method = RequestMethod.GET, value = "/")
@@ -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/"));
-		assertThat(uri).isEqualTo(new URI("https://foo:7777/"));
+				new URI("http://foo/"));
+		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,
-		webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignribbonclientpathtest",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
-				"feign.hystrix.enabled=false", "test.path.prefix=/base/path" // For
-																				// pathWithPlaceholder
-																				// test
-		})
+@SpringBootTest(classes = FeignRibbonClientPathTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=feignribbonclientpathtest", "feign.okhttp.enabled=false",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
+		"test.path.prefix=/base/path" // For pathWithPlaceholder test
+})
@DirtiesContext
 public class FeignRibbonClientPathTests {

@@ -52,12 +52,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class,
-		webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=feignclientretrytest",
-				"feign.okhttp.enabled=false", "feign.httpclient.enabled=false",
-				"feign.hystrix.enabled=false", "localapp.ribbon.MaxAutoRetries=2",
-				"localapp.ribbon.MaxAutoRetriesNextServer=3" })
+@SpringBootTest(classes = FeignRibbonClientRetryTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=feignclientretrytest", "feign.okhttp.enabled=false",
+		"feign.httpclient.enabled=false", "feign.hystrix.enabled=false",
+		"localapp.ribbon.MaxAutoRetries=2",
+		"localapp.ribbon.MaxAutoRetriesNextServer=3" })
@DirtiesContext
 public class FeignRibbonClientRetryTests {

@@ -44,10 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Ryan Baxter
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(
-		classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class,
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "debug=true", "feign.httpclient.disableSslValidation=true" })
+@SpringBootTest(classes = FeignRibbonHttpClientConfigurationTests.FeignRibbonHttpClientConfigurationTestsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
+		"debug=true", "feign.httpclient.disableSslValidation=true" })
@DirtiesContext
 public class FeignRibbonHttpClientConfigurationTests {

@@ -40,11 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Ryan Baxter
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(
-		classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class,
-		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "debug=true", "feign.httpclient.disableSslValidation=true",
-				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
+@SpringBootTest(classes = FeignRibbonOkHttpClientConfigurationTests.FeignRibbonOkHttpClientConfigurationTestsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
+		"debug=true", "feign.httpclient.disableSslValidation=true",
+		"feign.okhttp.enabled=true", "feign.httpclient.enabled=false" })
@DirtiesContext
 public class FeignRibbonOkHttpClientConfigurationTests {

@@ -41,10 +41,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Spencer Gibb
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class,
-		webEnvironment = WebEnvironment.RANDOM_PORT,
-		value = { "spring.application.name=loadBalancerFeignClientTests",
-				"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
+@SpringBootTest(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=loadBalancerFeignClientTests",
+		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false" })
@DirtiesContext
 public class LoadBalancerFeignClientOverrideTests {

@@ -132,11 +132,11 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(
 				clientFactory);
-		Request feignRequest = Request.create(GET, "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
@@ -39,9 +39,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Charlie Mordant.
 */
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class,
-		webEnvironment = RANDOM_PORT, value = {
-				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, value = {
+		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class PageableEncoderTests {

@@ -16,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,
-		webEnvironment = WebEnvironment.RANDOM_PORT, value = {
-				"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
+@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+		"spring.application.name=springencodertest", "spring.jmx.enabled=false" })
@DirtiesContext
 public class SpringEncoderTests {

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

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

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

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

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

 	public interface TestTemplate_Headers {

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

 	}

 	public interface TestTemplate_HeadersWithoutValues {

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

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

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

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

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

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

 		@GetMapping(produces = "application/json")
@@ -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(
-				pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);
+		String getTest(
+				@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(
-				pattern = CUSTOM_PATTERN) BigDecimal amount);
+		String getTest(
+				@RequestParam("amount") @NumberFormat(pattern = CUSTOM_PATTERN) BigDecimal amount);

 	}

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

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

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

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

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

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

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

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

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

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

-		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders",
-				headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
+		@RequestMapping(method = RequestMethod.GET, path = "/helloheadersplaceholders", headers = "myPlaceholderHeader=${feignClient.myPlaceholderHeader}")
 		String getHelloHeadersPlaceholders();

 		@RequestMapping(method = RequestMethod.GET, path = "/helloparams")
 		List<String> getParams(@RequestParam("params") List<String> params);

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

 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
 		HystrixCommand<List<Hello>> getHellosHystrix();
@@ -481,10 +478,7 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/hello")
 		HttpEntity<Hello> getHelloEntity();

-		@RequestMapping(method = RequestMethod.POST,
-				consumes = "application/vnd.io.spring.cloud.test.v1+json",
-				produces = "application/vnd.io.spring.cloud.test.v1+json",
-				path = "/complex")
+		@RequestMapping(method = RequestMethod.POST, consumes = "application/vnd.io.spring.cloud.test.v1+json", produces = "application/vnd.io.spring.cloud.test.v1+json", path = "/complex")
 		String moreComplexContentType(String body);

 		@RequestMapping(method = RequestMethod.GET, path = "/tostring")
@@ -545,8 +539,7 @@ public class FeignClientTests {

 	}

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

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

 	}

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

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

 	}

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

 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
@@ -706,25 +697,16 @@ public class FeignClientTests {
 			DecodingTestClient.class, HystrixClient.class,
 			HystrixClientWithFallBackFactory.class, HystrixSetterFactoryClient.class,
 			InvalidTypeHystrixClientWithFallBackFactory.class,
-			NullHystrixClientWithFallBackFactory.class },
-			defaultConfiguration = TestDefaultFeignConfig.class)
+			NullHystrixClientWithFallBackFactory.class }, defaultConfiguration = TestDefaultFeignConfig.class)
 	@RibbonClients({
-			@RibbonClient(name = "localapp",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp2",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp3",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp4",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp5",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp6",
-					configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp7",
-					configuration = LocalRibbonClientConfiguration.class) })
+			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp2", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp3", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp4", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp5", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp6", configuration = LocalRibbonClientConfiguration.class),
+			@RibbonClient(name = "localapp7", configuration = LocalRibbonClientConfiguration.class) })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

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

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

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

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

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

 	protected interface BaseTestClient {

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

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

 	}

 	protected interface UserService {

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

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

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

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

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

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

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

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

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

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.0.M6</version>
+		<version>2.1.10.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.0.M3</version>
+	<version>2.1.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.0.M3</version>
+		<version>2.1.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
Author	SHA1	Message	Date
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
Ryan Baxter	f01c46ab2e	Use the context id if present in the HystrixTargeter (#247 ) * Use the context id if present in the HystrixTargeter. Fixes #173 * Remove resource class from circleci	2019-11-13 10:41:57 -05:00