In order to support multiple parameters of lambda, is this too compli…

netty-rpc-client/src/main/java/com/netty/rpc/client/proxy/ObjectProxy.java

@@ -15,7 +15,7 @@
 /**
  * Created by luxiaoxun on 2016-03-16.
  */
-public class ObjectProxy<T,P> implements InvocationHandler, RpcService<T,P> {
+public class ObjectProxy<T, P> implements InvocationHandler, RpcService<T, P, SerializableFunction<T>> {
     private static final Logger logger = LoggerFactory.getLogger(ObjectProxy.class);
     private Class<T> clazz;
     private String version;
@@ -77,10 +77,10 @@ public RpcFuture call(String funcName, Object... args) throws Exception {
     }
 
     @Override
-    public RpcFuture call(RpcFunction<T, P> fn, Object... args) throws Exception {
+    public RpcFuture call(SerializableFunction<T> tSerializableFunction, Object... args) throws Exception {
         String serviceKey = ServiceUtil.makeServiceKey(this.clazz.getName(), version);
         RpcClientHandler handler = ConnectionManager.getInstance().chooseHandler(serviceKey);
-        RpcRequest request = createRequest(this.clazz.getName(), fn.getName(), args);
+        RpcRequest request = createRequest(this.clazz.getName(), tSerializableFunction.getName(), args);
         RpcFuture rpcFuture = handler.sendRequest(request);
         return rpcFuture;
     }
@@ -92,7 +92,6 @@ private RpcRequest createRequest(String className, String methodName, Object[] a
         request.setMethodName(methodName);
         request.setParameters(args);
         request.setVersion(version);
-
         Class[] parameterTypes = new Class[args.length];
         // Get the right class type
         for (int i = 0; i < args.length; i++) {
@@ -117,26 +116,6 @@ private RpcRequest createRequest(String className, String methodName, Object[] a
 
     private Class<?> getClassType(Object obj) {
         Class<?> classType = obj.getClass();
-        String typeName = classType.getName();
-        switch (typeName) {
-            case "java.lang.Integer":
-                return Integer.TYPE;
-            case "java.lang.Long":
-                return Long.TYPE;
-            case "java.lang.Float":
-                return Float.TYPE;
-            case "java.lang.Double":
-                return Double.TYPE;
-            case "java.lang.Character":
-                return Character.TYPE;
-            case "java.lang.Boolean":
-                return Boolean.TYPE;
-            case "java.lang.Short":
-                return Short.TYPE;
-            case "java.lang.Byte":
-                return Byte.TYPE;
-        }
-
         return classType;
     }
 

netty-rpc-client/src/main/java/com/netty/rpc/client/proxy/RpcFunction.java

@@ -1,30 +1,25 @@
 package com.netty.rpc.client.proxy;
 
-import java.io.Serializable;
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Method;
 
 /**
  * lambda method reference
  * g-yu
+ *
  * @param <T>
  * @param <P>
  */
 @FunctionalInterface
-public interface RpcFunction<T, P> extends Serializable {
+public interface RpcFunction<T, P> extends SerializableFunction<T> {
     /**
      * have parameter
      *
      * @param t
      * @param p
      * @return
      */
-    P apply(T t, P p);
+    Object apply(T t, P p);
+
 
-    default String getName() throws Exception {
-        Method write = this.getClass().getDeclaredMethod("writeReplace");
-        write.setAccessible(true);
-        SerializedLambda serializedLambda = (SerializedLambda) write.invoke(this);
-        return serializedLambda.getImplMethodName();
-    }
 }

netty-rpc-client/src/main/java/com/netty/rpc/client/proxy/RpcFunction2.java

@@ -0,0 +1,5 @@
+package com.netty.rpc.client.proxy;
+@FunctionalInterface
+public interface RpcFunction2<T, P1, P2> extends SerializableFunction<T> {
+    Object apply(T t, P1 p1, P2 p2);
+}

netty-rpc-client/src/main/java/com/netty/rpc/client/proxy/RpcService.java

@@ -6,7 +6,7 @@
  * Created by luxiaoxun on 2016/3/16.
  * @author g-yu
  */
-public interface RpcService<T,P> {
+public interface RpcService<T,P,FN extends SerializableFunction<T>> {
     RpcFuture call(String funcName, Object... args) throws Exception;
 
     /**
@@ -16,6 +16,6 @@ public interface RpcService<T,P> {
      * @return
      * @throws Exception
      */
-    RpcFuture call(RpcFunction<T, P> fn, Object... args) throws Exception;
+    RpcFuture call(FN fn, Object... args) throws Exception;
 
 }

netty-rpc-client/src/main/java/com/netty/rpc/client/proxy/SerializableFunction.java

@@ -0,0 +1,14 @@
+package com.netty.rpc.client.proxy;
+
+import java.io.Serializable;
+import java.lang.invoke.SerializedLambda;
+import java.lang.reflect.Method;
+
+public interface SerializableFunction<T> extends Serializable {
+    default String getName() throws Exception {
+        Method write = this.getClass().getDeclaredMethod("writeReplace");
+        write.setAccessible(true);
+        SerializedLambda serializedLambda = (SerializedLambda) write.invoke(this);
+        return serializedLambda.getImplMethodName();
+    }
+}

netty-rpc-test/src/main/java/com/app/test/service/HelloService.java

@@ -4,4 +4,6 @@ public interface HelloService {
     String hello(String name);
 
     String hello(Person person);
+
+    String substring(String str, Integer indexOf);
 }

netty-rpc-test/src/main/java/com/app/test/service/HelloServiceImpl.java

@@ -18,4 +18,9 @@ public String hello(String name) {
     public String hello(Person person) {
         return "Hello " + person.getFirstName() + " " + person.getLastName();
     }
+
+    @Override
+    public String substring(String str, Integer indexOf) {
+        return str.substring(0, indexOf);
+    }
 }

netty-rpc-test/src/main/java/com/app/test/service/HelloServiceImpl2.java

@@ -18,4 +18,9 @@ public String hello(String name) {
     public String hello(Person person) {
         return "Hi " + person.getFirstName() + " " + person.getLastName();
     }
+
+    @Override
+    public String substring(String str, Integer indexOf) {
+        return str.substring(0,indexOf) + "v2";
+    }
 }

netty-rpc-test/src/test/java/com/app/test/ServiceTest2.java

@@ -4,6 +4,8 @@
 import com.app.test.service.HelloService;
 import com.netty.rpc.client.RpcClient;
 import com.netty.rpc.client.handler.RpcFuture;
+import com.netty.rpc.client.proxy.RpcFunction;
+import com.netty.rpc.client.proxy.RpcFunction2;
 import com.netty.rpc.client.proxy.RpcService;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,8 +30,13 @@ public void say() {
 
     @Test
     public void mr() throws Exception {
-        RpcService<HelloService, String> helloService = rpcClient.createAsyncService(HelloService.class, "1.0");
+        RpcService<HelloService, String, RpcFunction<HelloService,String>> helloService = rpcClient.createAsyncService(HelloService.class, "1.0");
         RpcFuture result = helloService.call(HelloService::hello, "World");
         Assert.assertEquals("Hello World", result.get());
+
+        RpcService<HelloService, String, RpcFunction2<HelloService, String, Integer>> helloServicev1 = rpcClient.createAsyncService(HelloService.class, "1.0");
+        RpcFuture resultv1 = helloServicev1.call(HelloService::substring, "World", 2);
+        Assert.assertEquals("Wo", resultv1.get());
+
     }
 }