Use mapstruct

persistance/src/main/kotlin/PersistanceModule.kt

@@ -15,6 +15,7 @@ import me.liuwj.ktorm.database.Database
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koin.dsl.onClose
+import org.mapstruct.factory.Mappers
 import javax.sql.DataSource
 
 private fun hikariDataSource(conf: DataSourceConfig): HikariDataSource {

persistance/src/main/kotlin/converters/UserConverter.kt

@@ -8,10 +8,9 @@ import org.mapstruct.Mapper
 
 @Mapper(uses = [UserEntityFactory::class])
 internal interface UserConverter {
-    fun toUser(userEntity: UserEntity): User
+    fun convertToUser(userEntity: UserEntity): User
-    fun toPersistedUser(userEntity: UserEntity): PersistedUser
+    fun convertToPersistedUser(userEntity: UserEntity): PersistedUser
-    fun toEntity(user: User): UserEntity
+    fun convertToEntity(user: User): UserEntity
-    fun toEntity(user: PersistedUser): UserEntity
 }
 
 internal class UserEntityFactory : Entity.Factory<UserEntity>()

persistance/src/main/kotlin/users/UserRepositoryImpl.kt

@@ -24,10 +24,10 @@ internal class UserRepositoryImpl(private val db: Database, private val converte
     }
 
     override fun find(username: String) = db.users.find { it.username eq username }
-        ?.let { converter.toPersistedUser(it) }
+        ?.let { converter.convertToPersistedUser(it) }
 
     override fun find(id: Int) = db.users.find { it.id eq id }?.let {
-        converter.toPersistedUser(it)
+        converter.convertToPersistedUser(it)
     }
 
     override fun exists(username: String) = db.users.any { it.username eq username }

persistance/src/test/kotlin/converters/UserConverterTest.kt

@@ -18,7 +18,7 @@ internal class UserConverterTest {
         }.apply {
             this["id"] = 2
         }
-        val user = converter.toUser(entity)
+        val user = converter.convertToUser(entity)
         assertThat(user).isEqualTo(User("test", "test2"))
     }
 
@@ -31,7 +31,7 @@ internal class UserConverterTest {
         }.apply {
             this["id"] = 2
         }
-        val user = converter.toPersistedUser(entity)
+        val user = converter.convertToPersistedUser(entity)
         assertThat(user).isEqualTo(PersistedUser("test", "test2", 2))
     }
 
@@ -39,7 +39,7 @@ internal class UserConverterTest {
     fun `convert User to UserEntity`() {
         val converter = Mappers.getMapper(UserConverter::class.java)
         val user = User("test", "test2")
-        val entity = converter.toEntity(user)
+        val entity = converter.convertToEntity(user)
 
         assertThat(entity)
             .hasFieldOrPropertyWithValue("username", "test")