Merge pull request #14 from k163377/feature

Add annotation that means "Use Non Null argument".

Author: k163377

README.md

@@ -76,18 +76,18 @@ val dst: Dst = KMapper(::DataClass) { camelToSnake(it) }.map(src)
 ### Map param to another class
 
 ```kotlin
-class CreatorClass @SingleArgCreator constructor(val arg: String) {
+class ConverterClass @KConverter constructor(val arg: String) {
   companion object {
     @KConverter
-    fun fromInt(arg: Int): CreatorClass {
-      return CreatorClass(arg.toString)
+    fun fromInt(arg: Int): ConverterClass {
+      return ConverterClass(arg.toString)
     }
   }
 }
 
 class Src(val arg1: String, val arg2: Int)
 
-class Dst(val arg1: CreatorClass, val arg2: CreatorClass)
+class Dst(val arg1: ConverterClass, val arg2: ConverterClass)
 
 val newInstance = KMapper(::Dst).map(src)
 ```

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.mapk"
-version = "0.16"
+version = "0.17"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -30,7 +30,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(kotlin("reflect"))
-    api("com.github.ProjectMapK:Shared:0.7")
+    api("com.github.ProjectMapK:Shared:0.8")
 
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
     testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.0") {

src/main/kotlin/com/mapk/kmapper/KMapper.kt

@@ -117,11 +117,11 @@ private fun <T : Any, R : Any> mapObject(param: ParameterForMap<R>, value: T): A
     // パラメータに対してvalueが代入可能（同じもしくは親クラス）であればそのまま用いる
     if (param.clazz.isSuperclassOf(valueClazz)) return value
 
-    val creator: KFunction<*>? = param.getCreator(valueClazz)
+    val converter: KFunction<*>? = param.getConverter(valueClazz)
 
     return when {
-        // creatorに一致する組み合わせが有れば設定されていればそれを使う
-        creator != null -> creator.call(value)
+        // converterに一致する組み合わせが有れば設定されていればそれを使う
+        converter != null -> converter.call(value)
         // 要求された値がenumかつ元が文字列ならenum mapperでマップ
         param.javaClazz.isEnum && value is String -> EnumMapper.getEnum(param.clazz.java, value)
         // 要求されているパラメータがStringならtoStringする

src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt

@@ -16,15 +16,15 @@ internal class ParameterForMap<T : Any> private constructor(val param: KParamete
         clazz.java
     }
     // リストの長さが小さいと期待されるためこの形で実装しているが、理想的にはmap的なものが使いたい
-    private val creators: Set<Pair<KClass<*>, KFunction<T>>> by lazy {
-        creatorsFromConstructors(clazz) + creatorsFromStaticMethods(
+    private val converters: Set<Pair<KClass<*>, KFunction<T>>> by lazy {
+        convertersFromConstructors(clazz) + convertersFromStaticMethods(
             clazz
-        ) + creatorsFromCompanionObject(clazz)
+        ) + convertersFromCompanionObject(clazz)
     }
 
-    // 引数の型がcreatorに対して入力可能ならcreatorを返す
-    fun <R : Any> getCreator(input: KClass<out R>): KFunction<T>? =
-        creators.find { (key, _) -> input.isSubclassOf(key) }?.second
+    // 引数の型がconverterに対して入力可能ならconverterを返す
+    fun <R : Any> getConverter(input: KClass<out R>): KFunction<T>? =
+        converters.find { (key, _) -> input.isSubclassOf(key) }?.second
 
     companion object {
         fun newInstance(param: KParameter): ParameterForMap<*> {
@@ -42,19 +42,19 @@ private fun <T> Collection<KFunction<T>>.getConverterMapFromFunctions(): Set<Pai
         }.toSet()
 }
 
-private fun <T : Any> creatorsFromConstructors(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
+private fun <T : Any> convertersFromConstructors(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
     return clazz.constructors.getConverterMapFromFunctions()
 }
 
 @Suppress("UNCHECKED_CAST")
-private fun <T : Any> creatorsFromStaticMethods(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
+private fun <T : Any> convertersFromStaticMethods(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
     val staticFunctions: Collection<KFunction<T>> = clazz.staticFunctions as Collection<KFunction<T>>
 
     return staticFunctions.getConverterMapFromFunctions()
 }
 
 @Suppress("UNCHECKED_CAST")
-private fun <T : Any> creatorsFromCompanionObject(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
+private fun <T : Any> convertersFromCompanionObject(clazz: KClass<T>): Set<Pair<KClass<*>, KFunction<T>>> {
     return clazz.companionObjectInstance?.let { companionObject ->
         companionObject::class.functions
             .filter { it.annotations.any { annotation -> annotation is KConverter } }