optimize for deserialize factory class

Author: wenshao

core/src/main/java/com/alibaba/fastjson2/reader/FactoryFunction.java

@@ -66,6 +66,10 @@ public T apply(Map<Long, Object> values) {
         for (int i = 0; i < args.length; i++) {
             args[i] = values.get(hashCodes[i]);
         }
+        return createInstance(args);
+    }
+
+    public T createInstance(Object[] args) {
         try {
             return (T) factoryMethod.invoke(null, args);
         } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {

core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java

@@ -771,18 +771,14 @@ protected <T> ObjectReader<T> createObjectReaderWithCreator(
             setterFieldReaders = array;
         }
 
-        return (ObjectReader<T>) new ObjectReaderNoneDefaultConstructor(
+        return createNoneDefaultConstructorObjectReader(
                 objectClass,
-                beanInfo.typeKey,
-                beanInfo.typeName,
-                beanInfo.readerFeatures,
+                beanInfo,
                 function,
                 null,
                 paramNames,
                 toFieldReaderArray(fieldReaders),
-                setterFieldReaders,
-                beanInfo.seeAlso,
-                beanInfo.seeAlsoNames
+                setterFieldReaders
         );
     }
 
@@ -1341,7 +1337,7 @@ boolean record = BeanUtils.isRecord(objectClass);
     }
 
     protected <T> ObjectReaderNoneDefaultConstructor createNoneDefaultConstructorObjectReader(
-            Class<T> objectClass,
+            Class objectClass,
             BeanInfo beanInfo,
             Function<Map<Long, Object>, T> constructorFunction,
             List<Constructor> alternateConstructors,
@@ -1359,8 +1355,8 @@ protected <T> ObjectReaderNoneDefaultConstructor createNoneDefaultConstructorObj
                 parameterNames,
                 paramFieldReaders,
                 fieldReaderArray,
-                null,
-                null
+                beanInfo.seeAlso,
+                beanInfo.seeAlsoNames
         );
     }
 

core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreatorASM.java

@@ -340,7 +340,7 @@ public <T> ObjectReader<T> createObjectReader(
 
     @Override
     protected <T> ObjectReaderNoneDefaultConstructor createNoneDefaultConstructorObjectReader(
-            Class<T> objectClass,
+            Class objectClass,
             BeanInfo beanInfo,
             Function<Map<Long, Object>, T> constructorFunction,
             List<Constructor> alternateConstructors,
@@ -358,18 +358,20 @@ protected <T> ObjectReaderNoneDefaultConstructor createNoneDefaultConstructorObj
                 parameterNames,
                 paramFieldReaders,
                 fieldReaderArray,
-                null,
-                null
+                beanInfo.seeAlso,
+                beanInfo.seeAlsoNames
         );
 
         boolean match = true;
 
         if (beanInfo.autoTypeBeforeHandler != null
                 || fieldReaderArray.length != 0
-                || !(constructorFunction instanceof ConstructorFunction)
-                || !alternateConstructors.isEmpty()
+                || (!(constructorFunction instanceof ConstructorFunction) && (!(constructorFunction instanceof FactoryFunction)))
+                || (alternateConstructors != null && !alternateConstructors.isEmpty())
                 || classLoader.isExternalClass(objectClass)
                 || (beanInfo.readerFeatures & JSONReader.Feature.SupportAutoType.mask) != 0
+                || (objectReaderAdapter.noneDefaultConstructor != null && objectReaderAdapter.noneDefaultConstructor.getParameterCount() != fieldReaderArray.length)
+                || (constructorFunction instanceof FactoryFunction && ((FactoryFunction<T>) constructorFunction).paramNames.length != fieldReaderArray.length)
         ) {
             match = false;
         }
@@ -2027,8 +2029,10 @@ private <T> void genMethodReadObject(
             ObjectReaderNoneDefaultConstructor objectReaderNoneDefaultConstructor = (ObjectReaderNoneDefaultConstructor) context.objectReaderAdapter;
             boolean constructDirect = true;
             if (classLoader.isExternalClass(context.objectClass)
+                    || context.objectClass.getTypeParameters().length != 0
                     || (objectReaderNoneDefaultConstructor.constructor != null && !Modifier.isPublic(objectReaderNoneDefaultConstructor.constructor.getModifiers()))
                     || (context.objectClass != null && !Modifier.isPublic(context.objectClass.getModifiers()))
+                    || objectReaderNoneDefaultConstructor.factoryFunction != null
             ) {
                 constructDirect = false;
             }

core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderNoneDefaultConstructor.java

@@ -23,6 +23,7 @@ public class ObjectReaderNoneDefaultConstructor<T>
     final Constructor noneDefaultConstructor;
     final BiFunction bifunction;
     final Function function;
+    final FactoryFunction factoryFunction;
 
     public ObjectReaderNoneDefaultConstructor(
             Class objectClass,
@@ -66,9 +67,15 @@ public ObjectReaderNoneDefaultConstructor(
         if (creator instanceof ConstructorFunction) {
             bifunction = ((ConstructorFunction<T>) creator).biFunction;
             function = ((ConstructorFunction<T>) creator).function;
+            factoryFunction = null;
+        } else if (creator instanceof FactoryFunction) {
+            bifunction = ((FactoryFunction<T>) creator).biFunction;
+            function = ((FactoryFunction<T>) creator).function;
+            factoryFunction = (FactoryFunction) creator;
         } else {
             bifunction = null;
             function = null;
+            factoryFunction = null;
         }
     }
 
@@ -552,6 +559,9 @@ public T createInstance(Object[] args) {
             if (bifunction != null) {
                 return (T) bifunction.apply(args[0], args[1]);
             }
+            if (factoryFunction != null) {
+                return (T) factoryFunction.createInstance(args);
+            }
             return (T) noneDefaultConstructor.newInstance(args);
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
                  InvocationTargetException e) {

core/src/test/java/com/alibaba/fastjson2/read/FactoryTest.java

@@ -0,0 +1,72 @@
+package com.alibaba.fastjson2.read;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.annotation.JSONCreator;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class FactoryTest {
+    @Test
+    public void test1() {
+        assertEquals(123,
+                JSON.parseObject("{\"value\": 123}", Bean1.class).value);
+    }
+
+    private static class Bean1 {
+        private int value;
+
+        private Bean1(int value) {
+            this.value = value;
+        }
+
+        @JSONCreator
+        public static Bean1 create(int value) {
+            return new Bean1(value);
+        }
+    }
+
+    @Test
+    public void test2() {
+        assertEquals(123,
+                JSON.parseObject("{\"id\": 123, \"name\":\"abc\"}", Bean2.class).id);
+    }
+
+    private static class Bean2 {
+        private int id;
+        private String name;
+
+        public Bean2(int id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        @JSONCreator
+        public static Bean2 create(int id, String name) {
+            return new Bean2(id, name);
+        }
+    }
+
+    @Test
+    public void test3() {
+        assertEquals(16,
+                JSON.parseObject("{\"id\": 123, \"name\":\"abc\", \"age\":16}", Bean3.class).age);
+    }
+
+    private static class Bean3 {
+        private int id;
+        private String name;
+        private int age;
+
+        public Bean3(int id, String name, int age) {
+            this.id = id;
+            this.name = name;
+            this.age = age;
+        }
+
+        @JSONCreator
+        public static Bean3 create(int id, String name, int age) {
+            return new Bean3(id, name, age);
+        }
+    }
+}