Merge 1247 (#1252)

* init interface class canonical name to avoid multi reflection * Fix the issue where @SofaService annotation cannot set a custom thread pool when the interfaceType is empty (#1247) --------- Co-authored-by: 致节 <hzj266771@antgroup.com>
sofastack · Sep 28, 2023 · ced1622 · ced1622
1 parent d03eeea
commit ced1622
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 5 deletions.
diff --git a/...fa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/converter/RpcBindingConverter.java b/...fa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/converter/RpcBindingConverter.java
@@ -455,7 +455,7 @@ protected void convertServiceAnnotation(RpcBindingParam bindingParam,
 
             UserThreadPool threadPoolObj = (UserThreadPool) applicationContext.getBean(threadPool);
 
-            String interfaceName = sofaServiceAnnotation.interfaceType().getCanonicalName();
+            String interfaceName = bindingConverterContext.getInterfaceType().getCanonicalName();
             String uniqId = sofaServiceAnnotation.uniqueId();
             String uniqueName = interfaceName + ":1.0"
                                 + (StringUtils.isEmpty(uniqId) ? "" : ":" + uniqId);

diff --git a/...ot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaBootRpcAllTest.java b/...ot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaBootRpcAllTest.java
@@ -105,8 +105,13 @@ public class SofaBootRpcAllTest {
     private GenericService             genericService;
 
     @Autowired
+    @Qualifier("threadPoolService")
     private ThreadPoolService          threadPoolService;
 
+    @Autowired
+    @Qualifier("threadPoolAnnotationService")
+    private ThreadPoolService          threadPoolAnnotationService;
+
     @Autowired
     private RestService                restService;
 
@@ -233,7 +238,8 @@ public void testGeneric() {
     public void testThreadPool() {
         Assert.assertTrue(threadPoolService.sayThreadPool("threadPool").startsWith(
             "threadPool[SOFA-customerThreadPool_name"));
-
+        Assert.assertTrue(threadPoolAnnotationService.sayThreadPool("threadPool").startsWith(
+            "threadPool[SOFA-customerThreadPool_name"));
     }
 
     @Test

diff --git a/...t/java/com/alipay/sofa/rpc/boot/test/bean/threadpool/ThreadPoolServiceAnnotationImpl.java b/...t/java/com/alipay/sofa/rpc/boot/test/bean/threadpool/ThreadPoolServiceAnnotationImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alipay.sofa.rpc.boot.test.bean.threadpool;
+
+import com.alipay.sofa.runtime.api.annotation.SofaServiceBean;
+import com.alipay.sofa.runtime.api.annotation.SofaServiceBinding;
+
+/**
+ * @author huzijie
+ * @version ThreadPoolServiceAnnotationImpl.java, v 0.1 2023年09月19日 6:05 PM huzijie Exp $
+ */
+@SofaServiceBean(uniqueId = "annotation", bindings = { @SofaServiceBinding(bindingType = "bolt", userThreadPool = "customerThreadPool") })
+public class ThreadPoolServiceAnnotationImpl implements ThreadPoolService {
+
+    @Override
+    public String sayThreadPool(String string) {
+        return string + "[" + Thread.currentThread().getName() + "]";
+    }
+}
diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/resources/spring/test_all.xml b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/resources/spring/test_all.xml
@@ -106,6 +106,10 @@
                     interface="com.alipay.sofa.rpc.boot.test.bean.threadpool.ThreadPoolService">
         <sofa:binding.bolt/>
     </sofa:reference>
+    <sofa:reference jvm-first="false" id="threadPoolAnnotationService" unique-id="annotation"
+                    interface="com.alipay.sofa.rpc.boot.test.bean.threadpool.ThreadPoolService">
+        <sofa:binding.bolt/>
+    </sofa:reference>
 
     <!-- rest -->
     <bean id="restServiceImpl" class="com.alipay.sofa.rpc.boot.test.bean.rest.RestServiceImpl"/>

diff --git a/...-sofa-boot/src/main/java/com/alipay/sofa/runtime/spi/service/BindingConverterContext.java b/...-sofa-boot/src/main/java/com/alipay/sofa/runtime/spi/service/BindingConverterContext.java
@@ -39,6 +39,8 @@ public class BindingConverterContext {
 
     private String             repeatReferLimit;
 
+    private Class              interfaceType;
+
     public ClassLoader getAppClassLoader() {
         return appClassLoader;
     }
@@ -94,4 +96,12 @@ public String getRepeatReferLimit() {
     public void setRepeatReferLimit(String repeatReferLimit) {
         this.repeatReferLimit = repeatReferLimit;
     }
+
+    public Class getInterfaceType() {
+        return interfaceType;
+    }
+
+    public void setInterfaceType(Class interfaceType) {
+        this.interfaceType = interfaceType;
+    }
 }
diff --git a/...fa-boot/src/main/java/com/alipay/sofa/runtime/spring/ServiceBeanFactoryPostProcessor.java b/...fa-boot/src/main/java/com/alipay/sofa/runtime/spring/ServiceBeanFactoryPostProcessor.java
@@ -324,8 +324,10 @@ private void generateSofaServiceDefinition(String beanId, SofaService sofaServic
                 interfaceType);
             builder.addPropertyValue(AbstractContractDefinitionParser.UNIQUE_ID_PROPERTY,
                 sofaServiceAnnotation.uniqueId());
-            builder.addPropertyValue(AbstractContractDefinitionParser.BINDINGS,
-                getSofaServiceBinding(sofaServiceAnnotation, sofaServiceAnnotation.bindings()));
+            builder.addPropertyValue(
+                AbstractContractDefinitionParser.BINDINGS,
+                getSofaServiceBinding(sofaServiceAnnotation, sofaServiceAnnotation.bindings(),
+                    interfaceType));
             builder.addPropertyReference(ServiceDefinitionParser.REF, beanId);
             builder.addPropertyValue(ServiceDefinitionParser.BEAN_ID, beanId);
             builder.addPropertyValue(AbstractContractDefinitionParser.DEFINITION_BUILDING_API_TYPE,
@@ -342,7 +344,8 @@ private void generateSofaServiceDefinition(String beanId, SofaService sofaServic
     }
 
     private List<Binding> getSofaServiceBinding(SofaService sofaServiceAnnotation,
-                                                SofaServiceBinding[] sofaServiceBindings) {
+                                                SofaServiceBinding[] sofaServiceBindings,
+                                                Class<?> interfaceType) {
         List<Binding> bindings = new ArrayList<>();
         for (SofaServiceBinding sofaServiceBinding : sofaServiceBindings) {
             BindingConverter bindingConverter = bindingConverterFactory
@@ -356,6 +359,7 @@ private List<Binding> getSofaServiceBinding(SofaService sofaServiceAnnotation,
             bindingConverterContext.setApplicationContext(applicationContext);
             bindingConverterContext.setAppName(sofaRuntimeContext.getAppName());
             bindingConverterContext.setAppClassLoader(sofaRuntimeContext.getAppClassLoader());
+            bindingConverterContext.setInterfaceType(interfaceType);
             Binding binding = bindingConverter.convert(sofaServiceAnnotation, sofaServiceBinding,
                 bindingConverterContext);
             bindings.add(binding);