Skip to content

[ISSUE #198] support spring @AliasFor extend #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimmyYu merged 1 commit into from
Oct 1, 2022
Merged

[ISSUE #198] support spring @AliasFor extend #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../tars-spring-boot-starter/src/main/java/com/qq/tars/server/apps/SpringBootAppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.qq.tars.spring.annotation.TarsServant;
import org.springframework.aop.framework.Advised;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.AnnotatedElementUtils;

import java.util.Map;

Expand Down Expand Up @@ -93,7 +93,7 @@ private ServantHomeSkeleton loadServant(Object bean) throws Exception {

ServerConfig serverCfg = ConfigurationManager.getInstance().getServerConfig();

homeName = AnnotationUtils.getAnnotation(bean.getClass(), TarsServant.class).name();
homeName = AnnotatedElementUtils.findMergedAnnotation(bean.getClass(), TarsServant.class).name();
if (StringUtils.isEmpty(homeName)) {
throw new RuntimeException("servant name is null.");
}
Expand Down
4 changes: 2 additions & 2 deletions ...ing-boot-starter/src/main/java/com/qq/tars/spring/bean/CommunicatorBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.qq.tars.spring.annotation.TarsClient;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.ReflectionUtils;

import java.lang.reflect.Field;
Expand All @@ -51,7 +51,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw

private void processFields(Object bean, Field[] declaredFields) {
for (Field field : declaredFields) {
TarsClient annotation = AnnotationUtils.getAnnotation(field, TarsClient.class);
TarsClient annotation = AnnotatedElementUtils.findMergedAnnotation(field, TarsClient.class);
if (annotation == null) {
continue;
}
Expand Down
3 changes: 2 additions & 1 deletion ...g/tars-spring-cloud-starter/src/main/java/com/qq/tars/server/apps/TarsStartLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.SmartLifecycle;
import org.springframework.core.annotation.AnnotatedElementUtils;

import java.io.IOException;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -152,7 +153,7 @@ private ServantHomeSkeleton loadServant(Object bean) throws Exception {

ServerConfig serverCfg = ConfigurationManager.getInstance().getServerConfig();

homeName = bean.getClass().getAnnotation(TarsServant.class).name();
homeName = AnnotatedElementUtils.findMergedAnnotation(bean.getClass(), TarsServant.class).name();
if (StringUtils.isEmpty(homeName)) {
throw new RuntimeException("servant name is null.");
}
Expand Down
4 changes: 2 additions & 2 deletions ...ring-cloud-starter/src/main/java/com/qq/tars/spring/bean/TarsClientBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.ReflectionUtils;

import java.lang.reflect.Field;
Expand Down Expand Up @@ -75,7 +75,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw

private void processFields(Object bean, Field[] declaredFields) {
for (Field field : declaredFields) {
TarsClient annotation = AnnotationUtils.getAnnotation(field, TarsClient.class);
TarsClient annotation = AnnotatedElementUtils.findMergedAnnotation(field, TarsClient.class);
if (annotation == null) {
continue;
}
Expand Down