Support method annotation for rpc. (#172)

* update sofa boot 263

* sofa method annotation

Author: leizhiyuan

sofa-boot-core/src/main/java/com/alipay/sofa/rpc/boot/runtime/converter/RpcBindingConverter.java

@@ -28,6 +28,7 @@
 import com.alipay.sofa.rpc.filter.ExcludeFilter;
 import com.alipay.sofa.rpc.filter.Filter;
 import com.alipay.sofa.rpc.server.UserThreadPool;
+import com.alipay.sofa.runtime.api.annotation.SofaMethod;
 import com.alipay.sofa.runtime.api.annotation.SofaParameter;
 import com.alipay.sofa.runtime.api.annotation.SofaReference;
 import com.alipay.sofa.runtime.api.annotation.SofaReferenceBinding;
@@ -437,6 +438,11 @@ protected void convertServiceAnnotation(RpcBindingParam bindingParam, SofaServic
         if (parameters.length > 0) {
             bindingParam.setParameters(parseSofaParameters(parameters));
         }
+
+        SofaMethod[] sofaMethods = sofaServiceBindingAnnotation.methodInfos();
+        if (sofaMethods.length > 0) {
+            bindingParam.setMethodInfos(parseSofaMethods(sofaMethods));
+        }
     }
 
     /**
@@ -462,7 +468,6 @@ public abstract RpcBinding convert(SofaReference sofaReferenceAnnotation,
     protected void convertReferenceAnnotation(RpcBindingParam bindingParam,
                                               SofaReferenceBinding sofaReferenceBindingAnnotation,
                                               BindingConverterContext bindingConverterContext) {
-        //TODO need a magic number
         if (sofaReferenceBindingAnnotation.addressWaitTime() != 0) {
             bindingParam.setAddressWaitTime(sofaReferenceBindingAnnotation.addressWaitTime());
         }
@@ -513,6 +518,29 @@ protected void convertReferenceAnnotation(RpcBindingParam bindingParam,
         if (parameters.length > 0) {
             bindingParam.setParameters(parseSofaParameters(parameters));
         }
+
+        SofaMethod[] sofaMethods = sofaReferenceBindingAnnotation.methodInfos();
+        if (sofaMethods.length > 0) {
+            bindingParam.setMethodInfos(parseSofaMethods(sofaMethods));
+        }
+    }
+
+    protected List<RpcBindingMethodInfo> parseSofaMethods(SofaMethod[] sofaMethods) {
+
+        List<RpcBindingMethodInfo> rpcBindingMethodInfos = new ArrayList<RpcBindingMethodInfo>();
+        for (SofaMethod sofaMethod : sofaMethods) {
+            RpcBindingMethodInfo rpcBindingMethodInfo = new RpcBindingMethodInfo();
+            rpcBindingMethodInfo.setName(sofaMethod.name());
+            rpcBindingMethodInfo.setType(sofaMethod.invokeType());
+            rpcBindingMethodInfo.setTimeout(sofaMethod.timeout());
+            rpcBindingMethodInfo.setRetries(sofaMethod.retries());
+            rpcBindingMethodInfo.setCallbackClass(sofaMethod.callbackClass());
+            rpcBindingMethodInfo.setCallbackRef(sofaMethod.callbackRef());
+
+            rpcBindingMethodInfos.add(rpcBindingMethodInfo);
+        }
+
+        return rpcBindingMethodInfos;
     }
 
     private Map<String, String> parseSofaParameters(SofaParameter[] parameterAnnos) {

sofa-boot-core/src/test/java/com/alipay/sofa/rpc/boot/runtime/converter/RpcBindingConverterTest.java

@@ -0,0 +1,58 @@
+/*
+ * 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.runtime.converter;
+
+import com.alipay.sofa.rpc.boot.runtime.binding.RpcBindingMethodInfo;
+import com.alipay.sofa.runtime.api.annotation.SofaMethod;
+import com.alipay.sofa.runtime.api.annotation.SofaReference;
+import com.alipay.sofa.runtime.api.annotation.SofaReferenceBinding;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+public class RpcBindingConverterTest {
+
+    @SofaReference(binding = @SofaReferenceBinding(bindingType = "bolt", methodInfos = { @SofaMethod(name = "test", retries = 1, invokeType = "callback", callbackClass = "class", callbackRef = "ref", timeout = 2000) }))
+    private String testAnnotation;
+
+    @Test
+    public void parseSofaMethods() {
+
+        RpcBindingConverter rpcBindingConverter = new BoltBindingConverter();
+
+        SofaReference reference = null;
+        try {
+            reference = RpcBindingConverterTest.class.getDeclaredField("testAnnotation").getAnnotation(
+                SofaReference.class);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        List<RpcBindingMethodInfo> result = rpcBindingConverter.parseSofaMethods(reference.binding().methodInfos());
+
+        Assert.assertEquals(1, result.size());
+        final RpcBindingMethodInfo rpcBindingMethodInfo = result.get(0);
+        Assert.assertEquals("test", rpcBindingMethodInfo.getName());
+        Assert.assertEquals(1, rpcBindingMethodInfo.getRetries().intValue());
+        Assert.assertEquals("callback", rpcBindingMethodInfo.getType());
+        Assert.assertEquals("class", rpcBindingMethodInfo.getCallbackClass());
+        Assert.assertEquals("ref", rpcBindingMethodInfo.getCallbackRef());
+
+        Assert.assertEquals(2000, rpcBindingMethodInfo.getTimeout().intValue());
+
+    }
+}

sofa-boot-samples/pom.xml

@@ -32,12 +32,12 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>test-sofa-boot-starter</artifactId>
-            <version>${sofaboot.version}</version>
+            <version>2.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>healthcheck-sofa-boot-starter</artifactId>
-            <version>${sofaboot.version}</version>
+            <version>2.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>