Merge branch 'develop' into develop_22_08_15

changes/en-us/develop.md

@@ -5,6 +5,7 @@ Add changes here for all PR submitted to the develop branch.
 ### feature:
 - [[#4802](https://github.com/seata/seata/pull/4802)] dockerfile support arm64
 - [[#4649](https://github.com/seata/seata/pull/4649)] seata-server support multiple registry
+- [[#4479](https://github.com/seata/seata/pull/4479)] TCC mode supports tcc annotation marked on both interface and implementation class
 
 
 ### bugfix:
@@ -38,5 +39,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [liujunlin5168](https://github.com/liujunlin5168)
 - [pengten](https://github.com/pengten)
 - [liuqiufeng](https://github.com/liuqiufeng)
+- [yujianfei1986](https://github.com/yujianfei1986)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/develop.md

@@ -5,6 +5,7 @@
 ### feature：
 - [[#4802](https://github.com/seata/seata/pull/4802)] dockerfile 支持 arm64
 - [[#4649](https://github.com/seata/seata/pull/4649)] seata-server支持多注册中心
+- [[#4479](https://github.com/seata/seata/pull/4479)] TCC注解支持添加在实现类及其方法上也生效
 
 
 ### bugfix：
@@ -38,5 +39,6 @@
 - [liujunlin5168](https://github.com/liujunlin5168)
 - [pengten](https://github.com/pengten)
 - [liuqiufeng](https://github.com/liuqiufeng)
+- [yujianfei1986](https://github.com/yujianfei1986)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java

@@ -120,25 +120,25 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
      * @return the action interface method
      */
     protected Method getActionInterfaceMethod(MethodInvocation invocation) {
-        Class<?> interfaceType = null;
+        Class<?> serviceType = null;
         try {
             if (remotingDesc == null) {
-                interfaceType = getProxyInterface(invocation.getThis());
+                serviceType = getProxyInterface(invocation.getThis());
             } else {
-                interfaceType = remotingDesc.getInterfaceClass();
+                serviceType = remotingDesc.getServiceClass();
             }
-            if (interfaceType == null && remotingDesc != null && remotingDesc.getInterfaceClassName() != null) {
-                interfaceType = Class.forName(remotingDesc.getInterfaceClassName(), true,
+            if (serviceType == null && remotingDesc != null && remotingDesc.getServiceClassName() != null) {
+                serviceType = Class.forName(remotingDesc.getServiceClassName(), true,
                     Thread.currentThread().getContextClassLoader());
             }
-            if (interfaceType == null) {
+            if (serviceType == null) {
                 return invocation.getMethod();
             }
-            return interfaceType.getMethod(invocation.getMethod().getName(),
+            return serviceType.getMethod(invocation.getMethod().getName(),
                 invocation.getMethod().getParameterTypes());
         } catch (NoSuchMethodException e) {
-            if (interfaceType != null && !"toString".equals(invocation.getMethod().getName())) {
-                LOGGER.warn("no such method '{}' from interface {}", invocation.getMethod().getName(), interfaceType.getName());
+            if (serviceType != null && !"toString".equals(invocation.getMethod().getName())) {
+                LOGGER.warn("no such method '{}' from interface {}", invocation.getMethod().getName(), serviceType.getName());
             }
             return invocation.getMethod();
         } catch (Exception e) {

spring/src/main/java/io/seata/spring/tcc/TccAnnotationProcessor.java

@@ -90,21 +90,21 @@ protected void process(Object bean, String beanName, Class<? extends Annotation>
      * @param bean           the bean
      * @param beanName       the bean name
      * @param field          the field
-     * @param interfaceClass the interface class
+     * @param serviceClass   the serviceClass
      * @throws IllegalAccessException the illegal access exception
      */
-    public void addTccAdvise(Object bean, String beanName, Field field, Class interfaceClass) throws IllegalAccessException {
+    public void addTccAdvise(Object bean, String beanName, Field field, Class serviceClass) throws IllegalAccessException {
         Object fieldValue = field.get(bean);
         if (fieldValue == null) {
             return;
         }
         for (Method method : field.getType().getMethods()) {
             if (!Modifier.isStatic(method.getModifiers()) && (method.isAnnotationPresent(TwoPhaseBusinessAction.class))) {
                 RemotingDesc remotingDesc = new RemotingDesc();
-                remotingDesc.setInterfaceClass(interfaceClass);
+                remotingDesc.setServiceClass(serviceClass);
 
                 TccActionInterceptor actionInterceptor = new TccActionInterceptor(remotingDesc);
-                Object proxyBean = TCCBeanParserUtils.createProxy(interfaceClass, fieldValue, actionInterceptor);
+                Object proxyBean = TCCBeanParserUtils.createProxy(serviceClass, fieldValue, actionInterceptor);
                 field.setAccessible(true);
                 field.set(bean, proxyBean);
                 LOGGER.info("Bean[" + bean.getClass().getName() + "] with name [" + field.getName() + "] would use proxy [" + actionInterceptor.getClass().getName() + "]");

spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java

@@ -113,8 +113,8 @@ public static boolean isTccProxyTargetBean(RemotingDesc remotingDesc) {
         }
         //check if it is TCC bean
         boolean isTccClazz = false;
-        Class<?> tccInterfaceClazz = remotingDesc.getInterfaceClass();
-        Method[] methods = tccInterfaceClazz.getMethods();
+        Class<?> tccServiceClazz = remotingDesc.getServiceClass();
+        Method[] methods = tccServiceClazz.getMethods();
         TwoPhaseBusinessAction twoPhaseBusinessAction;
         for (Method method : methods) {
             twoPhaseBusinessAction = method.getAnnotation(TwoPhaseBusinessAction.class);
@@ -151,8 +151,8 @@ public static void initTccFenceCleanTask(RemotingDesc remotingDesc, ApplicationC
             if (tccFenceConfig == null || tccFenceConfig.getInitialized().get()) {
                 return;
             }
-            Class<?> tccInterfaceClazz = remotingDesc.getInterfaceClass();
-            Method[] methods = tccInterfaceClazz.getMethods();
+            Class<?> tccServiceClazz = remotingDesc.getServiceClass();
+            Method[] methods = tccServiceClazz.getMethods();
             for (Method method : methods) {
                 TwoPhaseBusinessAction twoPhaseBusinessAction = method.getAnnotation(TwoPhaseBusinessAction.class);
                 if (twoPhaseBusinessAction != null && twoPhaseBusinessAction.useTCCFence()) {

tcc/pom.xml

@@ -40,6 +40,10 @@
             <artifactId>seata-rm</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -49,6 +53,4 @@
             <artifactId>fastjson</artifactId>
         </dependency>
     </dependencies>
-
-
 </project>

tcc/src/main/java/io/seata/rm/tcc/remoting/RemotingDesc.java

@@ -33,14 +33,14 @@ public class RemotingDesc {
     private Object targetBean;
 
     /**
-     * the tcc interface tyep
+     * the tcc serviceClass type
      */
-    private Class<?> interfaceClass;
+    private Class<?> serviceClass;
 
     /**
-     * interface class name
+     * serviceClass name
      */
-    private String interfaceClassName;
+    private String serviceClassName;
 
     /**
      * rpc uniqueId: hsf, dubbo's version, sofa-rpc's uniqueId
@@ -76,39 +76,39 @@ public void setTargetBean(Object targetBean) {
     }
 
     /**
-     * Gets interface class.
+     * Gets serviceClass.
      *
-     * @return the interface class
+     * @return the serviceClass
      */
-    public Class<?> getInterfaceClass() {
-        return interfaceClass;
+    public Class<?> getServiceClass() {
+        return serviceClass;
     }
 
     /**
-     * Sets interface class.
+     * Sets serviceClass.
      *
-     * @param interfaceClass the interface class
+     * @param serviceClass the serviceClass
      */
-    public void setInterfaceClass(Class<?> interfaceClass) {
-        this.interfaceClass = interfaceClass;
+    public void setServiceClass(Class<?> serviceClass) {
+        this.serviceClass = serviceClass;
     }
 
     /**
-     * Gets interface class name.
+     * Gets serviceClass name.
      *
-     * @return the interface class name
+     * @return the serviceClass name
      */
-    public String getInterfaceClassName() {
-        return interfaceClassName;
+    public String getServiceClassName() {
+        return serviceClassName;
     }
 
     /**
-     * Sets interface class name.
+     * Sets serviceClass name.
      *
-     * @param interfaceClassName the interface class name
+     * @param serviceClassName the serviceClass name
      */
-    public void setInterfaceClassName(String interfaceClassName) {
-        this.interfaceClassName = interfaceClassName;
+    public void setServiceClassName(String serviceClassName) {
+        this.serviceClassName = serviceClassName;
     }
 
     /**
@@ -182,4 +182,5 @@ public boolean isReference() {
     public void setReference(boolean reference) {
         isReference = reference;
     }
+
 }

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java

@@ -170,8 +170,8 @@ public RemotingDesc parserRemotingServiceInfo(Object bean, String beanName, Remo
         }
         remotingServiceMap.put(beanName, remotingBeanDesc);
 
-        Class<?> interfaceClass = remotingBeanDesc.getInterfaceClass();
-        Method[] methods = interfaceClass.getMethods();
+        Class<?> serviceClass = remotingBeanDesc.getServiceClass();
+        Method[] methods = serviceClass.getMethods();
         if (remotingParser.isService(bean, beanName)) {
             try {
                 //service bean, registry resource
@@ -184,10 +184,10 @@ public RemotingDesc parserRemotingServiceInfo(Object bean, String beanName, Remo
                         tccResource.setTargetBean(targetBean);
                         tccResource.setPrepareMethod(m);
                         tccResource.setCommitMethodName(twoPhaseBusinessAction.commitMethod());
-                        tccResource.setCommitMethod(interfaceClass.getMethod(twoPhaseBusinessAction.commitMethod(),
+                        tccResource.setCommitMethod(serviceClass.getMethod(twoPhaseBusinessAction.commitMethod(),
                                 twoPhaseBusinessAction.commitArgsClasses()));
                         tccResource.setRollbackMethodName(twoPhaseBusinessAction.rollbackMethod());
-                        tccResource.setRollbackMethod(interfaceClass.getMethod(twoPhaseBusinessAction.rollbackMethod(),
+                        tccResource.setRollbackMethod(serviceClass.getMethod(twoPhaseBusinessAction.rollbackMethod(),
                                 twoPhaseBusinessAction.rollbackArgsClasses()));
                         // set argsClasses
                         tccResource.setCommitArgsClasses(twoPhaseBusinessAction.commitArgsClasses());

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DubboRemotingParser.java

@@ -52,8 +52,8 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
             String interfaceClassName = (String)ReflectionUtil.getFieldValue(bean, "interfaceName");
             String version = (String)ReflectionUtil.invokeMethod(bean, "getVersion");
             String group = (String)ReflectionUtil.invokeMethod(bean, "getGroup");
-            serviceBeanDesc.setInterfaceClass(interfaceClass);
-            serviceBeanDesc.setInterfaceClassName(interfaceClassName);
+            serviceBeanDesc.setServiceClass(interfaceClass);
+            serviceBeanDesc.setServiceClassName(interfaceClassName);
             serviceBeanDesc.setUniqueId(version);
             serviceBeanDesc.setGroup(group);
             serviceBeanDesc.setProtocol(Protocols.DUBBO);

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/HSFRemotingParser.java

@@ -80,8 +80,8 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
                 String group = (String) ReflectionUtil.invokeMethod(metadata, "getGroup");
 
                 RemotingDesc serviceBeanDesc = new RemotingDesc();
-                serviceBeanDesc.setInterfaceClass(interfaceClass);
-                serviceBeanDesc.setInterfaceClassName(interfaceClassName);
+                serviceBeanDesc.setServiceClass(interfaceClass);
+                serviceBeanDesc.setServiceClassName(interfaceClassName);
                 serviceBeanDesc.setUniqueId(uniqueId);
                 serviceBeanDesc.setGroup(group);
                 serviceBeanDesc.setProtocol(Protocols.HSF);
@@ -95,8 +95,8 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
                 String uniqueId = (String) ReflectionUtil.invokeMethod(metadata, "getVersion");
                 String group = (String) ReflectionUtil.invokeMethod(metadata, "getGroup");
                 RemotingDesc serviceBeanDesc = new RemotingDesc();
-                serviceBeanDesc.setInterfaceClass(interfaceClass);
-                serviceBeanDesc.setInterfaceClassName(interfaceClassName);
+                serviceBeanDesc.setServiceClass(interfaceClass);
+                serviceBeanDesc.setServiceClassName(interfaceClassName);
                 serviceBeanDesc.setUniqueId(uniqueId);
                 serviceBeanDesc.setGroup(group);
 

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParser.java

@@ -22,6 +22,7 @@
 import io.seata.rm.tcc.api.LocalTCC;
 import io.seata.rm.tcc.remoting.Protocols;
 import io.seata.rm.tcc.remoting.RemotingDesc;
+import org.springframework.aop.framework.AopProxyUtils;
 
 /**
  * local tcc bean parsing
@@ -49,11 +50,19 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
         remotingDesc.setReference(true);
         remotingDesc.setProtocol(Protocols.IN_JVM);
         Class<?> classType = bean.getClass();
+        // check if LocalTCC annotation is marked on the implementation class
+        if (classType.isAnnotationPresent(LocalTCC.class)) {
+            remotingDesc.setServiceClass(AopProxyUtils.ultimateTargetClass(bean));
+            remotingDesc.setServiceClassName(remotingDesc.getServiceClass().getName());
+            remotingDesc.setTargetBean(bean);
+            return remotingDesc;
+        }
+        // check if LocalTCC annotation is marked on the interface
         Set<Class<?>> interfaceClasses = ReflectionUtil.getInterfaces(classType);
         for (Class<?> interClass : interfaceClasses) {
             if (interClass.isAnnotationPresent(LocalTCC.class)) {
-                remotingDesc.setInterfaceClassName(interClass.getName());
-                remotingDesc.setInterfaceClass(interClass);
+                remotingDesc.setServiceClassName(interClass.getName());
+                remotingDesc.setServiceClass(interClass);
                 remotingDesc.setTargetBean(bean);
                 return remotingDesc;
             }
@@ -67,7 +76,7 @@ public short getProtocol() {
     }
 
     /**
-     * Determine whether there is an annotation {@link LocalTCC}
+     * Determine whether there is an annotation on interface or impl {@link LocalTCC}
      * @param bean the bean
      * @return boolean
      */
@@ -79,6 +88,6 @@ private boolean isLocalTCC(Object bean) {
                 return true;
             }
         }
-        return false;
+        return classType.isAnnotationPresent(LocalTCC.class);
     }
 }

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/SofaRpcRemotingParser.java

@@ -52,8 +52,8 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) throws Framewor
             Class<?> interfaceClass = (Class<?>)ReflectionUtil.invokeMethod(bean, "getInterfaceClass");
             String interfaceClassName = (String)ReflectionUtil.getFieldValue(bean, "interfaceType");
             String uniqueId = (String)ReflectionUtil.getFieldValue(bean, "uniqueId");
-            serviceBeanDesc.setInterfaceClass(interfaceClass);
-            serviceBeanDesc.setInterfaceClassName(interfaceClassName);
+            serviceBeanDesc.setServiceClass(interfaceClass);
+            serviceBeanDesc.setServiceClassName(interfaceClassName);
             serviceBeanDesc.setUniqueId(uniqueId);
             serviceBeanDesc.setProtocol(Protocols.SOFA_RPC);
             if (isService(bean, beanName)) {

tcc/src/test/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParserTest.java

@@ -66,8 +66,8 @@ public void testServiceDesc(){
         RemotingDesc remotingDesc = localTCCRemotingParser.getServiceDesc(tccAction, "c");
         Assertions.assertNotNull(remotingDesc);
 
-        Assertions.assertEquals("io.seata.rm.tcc.TccAction", remotingDesc.getInterfaceClassName());
-        Assertions.assertEquals(remotingDesc.getInterfaceClass(), TccAction.class);
+        Assertions.assertEquals("io.seata.rm.tcc.TccAction", remotingDesc.getServiceClassName());
+        Assertions.assertEquals(remotingDesc.getServiceClass(), TccAction.class);
         Assertions.assertEquals(remotingDesc.getTargetBean(), tccAction);
     }