From 371f8b3bf2c9fb40daccb476018e94d96d515b47 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 27 Jul 2015 12:05:11 -0600 Subject: [PATCH] feign polishing --- .../cloud/netflix/feign/FeignClientsRegistrar.java | 2 ++ .../cloud/netflix/feign/support/SpringMvcContract.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java index ca1704d4..66910602 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; +import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.support.BeanDefinitionRegistry; @@ -105,6 +106,7 @@ public class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, definition.addPropertyValue("url", getUrl(attributes)); definition.addPropertyValue("name", getServiceId(attributes)); definition.addPropertyValue("type", className); + definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); String beanName = StringUtils.uncapitalize(className.substring(className .lastIndexOf(".") + 1)); diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java index c7f4a631..e684a87c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java @@ -42,10 +42,10 @@ public class SpringMvcContract extends Contract.BaseContract { private static final String CONTENT_TYPE = "Content-Type"; @Override - public MethodMetadata parseAndValidatateMetadata(Method method) { - MethodMetadata md = super.parseAndValidatateMetadata(method); + protected MethodMetadata parseAndValidateMetadata(Class targetType, Method method) { + MethodMetadata md = super.parseAndValidateMetadata(targetType, method); - RequestMapping classAnnotation = method.getDeclaringClass().getAnnotation(RequestMapping.class); + RequestMapping classAnnotation = targetType.getAnnotation(RequestMapping.class); if (classAnnotation != null) { // Prepend path from class annotation if specified if (classAnnotation.value().length > 0) {