インスタンス/static関数のスプレッド処理をラップ

Author: k163377

src/main/java/com/mapk/fastkfunction/spreadwrapper/ForMethod.java

@@ -0,0 +1,21 @@
+package com.mapk.fastkfunction.spreadwrapper;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class ForMethod {
+    private final Method method;
+    private final Object instance;
+
+    public ForMethod(@NotNull Method method, @Nullable Object instance) {
+        this.method = method;
+        this.instance = instance;
+    }
+
+    public Object call(Object[] args) throws InvocationTargetException, IllegalAccessException {
+        return method.invoke(instance, args);
+    }
+}

src/main/kotlin/com/mapk/fastkfunction/FastKFunction.kt

@@ -4,6 +4,7 @@ import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
 import com.mapk.fastkfunction.argumentbucket.BucketGenerator
 import com.mapk.fastkfunction.spreadwrapper.ForConstructor
 import com.mapk.fastkfunction.spreadwrapper.ForKFunction
+import com.mapk.fastkfunction.spreadwrapper.ForMethod
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import kotlin.reflect.KFunction
@@ -61,23 +62,24 @@ sealed class FastKFunction<T> {
 
     internal class TopLevelFunction<T>(
         private val function: KFunction<T>,
-        private val method: Method,
+        method: Method,
         override val valueParameters: List<KParameter>
     ) : FastKFunction<T>() {
+        private val spreadWrapper = ForMethod(method, null)
         override val bucketGenerator = BucketGenerator(valueParameters, null)
 
         @Suppress("UNCHECKED_CAST")
         override fun callBy(bucket: ArgumentBucket): T = if (bucket.isFullInitialized()) {
-            method.invoke(null, *bucket.getValueArray()) as T
+            spreadWrapper.call(bucket.getValueArray()) as T
         } else {
             function.callBy(bucket)
         }
 
         @Suppress("UNCHECKED_CAST")
-        override fun callByCollection(args: Collection<Any?>): T = method.invoke(null, *args.toTypedArray()) as T
+        override fun callByCollection(args: Collection<Any?>): T = spreadWrapper.call(args.toTypedArray()) as T
 
         @Suppress("UNCHECKED_CAST")
-        override fun call(vararg args: Any?): T = method.invoke(null, *args) as T
+        override fun call(vararg args: Any?): T = spreadWrapper.call(args) as T
     }
 
     internal class TopLevelExtensionFunction<T>(
@@ -104,23 +106,25 @@ sealed class FastKFunction<T> {
 
     internal class InstanceFunction<T>(
         private val function: KFunction<T>,
-        private val method: Method,
-        private val instance: Any,
+        method: Method,
+        instance: Any,
         override val bucketGenerator: BucketGenerator,
         override val valueParameters: List<KParameter>
     ) : FastKFunction<T>() {
+        private val spreadWrapper = ForMethod(method, instance)
+
         @Suppress("UNCHECKED_CAST")
         override fun callBy(bucket: ArgumentBucket): T = if (bucket.isFullInitialized()) {
-            method.invoke(instance, *bucket.getValueArray()) as T
+            spreadWrapper.call(bucket.getValueArray()) as T
         } else {
             function.callBy(bucket)
         }
 
         @Suppress("UNCHECKED_CAST")
-        override fun callByCollection(args: Collection<Any?>): T = method.invoke(instance, *args.toTypedArray()) as T
+        override fun callByCollection(args: Collection<Any?>): T = spreadWrapper.call(args.toTypedArray()) as T
 
         @Suppress("UNCHECKED_CAST")
-        override fun call(vararg args: Any?): T = method.invoke(instance, *args) as T
+        override fun call(vararg args: Any?): T = spreadWrapper.call(args) as T
     }
 
     companion object {