Switch from koin to micronaut-inject

2020-10-30 02:27:22 +01:00
parent 78b84dc62a
commit 6a43acfd46
70 changed files with 728 additions and 439 deletions
@@ -3,6 +3,7 @@ import be.simplenotes.Libs
 plugins {
    id("be.simplenotes.base")
    id("be.simplenotes.kotlinx-serialization")
+    kotlin("kapt")
 }

 dependencies {
@@ -11,8 +12,10 @@ dependencies {
    implementation(project(":simplenotes-persistance"))
    implementation(project(":simplenotes-search"))

+    implementation(Libs.micronaut)
+    kapt(Libs.micronautProcessor)
+
    implementation(Libs.kotlinxSerializationJson)
-    implementation(Libs.koinCore)
    implementation(Libs.arrowCoreData)
    implementation(Libs.konform)
    implementation(Libs.jbcrypt)
@@ -1,37 +0,0 @@
-package be.simplenotes.domain
-
-import be.simplenotes.domain.security.BcryptPasswordHash
-import be.simplenotes.domain.security.JwtPayloadExtractor
-import be.simplenotes.domain.security.PasswordHash
-import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.domain.usecases.NoteService
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.export.ExportUseCase
-import be.simplenotes.domain.usecases.export.ExportUseCaseImpl
-import be.simplenotes.domain.usecases.markdown.MarkdownConverter
-import be.simplenotes.domain.usecases.markdown.MarkdownConverterImpl
-import be.simplenotes.domain.usecases.users.delete.DeleteUseCase
-import be.simplenotes.domain.usecases.users.delete.DeleteUseCaseImpl
-import be.simplenotes.domain.usecases.users.login.LoginUseCase
-import be.simplenotes.domain.usecases.users.login.LoginUseCaseImpl
-import be.simplenotes.domain.usecases.users.register.RegisterUseCase
-import be.simplenotes.domain.usecases.users.register.RegisterUseCaseImpl
-import org.koin.dsl.module
-
-val domainModule = module {
-    single<LoginUseCase> { LoginUseCaseImpl(get(), get(), get()) }
-    single<RegisterUseCase> { RegisterUseCaseImpl(get(), get()) }
-    single<DeleteUseCase> { DeleteUseCaseImpl(get(), get(), get()) }
-    single { UserService(get(), get(), get(), get()) }
-    single<PasswordHash> { BcryptPasswordHash() }
-    single { SimpleJwt(get()) }
-    single { JwtPayloadExtractor(get()) }
-    single {
-        NoteService(get(), get(), get(), get()).apply {
-            dropAllIndexes()
-            indexAll()
-        }
-    }
-    single<MarkdownConverter> { MarkdownConverterImpl() }
-    single<ExportUseCase> { ExportUseCaseImpl(get(), get()) }
-}
@@ -2,7 +2,9 @@ package be.simplenotes.domain.security

 import be.simplenotes.types.LoggedInUser
 import com.auth0.jwt.exceptions.JWTVerificationException
+import javax.inject.Singleton

+@Singleton
 class JwtPayloadExtractor(private val jwt: SimpleJwt) {
    operator fun invoke(token: String): LoggedInUser? = try {
        val decodedJWT = jwt.verifier.verify(token)
@@ -1,13 +1,19 @@
 package be.simplenotes.domain.security

 import org.mindrot.jbcrypt.BCrypt
+import javax.inject.Inject
+import javax.inject.Singleton

 internal interface PasswordHash {
    fun crypt(password: String): String
    fun verify(password: String, hashedPassword: String): Boolean
 }

-internal class BcryptPasswordHash(test: Boolean = false) : PasswordHash {
+@Singleton
+internal class BcryptPasswordHash constructor(test: Boolean) : PasswordHash {
+    @Inject
+    constructor() : this(false)
+
    private val rounds = if (test) 4 else 10
    override fun crypt(password: String) = BCrypt.hashpw(password, BCrypt.gensalt(rounds))!!
    override fun verify(password: String, hashedPassword: String) = BCrypt.checkpw(password, hashedPassword)
@@ -7,10 +7,12 @@ import com.auth0.jwt.JWTVerifier
 import com.auth0.jwt.algorithms.Algorithm
 import java.util.*
 import java.util.concurrent.TimeUnit
+import javax.inject.Singleton

 internal const val userIdField = "i"
 internal const val usernameField = "u"

+@Singleton
 class SimpleJwt(jwtConfig: JwtConfig) {
    private val validityInMs = TimeUnit.MILLISECONDS.convert(jwtConfig.validity, jwtConfig.timeUnit)
    private val algorithm = Algorithm.HMAC256(jwtConfig.secret)
@@ -12,7 +12,9 @@ import be.simplenotes.types.Note
 import be.simplenotes.types.PersistedNote
 import be.simplenotes.types.PersistedNoteMetadata
 import java.util.*
+import javax.inject.Singleton

+@Singleton
 class NoteService(
    private val markdownConverter: MarkdownConverter,
    private val noteRepository: NoteRepository,
@@ -4,7 +4,9 @@ import be.simplenotes.domain.usecases.export.ExportUseCase
 import be.simplenotes.domain.usecases.users.delete.DeleteUseCase
 import be.simplenotes.domain.usecases.users.login.LoginUseCase
 import be.simplenotes.domain.usecases.users.register.RegisterUseCase
+import javax.inject.Singleton

+@Singleton
 class UserService(
    loginUseCase: LoginUseCase,
    registerUseCase: RegisterUseCase,
@@ -2,6 +2,7 @@ package be.simplenotes.domain.usecases.export

 import be.simplenotes.persistance.repositories.NoteRepository
 import be.simplenotes.types.ExportedNote
+import io.micronaut.context.annotation.Primary
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
@@ -9,8 +10,14 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import javax.inject.Singleton

-internal class ExportUseCaseImpl(private val noteRepository: NoteRepository, private val json: Json) : ExportUseCase {
+@Primary
+@Singleton
+internal class ExportUseCaseImpl(
+    private val noteRepository: NoteRepository,
+    private val json: Json,
+) : ExportUseCase {
    override fun exportAsJson(userId: Int): String {
        val notes = noteRepository.export(userId)
        return json.encodeToString(ListSerializer(ExportedNote.serializer()), notes)
@@ -14,6 +14,7 @@ import io.konform.validation.ValidationErrors
 import org.yaml.snakeyaml.Yaml
 import org.yaml.snakeyaml.parser.ParserException
 import org.yaml.snakeyaml.scanner.ScannerException
+import javax.inject.Singleton

 sealed class MarkdownParsingError
 object MissingMeta : MarkdownParsingError()
@@ -28,6 +29,7 @@ interface MarkdownConverter {
    fun renderDocument(input: String): Either<MarkdownParsingError, Document>
 }

+@Singleton
 internal class MarkdownConverterImpl : MarkdownConverter {
    private val yamlBoundPattern = "-{3}".toRegex()
    private fun splitMetaFromDocument(input: String): Either<MissingMeta, MetaMdPair> {
@@ -7,7 +7,11 @@ import be.simplenotes.domain.security.PasswordHash
 import be.simplenotes.domain.validation.UserValidations
 import be.simplenotes.persistance.repositories.UserRepository
 import be.simplenotes.search.NoteSearcher
+import io.micronaut.context.annotation.Primary
+import javax.inject.Singleton

+@Primary
+@Singleton
 internal class DeleteUseCaseImpl(
    private val userRepository: UserRepository,
    private val passwordHash: PasswordHash,
@@ -8,7 +8,11 @@ import be.simplenotes.domain.security.SimpleJwt
 import be.simplenotes.domain.validation.UserValidations
 import be.simplenotes.persistance.repositories.UserRepository
 import be.simplenotes.types.LoggedInUser
+import io.micronaut.context.annotation.Primary
+import javax.inject.Singleton

+@Singleton
+@Primary
 internal class LoginUseCaseImpl(
    private val userRepository: UserRepository,
    private val passwordHash: PasswordHash,
@@ -7,7 +7,11 @@ import be.simplenotes.domain.security.PasswordHash
 import be.simplenotes.domain.validation.UserValidations
 import be.simplenotes.persistance.repositories.UserRepository
 import be.simplenotes.types.PersistedUser
+import io.micronaut.context.annotation.Primary
+import javax.inject.Singleton

+@Primary
+@Singleton
 internal class RegisterUseCaseImpl(
    private val userRepository: UserRepository,
    private val passwordHash: PasswordHash