Fix spring-cloudgh-547

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

@@ -27,6 +27,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import feign.Request;
@@ -49,6 +50,7 @@
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
@@ -57,6 +59,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * @author Spencer Gibb
@@ -193,6 +196,12 @@ public void registerFeignClients(AnnotationMetadata metadata, BeanDefinitionRegi
 				AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
 				Assert.isTrue(annotationMetadata.isInterface(), "@FeignClient can only be specified on an interface");
 
+				Class<?> beanClass = ClassUtils.resolveClassName(
+						Objects.requireNonNull(beanDefinition.getBeanClassName()),
+						Thread.currentThread().getContextClassLoader());
+				Assert.isTrue(Objects.isNull(AnnotationUtils.findAnnotation(beanClass, RequestMapping.class)),
+						"@FeignClient can't annotated with @RequestMapping");
+
 				Map<String, Object> attributes = annotationMetadata
 						.getAnnotationAttributes(FeignClient.class.getCanonicalName());
 

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

@@ -26,9 +26,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Spencer Gibb
@@ -101,6 +103,20 @@ public void shouldPassSubLevelFeignClient() {
 				.doesNotThrowAnyException();
 	}
 
+	@Test
+	public void testChildRequestMappingAnnotation() {
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> new AnnotationConfigApplicationContext(ChildRequestMappingTestConfig.class))
+				.withMessage("@FeignClient can't annotated with @RequestMapping");
+	}
+
+	@Test
+	public void testRequestMappingAnnotation() {
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> new AnnotationConfigApplicationContext(RequestMappingTestConfig.class))
+				.withMessage("@FeignClient can't annotated with @RequestMapping");
+	}
+
 	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
 	protected interface FallbackClient {
 
@@ -118,6 +134,22 @@ protected interface FallbackFactoryClient {
 
 	}
 
+	@RequestMapping
+	protected interface ParentRequestMappingClient {
+
+	}
+
+	@FeignClient(name = "childRequestMappingClient")
+	protected interface ChildRequestMappingClient extends ParentRequestMappingClient {
+
+	}
+
+	@FeignClient(name = "requestMappingClient")
+	@RequestMapping
+	protected interface RequestMappingClient {
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
@@ -138,4 +170,18 @@ protected static class TopLevelSubLevelTestConfig {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@EnableFeignClients(clients = { FeignClientsRegistrarTests.ChildRequestMappingClient.class })
+	protected static class ChildRequestMappingTestConfig {
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@EnableAutoConfiguration
+	@EnableFeignClients(clients = { FeignClientsRegistrarTests.RequestMappingClient.class })
+	protected static class RequestMappingTestConfig {
+
+	}
+
 }