optimize:An optimization about DefaultRemotingParser (#2033)

apache · Feb 5, 2020 · 9f3d47f · 9f3d47f
1 parent d364751
commit 9f3d47f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java b/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java
@@ -20,6 +20,7 @@
 import io.seata.rm.tcc.api.TwoPhaseBusinessAction;
 import io.seata.rm.tcc.remoting.Protocols;
 import io.seata.rm.tcc.remoting.RemotingDesc;
+import io.seata.rm.tcc.remoting.RemotingParser;
 import io.seata.rm.tcc.remoting.parser.DefaultRemotingParser;
 import org.springframework.context.ApplicationContext;
 
@@ -139,8 +140,9 @@ protected static boolean isTccProxyTargetBean(RemotingDesc remotingDesc) {
      * @return if sofa:service, sofa:reference, dubbo:reference, dubbo:service return true, else return false
      */
     protected static boolean parserRemotingServiceInfo(Object bean, String beanName) {
-        if (DefaultRemotingParser.get().isRemoting(bean, beanName)) {
-            return null != DefaultRemotingParser.get().parserRemotingServiceInfo(bean, beanName);
+        RemotingParser remotingParser = DefaultRemotingParser.get().isRemoting(bean, beanName);
+        if (remotingParser != null) {
+            return DefaultRemotingParser.get().parserRemotingServiceInfo(bean, beanName, remotingParser) != null;
         }
         return false;
     }

diff --git a/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java b/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java
@@ -87,13 +87,13 @@ protected void initRemotingParser() {
      * @param beanName the bean name
      * @return boolean boolean
      */
-    public boolean isRemoting(Object bean, String beanName) {
+    public RemotingParser isRemoting(Object bean, String beanName) {
         for (RemotingParser remotingParser : allRemotingParsers) {
             if (remotingParser.isRemoting(bean, beanName)) {
-                return true;
+                return remotingParser;
             }
         }
-        return false;
+        return null;
     }
 
     /**
@@ -159,16 +159,16 @@ public RemotingDesc getServiceDesc(Object bean, String beanName) {
      * @param beanName the bean name
      * @return remoting desc
      */
-    public RemotingDesc parserRemotingServiceInfo(Object bean, String beanName) {
-        RemotingDesc remotingBeanDesc = getServiceDesc(bean, beanName);
+    public RemotingDesc parserRemotingServiceInfo(Object bean, String beanName, RemotingParser remotingParser) {
+        RemotingDesc remotingBeanDesc = remotingParser.getServiceDesc(bean, beanName);
         if (remotingBeanDesc == null) {
             return null;
         }
         remotingServiceMap.put(beanName, remotingBeanDesc);
 
         Class<?> interfaceClass = remotingBeanDesc.getInterfaceClass();
         Method[] methods = interfaceClass.getMethods();
-        if (isService(bean, beanName)) {
+        if (remotingParser.isService(bean, beanName)) {
             try {
                 //service bean, registry resource
                 Object targetBean = remotingBeanDesc.getTargetBean();
@@ -195,7 +195,7 @@ public RemotingDesc parserRemotingServiceInfo(Object bean, String beanName) {
                 throw new FrameworkException(t, "parser remoting service error");
             }
         }
-        if (isReference(bean, beanName)) {
+        if (remotingParser.isReference(bean, beanName)) {
             //reference bean, TCC proxy
             remotingBeanDesc.setReference(true);
         }