定義場所の間違いを修正

合わせてinternal化

Author: k163377

src/main/kotlin/com/mapk/core/Functions.kt

@@ -1,13 +1,10 @@
 package com.mapk.core
 
-import com.mapk.annotations.KConstructor
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.companionObject
 import kotlin.reflect.full.functions
-import kotlin.reflect.full.primaryConstructor
-import kotlin.reflect.jvm.jvmName
 
 inline fun <reified A : Annotation> KClass<*>.getAnnotatedFunctionsFromCompanionObject(): Pair<Any, List<KFunction<*>>>? {
     return this.companionObject?.let { companionObject ->
@@ -26,25 +23,4 @@ inline fun <reified A : Annotation, T> Collection<KFunction<T>>.getAnnotatedFunc
     return filter { function -> function.annotations.any { it is A } }
 }
 
-@Suppress("UNCHECKED_CAST")
-fun <T : Any> KClass<T>.getKConstructor(): Pair<Any?, KFunction<T>> {
-    val constructors = ArrayList<Pair<Any?, KFunction<T>>>()
-
-    this.getAnnotatedFunctionsFromCompanionObject<KConstructor>()?.let { (instance, functions) ->
-        functions.forEach {
-            constructors.add(instance to it as KFunction<T>)
-        }
-    }
-
-    this.constructors.getAnnotatedFunctions<KConstructor, T>().forEach {
-        constructors.add(null to it)
-    }
-
-    if (constructors.size == 1) return constructors.single()
-
-    if (constructors.isEmpty()) return null to this.primaryConstructor!!
-
-    throw IllegalArgumentException("${this.jvmName} has multiple ${KConstructor::class.jvmName}.")
-}
-
 fun KParameter.getKClass(): KClass<*> = type.classifier as KClass<*>

src/main/kotlin/com/mapk/core/KFunctionForCall.kt

@@ -5,6 +5,7 @@ import com.mapk.core.internal.ArgumentBinder
 import com.mapk.core.internal.BucketGenerator
 import com.mapk.core.internal.ParameterNameConverter
 import com.mapk.core.internal.getAliasOrName
+import com.mapk.core.internal.getKConstructor
 import com.mapk.core.internal.isUseDefaultArgument
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction

src/main/kotlin/com/mapk/core/internal/Functions.kt

@@ -1,10 +1,16 @@
 package com.mapk.core.internal
 
+import com.mapk.annotations.KConstructor
 import com.mapk.annotations.KParameterAlias
 import com.mapk.annotations.KUseDefaultArgument
+import com.mapk.core.getAnnotatedFunctions
+import com.mapk.core.getAnnotatedFunctionsFromCompanionObject
 import java.lang.IllegalArgumentException
+import kotlin.reflect.KClass
+import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.jvm.jvmName
 
 /**
@@ -24,3 +30,24 @@ internal fun KParameter.isUseDefaultArgument(): Boolean {
     }
     return false
 }
+
+@Suppress("UNCHECKED_CAST")
+internal fun <T : Any> KClass<T>.getKConstructor(): Pair<Any?, KFunction<T>> {
+    val constructors = ArrayList<Pair<Any?, KFunction<T>>>()
+
+    this.getAnnotatedFunctionsFromCompanionObject<KConstructor>()?.let { (instance, functions) ->
+        functions.forEach {
+            constructors.add(instance to it as KFunction<T>)
+        }
+    }
+
+    this.constructors.getAnnotatedFunctions<KConstructor, T>().forEach {
+        constructors.add(null to it)
+    }
+
+    if (constructors.size == 1) return constructors.single()
+
+    if (constructors.isEmpty()) return null to this.primaryConstructor!!
+
+    throw IllegalArgumentException("${this.jvmName} has multiple ${KConstructor::class.jvmName}.")
+}