Issue #549

* Fixed: Form URL Encoded bug fixed.

Fixes gh-549.

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

@@ -76,7 +76,8 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 		Map<String, Object> paramMap = (Map) object;
 
 		return paramMap.keySet().stream().filter(key -> paramMap.get(key) != null)
-				.map(key -> ";" + key + "=" + paramMap.get(key).toString()).collect(Collectors.joining());
+				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
+				.collect(Collectors.joining());
 	}
 
 }

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

@@ -99,8 +99,8 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}
 
-			if (isMultipartType(requestContentType)) {
-				this.springFormEncoder.encode(requestBody, bodyType, request);
+			if (isFormRelatedContentType(requestContentType)) {
+				springFormEncoder.encode(requestBody, bodyType, request);
 				return;
 			}
 			else {
@@ -117,7 +117,7 @@ public class SpringEncoder implements Encoder {
 
 	private void encodeWithMessageConverter(Object requestBody, Type bodyType,
 			RequestTemplate request, MediaType requestContentType) {
-		for (HttpMessageConverter messageConverter : this.messageConverters.getObject()
+		for (HttpMessageConverter messageConverter : messageConverters.getObject()
 				.getConverters()) {
 			FeignOutputMessage outputMessage;
 			try {
@@ -223,11 +223,21 @@ public class SpringEncoder implements Encoder {
 		}
 	}
 
+	private boolean isFormRelatedContentType(MediaType requestContentType) {
+		return isMultipartType(requestContentType)
+				|| isFormUrlEncoded(requestContentType);
+	}
+
 	private boolean isMultipartType(MediaType requestContentType) {
 		return Arrays.asList(MediaType.MULTIPART_FORM_DATA, MediaType.MULTIPART_MIXED,
 				MediaType.MULTIPART_RELATED).contains(requestContentType);
 	}
 
+	private boolean isFormUrlEncoded(MediaType requestContentType) {
+		return Arrays.asList(MediaType.APPLICATION_FORM_URLENCODED)
+				.contains(requestContentType);
+	}
+
 	private boolean binaryContentType(FeignOutputMessage outputMessage) {
 		MediaType contentType = outputMessage.getHeaders().getContentType();
 		return contentType == null || Stream
@@ -244,21 +254,21 @@ public class SpringEncoder implements Encoder {
 		private final HttpHeaders httpHeaders;
 
 		private FeignOutputMessage(RequestTemplate request) {
-			this.httpHeaders = getHttpHeaders(request.headers());
+			httpHeaders = getHttpHeaders(request.headers());
 		}
 
 		@Override
 		public OutputStream getBody() throws IOException {
-			return this.outputStream;
+			return outputStream;
 		}
 
 		@Override
 		public HttpHeaders getHeaders() {
-			return this.httpHeaders;
+			return httpHeaders;
 		}
 
 		public ByteArrayOutputStream getOutputStream() {
-			return this.outputStream;
+			return outputStream;
 		}
 
 	}

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

@@ -60,6 +60,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.HttpHeaders.ACCEPT;
 import static org.springframework.http.HttpHeaders.CONTENT_LENGTH;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
+import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
 import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
 import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
@@ -192,6 +193,18 @@ public class SpringEncoderTests {
 				.as("Body content cannot be decoded").contains("hi");
 	}
 
+	@Test
+	public void testFromURLEncodedValue() {
+		Encoder encoder = context.getInstance("can", Encoder.class);
+		assertThat(encoder).isNotNull();
+		RequestTemplate request = new RequestTemplate();
+		request.header(CONTENT_TYPE, APPLICATION_FORM_URLENCODED_VALUE);
+		String body = "test";
+		encoder.encode(body, String.class, request);
+		assertThat(new String(request.requestBody().asBytes()))
+				.as("Body content cannot be decoded").contains(body);
+	}
+
 	@Test
 	public void testNoCharsetForBinaryFiles() {
 		Encoder encoder = context.getInstance("test", Encoder.class);

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

@@ -423,6 +423,13 @@ public class FeignClientTests {
 		this.nullHystrixClientWithFallBackFactory.fail();
 	}
 
+	@Test
+	public void testFormURLEncoded() {
+		Hello hello = new Hello(HELLO_WORLD_1);
+		Hello response = testClient.getFormUrlEncoded(hello);
+		assertThat(response).isEqualTo(hello);
+	}
+
 	@Test
 	public void namedFeignClientWorks() {
 		assertThat(this.namedHystrixClient).as("namedHystrixClient was null").isNotNull();
@@ -615,6 +622,10 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/tostring")
 		String getToString(@RequestParam("arg") Arg arg);
 
+		@RequestMapping(method = RequestMethod.POST, path = "/form-urlencoded",
+				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		Hello getFormUrlEncoded(Hello hello);
+
 		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
 		String getToString(@RequestParam("arg") OtherArg arg);
 
@@ -1154,6 +1165,12 @@ public class FeignClientTests {
 			return result.toString();
 		}
 
+		@RequestMapping(method = RequestMethod.POST, path = "/form-urlencoded",
+				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+		Hello getFormUrlEncoded(Hello hello) {
+			return hello;
+		}
+
 	}
 
 	public static class Hello {