アクセシビリティ書き換えの場所を修正

Author: k163377

src/main/kotlin/com/wrongwrong/mapk/core/CompanionKFunction.kt

@@ -3,11 +3,17 @@ package com.wrongwrong.mapk.core
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.instanceParameter
+import kotlin.reflect.jvm.isAccessible
 
 internal class CompanionKFunction<T>(
     private val function: KFunction<T>,
     private val instance: Any
 ) : KFunction<T> by function {
+    init {
+        // このインスタンスを生成している時点でfunctionにアクセスしたい状況なので、アクセシビリティはここでセットする
+        function.isAccessible = true
+    }
+
     private val instanceParam by lazy { mapOf(function.instanceParameter!! to instance) }
 
     override val parameters: List<KParameter> by lazy {

src/main/kotlin/com/wrongwrong/mapk/core/KMapper.kt

@@ -117,11 +117,7 @@ internal fun <T : Any> getTarget(clazz: KClass<T>): KFunction<T> {
         clazz.companionObjectInstance?.let { companionObject ->
             companionObject::class.functions
                 .filter { it.annotations.any { annotation -> annotation is KConstructor } }
-                .map {
-                    // isAccessibleの書き換えはKotlinの都合で先に行う必要が有る
-                    it.isAccessible = true
-                    CompanionKFunction(it, companionObject) as KFunction<T>
-                }
+                .map { CompanionKFunction(it, companionObject) as KFunction<T> }
         } ?: emptyList()
 
     val constructors: List<KFunction<T>> = factoryConstructor + clazz.constructors

src/main/kotlin/com/wrongwrong/mapk/core/ParameterForMap.kt

@@ -66,8 +66,6 @@ private fun <T : Any> creatorsFromCompanionObject(clazz: KClass<T>): Set<Pair<KC
         companionObject::class.functions
             .filter { it.annotations.any { annotation -> annotation is KConverter } }
             .map { function ->
-                // isAccessibleの書き換えはKotlinの都合で先に行う必要が有る
-                function.isAccessible = true
                 val func: KFunction<T> = CompanionKFunction(function, companionObject) as KFunction<T>
 
                 (func.parameters.single().type.classifier as KClass<*>) to func