Merge pull request #1586 from Infrag/master

* pull1586:
  Adds composed @RequestMapping annotations support

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

@@ -156,7 +156,8 @@ public class SpringMvcContract extends Contract.BaseContract
 	@Override
 	protected void processAnnotationOnMethod(MethodMetadata data,
 			Annotation methodAnnotation, Method method) {
-		if (!(methodAnnotation instanceof RequestMapping)) {
+		if (!RequestMapping.class.isInstance(methodAnnotation) && !methodAnnotation
+				.annotationType().isAnnotationPresent(RequestMapping.class)) {
 			return;
 		}
 

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

@@ -48,6 +48,8 @@ import feign.MethodMetadata;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * @author chadjaros
@@ -101,6 +103,21 @@ public class SpringMvcContractTests {
 		assertEquals("id", data.indexToName().get(0).iterator().next());
 	}
 
+	@Test
+	public void testProcessAnnotations_SimpleGetMapping() throws Exception {
+		Method method = TestTemplate_Simple.class.getDeclaredMethod("getMappingTest",
+				String.class);
+		MethodMetadata data = this.contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertEquals("/test/{id}", data.template().url());
+		assertEquals("GET", data.template().method());
+		assertEquals(MediaType.APPLICATION_JSON_VALUE,
+				data.template().headers().get("Accept").iterator().next());
+
+		assertEquals("id", data.indexToName().get(0).iterator().next());
+	}
+
 	@Test
 	public void testProcessAnnotations_Class_AnnotationsGetSpecificTest()
 			throws Exception {
@@ -162,6 +179,20 @@ public class SpringMvcContractTests {
 
 	}
 
+	@Test
+	public void testProcessAnnotations_SimplePostMapping() throws Exception {
+		Method method = TestTemplate_Simple.class.getDeclaredMethod("postMappingTest",
+				TestObject.class);
+		MethodMetadata data = this.contract
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
+
+		assertEquals("", data.template().url());
+		assertEquals("POST", data.template().method());
+		assertEquals(MediaType.APPLICATION_JSON_VALUE,
+				data.template().headers().get("Accept").iterator().next());
+
+	}
+
 	@Test
 	public void testProcessAnnotationsOnMethod_Advanced() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest",
@@ -392,8 +423,14 @@ public class SpringMvcContractTests {
 		@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)
 		TestObject postTest(@RequestBody TestObject object);
+
+		@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+		TestObject postMappingTest(@RequestBody TestObject object);
 	}
 
 	@RequestMapping("/prepend/{classId}")
@@ -457,7 +494,7 @@ public class SpringMvcContractTests {
 		@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)
 		ResponseEntity<TestObject> getTest2(
 				@RequestHeader(name = "Authorization") String auth,