Reformat.

This reverts commit f7e490c466.

README.adoc

@@ -66,23 +66,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.
 
-For hints on how to build the project look in `.travis.yml` if there
-is one. There should be a "script" and maybe "install" command. Also
-look at the "services" section to see if any services need to be
-running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they're related to setting git
-credentials and you already have those.
+The projects that require middleware (i.e. Redis) for testing generally
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
 
-The projects that require middleware generally include a
-`docker-compose.yml`, so consider using
-https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
-in Docker containers. See the README in the
-https://github.com/spring-cloud-samples/scripts[scripts demo
-repository] for specific instructions about the common cases of mongo,
-rabbit and redis.
-
-NOTE: If all else fails, build with the command from `.travis.yml` (usually
-`./mvnw install`).
 
 === Documentation
 

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.10.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>

docs/src/main/asciidoc/spring-cloud-openfeign.adoc

@@ -523,10 +523,7 @@ public interface UserClient extends UserService {
 }
 ----
 
-NOTE: It is generally not advisable to share an interface between a
-server and a client. It introduces tight coupling, and also actually
-doesn't work with Spring MVC in its current form (method parameter
-mapping is not inherited).
+WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
 
 === Feign request/response compression
 

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.2.9.BUILD-SNAPSHOT</version>
+	<version>2.2.10.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.4.RELEASE</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.2.10.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.10.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.10.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>

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

@@ -375,7 +375,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		if (!StringUtils.hasText(url)) {
 
 			if (LOG.isInfoEnabled()) {
-				LOG.info("For '" + name + "' URL not provided. Will try picking an instance via load-balancing.");
+				LOG.info("For '" + name
+						+ "' URL not provided. Will try picking an instance via load-balancing.");
 			}
 			if (!name.startsWith("http")) {
 				url = "http://" + name;

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

@@ -28,11 +28,13 @@ import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeExceptio
  *
  * @author Ryan Baxter
  */
-public class LoadBalancerResponseStatusCodeException extends RetryableStatusCodeException {
+public class LoadBalancerResponseStatusCodeException
+		extends RetryableStatusCodeException {
 
 	private final Response response;
 
-	public LoadBalancerResponseStatusCodeException(String serviceId, Response response, byte[] body, URI uri) {
+	public LoadBalancerResponseStatusCodeException(String serviceId, Response response,
+			byte[] body, URI uri) {
 		super(serviceId, response.status(), response, uri);
 		this.response = Response.builder()
 				.body(new ByteArrayInputStream(body), body.length)

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

@@ -113,10 +113,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 							String.format("Retrying on status code: %d", responseStatus));
 				}
 				byte[] byteArray = response.body() == null ? new byte[] {}
-					: StreamUtils.copyToByteArray(response.body().asInputStream());
+						: StreamUtils.copyToByteArray(response.body().asInputStream());
 				response.close();
 				throw new LoadBalancerResponseStatusCodeException(serviceId, response,
-					byteArray, URI.create(request.url()));
+						byteArray, URI.create(request.url()));
 			}
 			return response;
 		}, new LoadBalancedRecoveryCallback<Response, Response>() {

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

@@ -35,6 +35,8 @@ import feign.Feign;
 import feign.MethodMetadata;
 import feign.Param;
 import feign.Request;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.CollectionFormat;
@@ -83,6 +85,8 @@ import static org.springframework.core.annotation.AnnotatedElementUtils.findMerg
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
 
+	private static final Log LOG = LogFactory.getLog(SpringMvcContract.class);
+
 	private static final String ACCEPT = "Accept";
 
 	private static final String CONTENT_TYPE = "Content-Type";
@@ -181,49 +185,19 @@ public class SpringMvcContract extends Contract.BaseContract
 
 	@Override
 	protected void processAnnotationOnClass(MethodMetadata data, Class<?> clz) {
-		if (clz.getInterfaces().length == 0) {
-			RequestMapping classAnnotation = findMergedAnnotation(clz,
-					RequestMapping.class);
-			if (classAnnotation != null) {
-				// Prepend path from class annotation if specified
-				if (classAnnotation.value().length > 0) {
-					String pathValue = emptyToNull(classAnnotation.value()[0]);
-					pathValue = resolve(pathValue);
-					if (!pathValue.startsWith("/")) {
-						pathValue = "/" + pathValue;
-					}
-					data.template().uri(pathValue);
-					if (data.template().decodeSlash() != decodeSlash) {
-						data.template().decodeSlash(decodeSlash);
-					}
-				}
-			}
+		RequestMapping classAnnotation = findMergedAnnotation(clz, RequestMapping.class);
+		if (classAnnotation != null) {
+			LOG.error("Cannot process class: " + clz.getName()
+					+ ". @RequestMapping annotation is not allowed on @FeignClient interfaces.");
+			throw new IllegalArgumentException(
+					"@RequestMapping annotation not allowed on @FeignClient interfaces");
 		}
 	}
 
 	@Override
 	public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
 		processedMethods.put(Feign.configKey(targetType, method), method);
-		MethodMetadata md = super.parseAndValidateMetadata(targetType, method);
-
-		RequestMapping classAnnotation = findMergedAnnotation(targetType,
-				RequestMapping.class);
-		if (classAnnotation != null) {
-			// produces - use from class annotation only if method has not specified this
-			if (!md.template().headers().containsKey(ACCEPT)) {
-				parseProduces(md, method, classAnnotation);
-			}
-
-			// consumes -- use from class annotation only if method has not specified this
-			if (!md.template().headers().containsKey(CONTENT_TYPE)) {
-				parseConsumes(md, method, classAnnotation);
-			}
-
-			// headers -- class annotation is inherited to methods, always write these if
-			// present
-			parseHeaders(md, method, classAnnotation);
-		}
-		return md;
+		return super.parseAndValidateMetadata(targetType, method);
 	}
 
 	@Override

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

@@ -119,8 +119,10 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 
 	private Response testResponse(int status, String body) {
 		// ByteArrayInputStream ignores close() and must be wrapped
-		InputStream reallyCloseable = new BufferedInputStream(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
-		return Response.builder().request(testRequest()).status(status).body(reallyCloseable, null).build();
+		InputStream reallyCloseable = new BufferedInputStream(
+				new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		return Response.builder().request(testRequest()).status(status)
+				.body(reallyCloseable, null).build();
 
 	}
 
@@ -163,23 +165,23 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 	void shouldExposeResponseBodyOnRetry() throws IOException {
 		properties.getRetryableStatusCodes().add(503);
 		Request request = testRequest();
-		when(delegate.execute(any(), any()))
-			.thenReturn(testResponse(503, "foo"), testResponse(503, "foo"));
+		when(delegate.execute(any(), any())).thenReturn(testResponse(503, "foo"),
+				testResponse(503, "foo"));
 		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-			.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-				loadBalancerClient, properties));
+				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
+						loadBalancerClient, properties));
 		when(loadBalancerClient.reconstructURI(serviceInstance,
-			URI.create("http://test/path")))
-			.thenReturn(URI.create("http://testhost:80/path"));
+				URI.create("http://test/path")))
+						.thenReturn(URI.create("http://testhost:80/path"));
 
