Fix 3105 , make invoke command with Json string parameter without "class" key

Author: LiZhenNet

dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java

@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.rpc.protocol.dubbo.telnet;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.common.utils.ReflectUtils;
 import org.apache.dubbo.common.utils.StringUtils;
@@ -27,14 +29,10 @@
 import org.apache.dubbo.rpc.model.ProviderMethodModel;
 import org.apache.dubbo.rpc.model.ProviderModel;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 import static org.apache.dubbo.common.utils.PojoUtils.realize;
 import static org.apache.dubbo.rpc.RpcContext.getContext;
@@ -50,19 +48,19 @@ private static Method findMethod(List<ProviderMethodModel> methods, String metho
                                      Class<?>[] paramTypes) {
         for (ProviderMethodModel model : methods) {
             Method m = model.getMethod();
-            if (isMatch(m, args, paramTypes,method)) {
+            if (isMatch(m, args, paramTypes, method)) {
                 return m;
             }
         }
         return null;
     }
 
-    private static boolean isMatch(Method method,List<Object> args, Class<?>[] paramClasses,String lookupMethodName) {
-        if(!method.getName().equals(lookupMethodName)) {
+    private static boolean isMatch(Method method, List<Object> args, Class<?>[] paramClasses, String lookupMethodName) {
+        if (!method.getName().equals(lookupMethodName)) {
             return false;
         }
 
-        Class<?> types[]=method.getParameterTypes();
+        Class<?> types[] = method.getParameterTypes();
         if (types.length != args.size()) {
             return false;
         }
@@ -99,13 +97,10 @@ private static boolean isMatch(Method method,List<Object> args, Class<?>[] param
                 if (!ReflectUtils.isCompatible(type, arg)) {
                     return false;
                 }
-            } else if (arg instanceof Map) {
-                String name = (String) ((Map<?, ?>) arg).get("class");
-                Class<?> cls = arg.getClass();
-                if (name != null && name.length() > 0) {
-                    cls = ReflectUtils.forName(name);
-                }
-                if (!type.isAssignableFrom(cls)) {
+            } else if (arg instanceof JSONObject) {
+                try {
+                    ((JSONObject) arg).toJavaObject(type);
+                } catch (Exception ex) {
                     return false;
                 }
             } else if (arg instanceof Collection) {

dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java

@@ -71,7 +71,7 @@ public Type enumlength(Type... types) {
             return Type.Lower;
         return types[0];
     }
-    
+
     public Type getType(Type type) {
         return type;
     }
@@ -109,12 +109,12 @@ public long add(int a, long b) {
 
     @Override
     public int getPerson(Person person) {
-        return 1;
+        return person.getAge();
     }
 
     @Override
     public int getPerson(Person person1, Person perso2) {
-        return 2;
+        return person1.getAge() + perso2.getAge();
     }
 
 }

dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java

@@ -25,7 +25,6 @@
 import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService;
 import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl;
 import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -198,6 +197,34 @@ public void testInvokeAutoFindMethod() throws RemotingException {
         assertTrue(result.contains("ok"));
     }
 
+    @Test
+    public void testInvokeJsonParamMethod() throws RemotingException {
+        mockChannel = mock(Channel.class);
+        given(mockChannel.getAttribute("telnet.service")).willReturn(null);
+        given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
+        given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
+
+        ProviderModel providerModel = new ProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", new DemoServiceImpl(), DemoService.class);
+        ApplicationModel.initProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", providerModel);
+        String param = "{\"name\":\"Dubbo\",\"age\":8}";
+        String result = invoke.telnet(mockChannel, "getPerson(" + param + ")");
+        assertTrue(result.contains("8"));
+    }
+
+    @Test
+    public void testInvokeMultiJsonParamMethod() throws RemotingException {
+        mockChannel = mock(Channel.class);
+        given(mockChannel.getAttribute("telnet.service")).willReturn(null);
+        given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
+        given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
+
+        ProviderModel providerModel = new ProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", new DemoServiceImpl(), DemoService.class);
+        ApplicationModel.initProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", providerModel);
+        String param = "{\"name\":\"Dubbo\",\"age\":8},{\"name\":\"Apache\",\"age\":20}";
+        String result = invoke.telnet(mockChannel, "getPerson(" + param + ")");
+        assertTrue(result.contains("28"));
+    }
+
     @Test
     public void testMessageNull() throws RemotingException {
         mockChannel = mock(Channel.class);