Add missing author tags. Refactor.

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

@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import feign.RequestTemplate;
@@ -48,6 +49,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHeaders;
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;
+import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
+import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
+import static org.springframework.http.MediaType.MULTIPART_MIXED;
+import static org.springframework.http.MediaType.MULTIPART_RELATED;
 
 /**
  * @author Spencer Gibb
@@ -56,6 +61,7 @@ import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHead
  * @author Aaron Whiteside
  * @author Darren Foong
  * @author Olga Maciaszek-Sharma
+ * @author Can Bezmen
  */
 @SuppressWarnings("rawtypes")
 public class SpringEncoder implements Encoder {
@@ -229,13 +235,12 @@ public class SpringEncoder implements Encoder {
 	}
 
 	private boolean isMultipartType(MediaType requestContentType) {
-		return Arrays.asList(MediaType.MULTIPART_FORM_DATA, MediaType.MULTIPART_MIXED,
-				MediaType.MULTIPART_RELATED).contains(requestContentType);
+		return Arrays.asList(MULTIPART_FORM_DATA, MULTIPART_MIXED, MULTIPART_RELATED)
+				.contains(requestContentType);
 	}
 
 	private boolean isFormUrlEncoded(MediaType requestContentType) {
-		return Arrays.asList(MediaType.APPLICATION_FORM_URLENCODED)
-				.contains(requestContentType);
+		return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType);
 	}
 
 	private boolean binaryContentType(FeignOutputMessage outputMessage) {

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

@@ -69,6 +69,7 @@ import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
  * @author Ahmad Mozafarnia
+ * @author Can Bezmen
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringEncoderTests.Application.class,
@@ -195,7 +196,7 @@ public class SpringEncoderTests {
 
 	@Test
 	public void testFromURLEncodedValue() {
-		Encoder encoder = context.getInstance("can", Encoder.class);
+		Encoder encoder = context.getInstance("formUrlEncoded", Encoder.class);
 		assertThat(encoder).isNotNull();
 		RequestTemplate request = new RequestTemplate();
 		request.header(CONTENT_TYPE, APPLICATION_FORM_URLENCODED_VALUE);

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

@@ -91,6 +91,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -102,6 +103,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
 
 /**
  * @author Spencer Gibb
@@ -110,6 +112,7 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf;
  * @author Halvdan Hoem Grelland
  * @author Aaron Whiteside
  * @author Darren Foong
+ * @author Can Bezmen
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = FeignClientTests.Application.class,
@@ -426,7 +429,7 @@ public class FeignClientTests {
 	@Test
 	public void testFormURLEncoded() {
 		Hello hello = new Hello(HELLO_WORLD_1);
-		Hello response = testClient.getFormUrlEncoded(hello);
+		Hello response = testClient.postToUrlEncoded(hello);
 		assertThat(response).isEqualTo(hello);
 	}
 
@@ -622,9 +625,9 @@ 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);
+		@PostMapping(path = "/form-urlencoded",
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
+		Hello postToUrlEncoded(Hello hello);
 
 		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
 		String getToString(@RequestParam("arg") OtherArg arg);
@@ -1165,9 +1168,9 @@ public class FeignClientTests {
 			return result.toString();
 		}
 
-		@RequestMapping(method = RequestMethod.POST, path = "/form-urlencoded",
-				consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-		Hello getFormUrlEncoded(Hello hello) {
+		@PostMapping(path = "/form-urlencoded",
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
+		Hello postToFormUrlEncoded(Hello hello) {
 			return hello;
 		}