Move project and splitting modules.

README.md

@@ -1,8 +1,8 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![CircleCI](https://circleci.com/gh/k163377/MapK.svg?style=svg)](https://circleci.com/gh/k163377/MapK)
-[![](https://jitci.com/gh/k163377/MapK/svg)](https://jitci.com/gh/k163377/MapK)
+[![CircleCI](https://circleci.com/gh/ProjectMapK/KMapper.svg?style=svg)](https://circleci.com/gh/ProjectMapK/KMapper)
+[![](https://jitci.com/gh/ProjectMapK/KMapper/svg)](https://jitci.com/gh/ProjectMapK/KMapper)
 
-MapK
+KMapper
 ====
 This is a Mapper Libraly like a `ModelMapper` for `Kotlin`.  
 You can call `KFunction`(e.g. `constructor`) from `Object`.
@@ -19,11 +19,11 @@ val dst = Dst(
 )
 
 // after
-val newInstance = KMapper(Dst::class.primaryConstructor!!).map(src)
+val newInstance = KMapper(::Dst).map(src)
 ```
 ## How to use
 Published on JitPack.  
-Please see [here](https://jitpack.io/#k163377/MapK) for the introduction method.  
+Please see [here](https://jitpack.io/#ProjectMapK/KMapper/) for the introduction method.  
 
 ## Usages
 ### From multiple resources

build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
 }
 
-group = "com.wrongwrong"
-version = "0.1"
+group = "com.mapk"
+version = "0.10"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -24,11 +24,13 @@ buildscript {
 
 repositories {
     mavenCentral()
+    maven { setUrl("https://jitpack.io") }
 }
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(kotlin("reflect"))
+    implementation("com.github.ProjectMapK:Shared:0.1")
 
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
     testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.0") {

settings.gradle.kts

@@ -1 +1 @@
-rootProject.name = "MapK"
+rootProject.name = "KMapper"

src/main/kotlin/com/wrongwrong/mapk/annotations/KConstructor.kt → src/main/kotlin/com/mapk/annotations/KConstructor.kt

@@ -1,4 +1,4 @@
-package com.wrongwrong.mapk.annotations
+package com.mapk.annotations
 
 @Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)

src/main/kotlin/com/wrongwrong/mapk/annotations/KGetterAlias.kt → src/main/kotlin/com/mapk/annotations/KGetterAlias.kt

@@ -1,4 +1,4 @@
-package com.wrongwrong.mapk.annotations
+package com.mapk.annotations
 
 @Target(AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.RUNTIME)

src/main/kotlin/com/wrongwrong/mapk/annotations/KPropertyIgnore.kt → src/main/kotlin/com/mapk/annotations/KPropertyIgnore.kt

@@ -1,4 +1,4 @@
-package com.wrongwrong.mapk.annotations
+package com.mapk.annotations
 
 @Target(AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.RUNTIME)

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

@@ -1,9 +1,12 @@
-package com.wrongwrong.mapk.core
-
-import com.wrongwrong.mapk.annotations.KConstructor
-import com.wrongwrong.mapk.annotations.KGetterAlias
-import com.wrongwrong.mapk.annotations.KPropertyAlias
-import com.wrongwrong.mapk.annotations.KPropertyIgnore
+package com.mapk.kmapper
+
+import com.mapk.annotations.KConstructor
+import com.mapk.annotations.KGetterAlias
+import com.mapk.annotations.KPropertyAlias
+import com.mapk.annotations.KPropertyIgnore
+import com.mapk.core.ArgumentBucket
+import com.mapk.core.EnumMapper
+import com.mapk.core.KFunctionForCall
 import java.lang.reflect.Method
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
@@ -58,7 +61,12 @@ class KMapper<T : Any> private constructor(
                 parameterMap[property.findAnnotation<KGetterAlias>()?.value ?: property.name]?.let {
                     // javaGetterを呼び出す方が高速
                     javaGetter.isAccessible = true
-                    argumentBucket.setArgument(javaGetter.invoke(src)?.let { value -> mapObject(it, value) }, it.index)
+                    argumentBucket.setArgument(javaGetter.invoke(src)?.let { value ->
+                        mapObject(
+                            it,
+                            value
+                        )
+                    }, it.index)
                     // 終了判定
                     if (argumentBucket.isInitialized) return
                 }
@@ -79,7 +87,12 @@ class KMapper<T : Any> private constructor(
 
     private fun bindArguments(argumentBucket: ArgumentBucket, srcPair: Pair<*, *>) {
         parameterMap[srcPair.first.toString()]?.let {
-            argumentBucket.setArgument(srcPair.second?.let { value -> mapObject(it, value) }, it.index)
+            argumentBucket.setArgument(srcPair.second?.let { value ->
+                mapObject(
+                    it,
+                    value
+                )
+            }, it.index)
         }
     }
 
@@ -133,7 +146,11 @@ internal fun <T : Any> getTarget(clazz: KClass<T>): KFunctionForCall<T> {
         clazz.companionObjectInstance?.let { companionObject ->
             companionObject::class.functions
                 .filter { it.annotations.any { annotation -> annotation is KConstructor } }
-                .map { KFunctionForCall(it, companionObject) as KFunctionForCall<T> }
+                .map { KFunctionForCall(
+                    it,
+                    companionObject
+                ) as KFunctionForCall<T>
+                }
         } ?: emptyList()
 
     val constructors: List<KFunctionForCall<T>> = factoryConstructor + clazz.constructors

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

@@ -1,6 +1,7 @@
-package com.wrongwrong.mapk.core
+package com.mapk.kmapper
 
-import com.wrongwrong.mapk.annotations.KConverter
+import com.mapk.annotations.KConverter
+import com.mapk.core.KFunctionWithInstance
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
@@ -16,7 +17,9 @@ internal class ParameterForMap<T : Any> private constructor(val index: Int, val
     }
     // リストの長さが小さいと期待されるためこの形で実装しているが、理想的にはmap的なものが使いたい
     private val creators: Set<Pair<KClass<*>, KFunction<T>>> by lazy {
-        creatorsFromConstructors(clazz) + creatorsFromStaticMethods(clazz) + creatorsFromCompanionObject(clazz)
+        creatorsFromConstructors(clazz) + creatorsFromStaticMethods(
+            clazz
+        ) + creatorsFromCompanionObject(clazz)
     }
 
     // 引数の型がcreatorに対して入力可能ならcreatorを返す
@@ -56,7 +59,10 @@ private fun <T : Any> creatorsFromCompanionObject(clazz: KClass<T>): Set<Pair<KC
         companionObject::class.functions
             .filter { it.annotations.any { annotation -> annotation is KConverter } }
             .map { function ->
-                val func: KFunction<T> = KFunctionWithInstance(function, companionObject) as KFunction<T>
+                val func: KFunction<T> = KFunctionWithInstance(
+                    function,
+                    companionObject
+                ) as KFunction<T>
 
                 (func.parameters.single().type.classifier as KClass<*>) to func
             }.toSet()

src/test/java/mapk/core/StaticMethodConverter.java → src/test/java/com/mapk/kmapper/StaticMethodConverter.java

@@ -1,6 +1,6 @@
-package mapk.core;
+package com.mapk.kmapper;
 
-import com.wrongwrong.mapk.annotations.KConverter;
+import com.mapk.annotations.KConverter;
 
 import java.util.Arrays;
 

src/test/kotlin/mapk/core/ConverterKMapperTest.kt → src/test/kotlin/com/mapk/kmapper/ConverterKMapperTest.kt

@@ -1,9 +1,8 @@
 @file:Suppress("unused")
 
-package mapk.core
+package com.mapk.kmapper
 
-import com.wrongwrong.mapk.annotations.KConverter
-import com.wrongwrong.mapk.core.KMapper
+import com.mapk.annotations.KConverter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.DisplayName

src/test/kotlin/mapk/core/EnumMappingTest.kt → src/test/kotlin/com/mapk/kmapper/EnumMappingTest.kt

@@ -1,8 +1,7 @@
 @file:Suppress("unused")
 
-package mapk.core
+package com.mapk.kmapper
 
-import com.wrongwrong.mapk.core.KMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.params.ParameterizedTest

src/test/kotlin/mapk/core/GetTargetTest.kt → src/test/kotlin/com/mapk/kmapper/GetTargetTest.kt

@@ -1,10 +1,9 @@
 @file:Suppress("unused")
 
-package mapk.core
+package com.mapk.kmapper
 
-import com.wrongwrong.mapk.annotations.KConstructor
-import com.wrongwrong.mapk.core.KFunctionForCall
-import com.wrongwrong.mapk.core.getTarget
+import com.mapk.annotations.KConstructor
+import com.mapk.core.KFunctionForCall
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor

src/test/kotlin/mapk/core/ParamAliasTest.kt → src/test/kotlin/com/mapk/kmapper/ParamAliasTest.kt

@@ -1,8 +1,7 @@
-package mapk.core
+package com.mapk.kmapper
 
-import com.wrongwrong.mapk.annotations.KGetterAlias
-import com.wrongwrong.mapk.annotations.KPropertyAlias
-import com.wrongwrong.mapk.core.KMapper
+import com.mapk.annotations.KGetterAlias
+import com.mapk.annotations.KPropertyAlias
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/mapk/core/PropertyNameConverterTest.kt → src/test/kotlin/com/mapk/kmapper/PropertyNameConverterTest.kt

@@ -1,7 +1,6 @@
-package mapk.core
+package com.mapk.kmapper
 
 import com.google.common.base.CaseFormat
-import com.wrongwrong.mapk.core.KMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
@@ -16,7 +15,12 @@ class PropertyNameConverterTest {
         val expected = "snakeCase"
         val src = mapOf("camel_case" to expected)
 
-        val mapper = KMapper(CamelCaseDst::class) { CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, it) }
+        val mapper = KMapper(CamelCaseDst::class) {
+            CaseFormat.LOWER_CAMEL.to(
+                CaseFormat.LOWER_UNDERSCORE,
+                it
+            )
+        }
         val result = mapper.map(src)
 
         assertEquals(expected, result.camelCase)