-		Response response = feignBlockingLoadBalancerClient.execute(request, new Request.Options());
+		Response response = feignBlockingLoadBalancerClient.execute(request,
+				new Request.Options());
 
-		String bodyContent = IOUtils.toString(response.body().asReader(StandardCharsets.UTF_8));
+		String bodyContent = IOUtils
+				.toString(response.body().asReader(StandardCharsets.UTF_8));
 		assertThat(bodyContent).isEqualTo("foo");
 	}
 
-
-
 	@Test
 	void shouldPassCorrectRequestToDelegate() throws IOException {
 		Request request = testRequest();

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

@@ -62,6 +62,7 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
 import static feign.CollectionFormat.SSV;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -182,18 +183,12 @@ public class SpringMvcContractTests {
 	}
 
 	@Test
-	public void testProcessAnnotations_Class_AnnotationsGetSpecificTest()
-			throws Exception {
-		Method method = TestTemplate_Class_Annotations.class
-				.getDeclaredMethod("getSpecificTest", String.class, String.class);
-		MethodMetadata data = contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/prepend/{classId}/test/{testId}");
-		assertThat(data.template().method()).isEqualTo("GET");
-
-		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo("classId");
-		assertThat(data.indexToName().get(1).iterator().next()).isEqualTo("testId");
+	public void testProcessAnnotations_Class_Annotations_RequestMapping() {
+		assertThatIllegalArgumentException().isThrownBy(() -> {
+			Method method = TestTemplate_Class_RequestMapping.class
+					.getDeclaredMethod("getSpecificTest", String.class, String.class);
+			contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		});
 	}
 
 	@Test
@@ -203,7 +198,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url()).isEqualTo("/prepend/{classId}");
+		assertThat(data.template().url()).isEqualTo("/");
 		assertThat(data.template().method()).isEqualTo("GET");
 
 		assertThat(data.indexToName().get(0).iterator().next()).isEqualTo("classId");
@@ -211,22 +206,6 @@ public class SpringMvcContractTests {
 		assertThat(data.template().decodeSlash()).isTrue();
 	}
 
-	@Test
-	public void testProcessAnnotations_Class_AnnotationsGetAllTests_EncodeSlash()
-			throws Exception {
-		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(),
-				false);
-
-		Method method = TestTemplate_Class_Annotations.class
-				.getDeclaredMethod("getAllTests", String.class);
-		MethodMetadata data = contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/prepend/{classId}");
-
-		assertThat(data.template().decodeSlash()).isFalse();
-	}
-
 	@Test
 	public void testProcessAnnotations_ExtendedInterface() throws Exception {
 		Method extendedMethod = TestTemplate_Extended.class.getMethod("getAllTests",
@@ -249,27 +228,6 @@ public class SpringMvcContractTests {
 		assertThat(data.template().decodeSlash()).isTrue();
 	}
 
-	@Test
-	public void testProcessAnnotations_ExtendedInterface_EncodeSlash() throws Exception {
-		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(),
-				false);
-
-		Method extendedMethod = TestTemplate_Extended.class.getMethod("getAllTests",
-				String.class);
-		MethodMetadata extendedData = contract.parseAndValidateMetadata(
-				extendedMethod.getDeclaringClass(), extendedMethod);
-
-		Method method = TestTemplate_Class_Annotations.class
-				.getDeclaredMethod("getAllTests", String.class);
-		MethodMetadata data = contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo(extendedData.template().url());
-		assertThat(data.template().method()).isEqualTo(extendedData.template().method());
-
-		assertThat(data.template().decodeSlash()).isFalse();
-	}
-
 	@Test
 	public void testProcessAnnotations_SimplePost() throws Exception {
 		Method method = TestTemplate_Simple.class.getDeclaredMethod("postTest",
@@ -305,8 +263,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-				.isEqualTo("/advanced/test/{id}?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -341,8 +298,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-				.isEqualTo("/advanced/test/{id}?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -366,8 +322,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-				.isEqualTo("/advanced/test2?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test2?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -429,7 +384,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url()).isEqualTo("/advanced");
+		assertThat(data.template().url()).isEqualTo("/");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -539,7 +494,7 @@ public class SpringMvcContractTests {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-				.isEqualTo("/advanced/testfallback/{id}?amount=" + "{amount}");
+				.isEqualTo("/testfallback/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -708,6 +663,14 @@ public class SpringMvcContractTests {
 	}
 
 	@RequestMapping("/prepend/{classId}")
+	public interface TestTemplate_Class_RequestMapping {
+
+		@RequestMapping(value = "/test/{testId}", method = RequestMethod.GET)
+		TestObject getSpecificTest(@PathVariable("classId") String classId,
+				@PathVariable("testId") String testId);
+
+	}
+
 	public interface TestTemplate_Class_Annotations {
 
 		@RequestMapping(value = "/test/{testId}", method = RequestMethod.GET)
@@ -812,7 +775,6 @@ public class SpringMvcContractTests {
 	}
 
 	@JsonAutoDetect
-	@RequestMapping("/advanced")
 	public interface TestTemplate_Advanced {
 
 		@CollectionFormat(SSV)

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

@@ -181,7 +181,7 @@ public class FeignClientTests {
 	public void testClient() {
 		assertThat(testClient).as("testClient was null").isNotNull();
 		assertThat(Proxy.isProxyClass(testClient.getClass()))
-			.as("testClient is not a java Proxy").isTrue();
+				.as("testClient is not a java Proxy").isTrue();
 		InvocationHandler invocationHandler = Proxy.getInvocationHandler(testClient);
 		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
 	}
@@ -198,7 +198,7 @@ public class FeignClientTests {
 		Hello hello = testClient.getHello();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -219,9 +219,9 @@ public class FeignClientTests {
 		List<String> headers = testClient.getHelloHeaders();
 		assertThat(headers).as("headers was null").isNotNull();
 		assertThat(headers.contains("myheader1value"))
-			.as("headers didn't contain myheader1value").isTrue();
+				.as("headers didn't contain myheader1value").isTrue();
 		assertThat(headers.contains("myheader2value"))
-			.as("headers didn't contain myheader2value").isTrue();
+				.as("headers didn't contain myheader2value").isTrue();
 	}
 
 	@Test
@@ -241,12 +241,11 @@ public class FeignClientTests {
 
 	@Test
 	public void testServiceId() {
-		assertThat(testClientServiceId).as("testClientServiceId was null")
-			.isNotNull();
+		assertThat(testClientServiceId).as("testClientServiceId was null").isNotNull();
 		final Hello hello = testClientServiceId.getHello();
 		assertThat(hello).as("The hello response was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -260,7 +259,7 @@ public class FeignClientTests {
 	@Test
 	public void testFormattedParams() {
 		List<LocalDate> list = Arrays.asList(LocalDate.of(2001, 1, 1),
-			LocalDate.of(2018, 6, 10));
+				LocalDate.of(2018, 6, 10));
 		List<LocalDate> params = testClient.getFormattedParams(list);
 		assertThat(params).as("params was null").isNotNull();
 		assertThat(params).as("params not converted correctly").isEqualTo(list);
@@ -271,13 +270,13 @@ public class FeignClientTests {
 		HystrixCommand<List<Hello>> command = testClient.getHellosHystrix();
 		assertThat(command).as("command was null").isNotNull();
 		assertThat(command.getCommandGroup().name()).as(
-			"Hystrix command group name should match the name of the feign client")
-			.isEqualTo("localapp");
+				"Hystrix command group name should match the name of the feign client")
+				.isEqualTo("localapp");
 		String configKey = Feign.configKey(TestClient.class,
-			TestClient.class.getMethod("getHellosHystrix", (Class<?>[]) null));
+				TestClient.class.getMethod("getHellosHystrix", (Class<?>[]) null));
 		assertThat(command.getCommandKey().name())
-			.as("Hystrix command key name should match the feign config key")
-			.isEqualTo(configKey);
+				.as("Hystrix command key name should match the feign config key")
+				.isEqualTo(configKey);
 		List<Hello> hellos = command.execute();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
@@ -290,7 +289,7 @@ public class FeignClientTests {
 		Hello hello = single.toBlocking().value();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -298,7 +297,7 @@ public class FeignClientTests {
 		ResponseEntity<Void> response = testClient.noContent();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.NO_CONTENT);
+				.isEqualTo(HttpStatus.NO_CONTENT);
 	}
 
 	@Test
@@ -306,7 +305,7 @@ public class FeignClientTests {
 		ResponseEntity<Void> response = testClient.head();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.OK);
+				.isEqualTo(HttpStatus.OK);
 	}
 
 	@Test
@@ -316,7 +315,7 @@ public class FeignClientTests {
 		Hello hello = entity.getBody();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -324,7 +323,7 @@ public class FeignClientTests {
 		String response = testClient.moreComplexContentType("{\"value\":\"OK\"}");
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response).as("didn't respond with {\"value\":\"OK\"}")
-			.isEqualTo("{\"value\":\"OK\"}");
+				.isEqualTo("{\"value\":\"OK\"}");
 	}
 
 	@Test
@@ -332,7 +331,7 @@ public class FeignClientTests {
 		ResponseEntity<String> response = decodingTestClient.notFound();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.NOT_FOUND);
+				.isEqualTo(HttpStatus.NOT_FOUND);
 		assertThat(response.getBody()).as("response body was not null").isNull();
 	}
 
@@ -371,7 +370,7 @@ public class FeignClientTests {
 		Hello hello = single.toBlocking().value();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbacksingle");
+				.isEqualTo("fallbacksingle");
 	}
 
 	@Test
@@ -381,7 +380,7 @@ public class FeignClientTests {
 		Hello hello = command.execute();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackcommand");
+				.isEqualTo("fallbackcommand");
 	}
 
 	@Test
@@ -391,7 +390,7 @@ public class FeignClientTests {
 		Hello hello = observable.toBlocking().first();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackobservable");
+				.isEqualTo("fallbackobservable");
 	}
 
 	@Test
@@ -401,7 +400,7 @@ public class FeignClientTests {
 		Hello hello = future.get(1, TimeUnit.SECONDS);
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackfuture");
+				.isEqualTo("fallbackfuture");
 	}
 
 	@Test
@@ -410,8 +409,8 @@ public class FeignClientTests {
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("hello#message was null").isNotNull();
 		assertThat(hello.getMessage().contains("500")).as(
-			"hello#message did not contain the cause (status code) of the fallback invocation")
-			.isTrue();
+				"hello#message did not contain the cause (status code) of the fallback invocation")
+				.isTrue();
 	}
 
 	@Test(expected = HystrixRuntimeException.class)
@@ -439,17 +438,17 @@ public class FeignClientTests {
 	@Test
 	public void testHystrixSetterFactory() {
 		HystrixCommand<List<Hello>> command = hystrixSetterFactoryClient
-			.getHellosHystrix();
+				.getHellosHystrix();
 		assertThat(command).as("command was null").isNotNull();
 		String setterPrefix = TestHystrixSetterFactoryClientConfig.SETTER_PREFIX;
 		assertThat(command.getCommandGroup().name()).as(
-			"Hystrix command group name should match the name of the feign client with a prefix of "
-				+ setterPrefix)
-			.isEqualTo(setterPrefix + "localapp5");
+				"Hystrix command group name should match the name of the feign client with a prefix of "
+						+ setterPrefix)
+				.isEqualTo(setterPrefix + "localapp5");
 		assertThat(command.getCommandKey().name()).as(
-			"Hystrix command key name should match the request method (space) request path with a prefix of "
-				+ setterPrefix)
-			.isEqualTo(setterPrefix + "GET /hellos");
+				"Hystrix command key name should match the request method (space) request path with a prefix of "
+						+ setterPrefix)
+				.isEqualTo(setterPrefix + "GET /hellos");
 		List<Hello> hellos = command.execute();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
@@ -481,8 +480,7 @@ public class FeignClientTests {
 		Hello pojo2 = new Hello(OI_TERRA_2);
 		MockMultipartFile file = new MockMultipartFile("file", "hello.bin", null,
 				"hello".getBytes());
-		String response = multipartClient.multipartPojo("abc", "123", pojo1, pojo2,
-				file);
+		String response = multipartClient.multipartPojo("abc", "123", pojo1, pojo2, file);
 		assertThat(response).isEqualTo("abc123hello world 1oi terra 2hello.bin");
 	}
 
@@ -507,9 +505,8 @@ public class FeignClientTests {
 				"hello".getBytes());
 		MockMultipartFile file2 = new MockMultipartFile("file2", "hello2.bin", null,
 				"hello".getBytes());
-		String response = multipartClient
-				.requestPartListOfPojosAndListOfMultipartFiles(
-						Arrays.asList(pojo1, pojo2), Arrays.asList(file1, file2));
+		String response = multipartClient.requestPartListOfPojosAndListOfMultipartFiles(
+				Arrays.asList(pojo1, pojo2), Arrays.asList(file1, file2));
 		assertThat(response).isEqualTo("hello world 1oi terra 2hello1.binhello2.bin");
 	}
 
@@ -624,7 +621,7 @@ public class FeignClientTests {
 		String getToString(@RequestParam("arg") Arg arg);
 
 		@PostMapping(path = "/form-urlencoded",
-			consumes = APPLICATION_FORM_URLENCODED_VALUE)
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
 		Hello postFormUrlEncoded(Hello hello);
 
 		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
@@ -824,8 +821,7 @@ public class FeignClientTests {
 		public HystrixClientWithFallBackFactory create(final Throwable cause) {
 			return () -> {
 				assertThat(cause).isNotNull().as("Cause was null");
-				return new Hello(
-					"Hello from the fallback side: " + cause.getMessage());
+				return new Hello("Hello from the fallback side: " + cause.getMessage());
 			};
 		}
 
@@ -888,12 +884,12 @@ public class FeignClientTests {
 			return (target, method) -> {
 				String groupKey = SETTER_PREFIX + target.name();
 				RequestMapping requestMapping = method
-					.getAnnotation(RequestMapping.class);
+						.getAnnotation(RequestMapping.class);
 				String commandKey = SETTER_PREFIX + requestMapping.method()[0] + " "
-					+ requestMapping.path()[0];
+						+ requestMapping.path()[0];
 				return HystrixCommand.Setter
-					.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey))
-					.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey));
+						.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey))
+						.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey));
 			};
 		}
 
@@ -1161,7 +1157,7 @@ public class FeignClientTests {
 		}
 
 		@PostMapping(path = "/form-urlencoded",
-			consumes = APPLICATION_FORM_URLENCODED_VALUE)
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
 		Hello postFormUrlEncoded(Hello hello) {
 			return hello;
 		}

spring-cloud-openfeign-dependencies/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.5.BUILD-SNAPSHOT</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.9.BUILD-SNAPSHOT</version>
+	<version>2.2.10.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>

spring-cloud-starter-openfeign/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.10.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>