Revert modification of core dubbo RPC protocol

dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java

@@ -95,40 +95,19 @@ public class DecodeableRpcInvocation extends RpcInvocation implements Codec, Dec
         try {
             Object[] args;
             Class<?>[] pts;
-            int argNum = in.readInt();
-            if (argNum >= 0) {
-                if (argNum == 0) {
-                    pts = DubboCodec.EMPTY_CLASS_ARRAY;
-                    args = DubboCodec.EMPTY_OBJECT_ARRAY;
-                } else {
-                    args = new Object[argNum];
-                    pts = new Class[argNum];
-                    for (int i = 0; i < args.length; i++) {
-                        try {
-                            args[i] = in.readObject();
-                            pts[i] = args[i].getClass();
-                        } catch (Exception e) {
-                            if (log.isWarnEnabled()) {
-                                log.warn("Decode argument failed: " + e.getMessage(), e);
-                            }
-                        }
-                    }
-                }
+            String desc = in.readUTF();
+            if (desc.length() == 0) {
+                pts = DubboCodec.EMPTY_CLASS_ARRAY;
+                args = DubboCodec.EMPTY_OBJECT_ARRAY;
             } else {
-                String desc = in.readUTF();
-                if (desc.length() == 0) {
-                    pts = DubboCodec.EMPTY_CLASS_ARRAY;
-                    args = DubboCodec.EMPTY_OBJECT_ARRAY;
-                } else {
-                    pts = ReflectUtils.desc2classArray(desc);
-                    args = new Object[pts.length];
-                    for (int i = 0; i < args.length; i++) {
-                        try {
-                            args[i] = in.readObject(pts[i]);
-                        } catch (Exception e) {
-                            if (log.isWarnEnabled()) {
-                                log.warn("Decode argument failed: " + e.getMessage(), e);
-                            }
+                pts = ReflectUtils.desc2classArray(desc);
+                args = new Object[pts.length];
+                for (int i = 0; i < args.length; i++) {
+                    try {
+                        args[i] = in.readObject(pts[i]);
+                    } catch (Exception e) {
+                        if (log.isWarnEnabled()) {
+                            log.warn("Decode argument failed: " + e.getMessage(), e);
                         }
                     }
                 }

dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java

@@ -25,7 +25,6 @@ import com.alibaba.dubbo.common.logger.Logger;
 import com.alibaba.dubbo.common.logger.LoggerFactory;
 import com.alibaba.dubbo.common.serialize.ObjectInput;
 import com.alibaba.dubbo.common.serialize.ObjectOutput;
-import com.alibaba.dubbo.common.serialize.OptimizedSerialization;
 import com.alibaba.dubbo.common.serialize.Serialization;
 import com.alibaba.dubbo.common.utils.ReflectUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
@@ -169,14 +168,7 @@ public class DubboCodec extends ExchangeCodec implements Codec2 {
         out.writeUTF(inv.getAttachment(Constants.VERSION_KEY));
 
         out.writeUTF(inv.getMethodName());
-
-        if (getSerialization(channel) instanceof OptimizedSerialization && !containComplexArguments(inv)) {
-            out.writeInt(inv.getParameterTypes().length);
-        } else {
-            out.writeInt(-1);
-            out.writeUTF(ReflectUtils.getDesc(inv.getParameterTypes()));
-        }
-
+        out.writeUTF(ReflectUtils.getDesc(inv.getParameterTypes()));
         Object[] args = inv.getArguments();
         if (args != null)
             for (int i = 0; i < args.length; i++) {
@@ -203,14 +195,4 @@ public class DubboCodec extends ExchangeCodec implements Codec2 {
             out.writeObject(th);
         }
     }
-
-    // workaround for the target method matching of kryo & fst
-    private boolean containComplexArguments(RpcInvocation invocation) {
-        for (int i = 0; i < invocation.getParameterTypes().length; i++) {
-            if (invocation.getArguments()[i] == null || invocation.getParameterTypes()[i] != invocation.getArguments()[i].getClass()) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
\ No newline at end of file