Merge remote-tracking branch 'origin/v1.7.x' into v1.7.x

TarsCloud · Oct 30, 2022 · 30020e7 · 30020e7
2 parents 7c7949b + dbb5d52
commit 30020e7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -19,7 +19,7 @@
         <brave-opentracing.version>0.31.1</brave-opentracing.version>
         <zipkin-reporter.version>2.7.4</zipkin-reporter.version>
         <ch.qos.logback.version>1.2.3</ch.qos.logback.version>
-        <gson.version>2.8.6</gson.version>
+        <gson.version>2.8.9</gson.version>
     </properties>
 
     <dependencies>

diff --git a/.../tars-spring-boot-starter/src/main/java/com/qq/tars/server/apps/SpringBootAppContext.java b/.../tars-spring-boot-starter/src/main/java/com/qq/tars/server/apps/SpringBootAppContext.java
@@ -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;
 
@@ -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.");
         }

diff --git a/...ing-boot-starter/src/main/java/com/qq/tars/spring/bean/CommunicatorBeanPostProcessor.java b/...ing-boot-starter/src/main/java/com/qq/tars/spring/bean/CommunicatorBeanPostProcessor.java
@@ -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;
@@ -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;
             }

diff --git a/...g/tars-spring-cloud-starter/src/main/java/com/qq/tars/server/apps/TarsStartLifecycle.java b/...g/tars-spring-cloud-starter/src/main/java/com/qq/tars/server/apps/TarsStartLifecycle.java
@@ -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;
@@ -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.");
         }

diff --git a/...ring-cloud-starter/src/main/java/com/qq/tars/spring/bean/TarsClientBeanPostProcessor.java b/...ring-cloud-starter/src/main/java/com/qq/tars/spring/bean/TarsClientBeanPostProcessor.java
@@ -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;
@@ -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;
             }