From 509464752aa8cc0264d451997305af6c4e2db956 Mon Sep 17 00:00:00 2001 From: Grzegorz Bobryk Date: Mon, 28 Oct 2024 07:05:25 +0100 Subject: [PATCH] [Maintenance] replace `listOf()` with `emptyList()` `orEmpty` instead of elvis operator --- .../org/koin/test/verify/Verification.kt | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/Verification.kt b/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/Verification.kt index fbe7311c5..f77444a73 100644 --- a/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/Verification.kt +++ b/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/Verification.kt @@ -38,7 +38,7 @@ class Verification(val module: Module, extraTypes: List>, injections: private val extraKeys: List = (extraTypes + Verify.whiteList).map { it.getFullName() } internal val definitionIndex: List = allModules.flatMap { it.mappings.keys.toList() } private val verifiedFactories: HashMap, List>> = hashMapOf() - private val parameterInjectionIndex : Map> = injections?.associate { inj -> inj.targetType.getFullName() to inj.injectedTypes.map { it.getFullName() }.toList() } ?: emptyMap() + private val parameterInjectionIndex: Map> = injections?.associate { inj -> inj.targetType.getFullName() to inj.injectedTypes.map { it.getFullName() }.toList() }.orEmpty() fun verify() { factories.forEach { factory -> @@ -55,7 +55,7 @@ class Verification(val module: Module, extraTypes: List>, injections: ): List> { val beanDefinition = factory.beanDefinition println("\n|-> definition $beanDefinition") - if (beanDefinition.qualifier != null){ + if (beanDefinition.qualifier != null) { println("| qualifier: ${beanDefinition.qualifier}") } @@ -71,20 +71,20 @@ class Verification(val module: Module, extraTypes: List>, injections: constructor, functionType, index - ) - } + ) + } val verificationByStatus = verifications.groupBy { it.status } verificationByStatus[VerificationStatus.MISSING]?.let { list -> - val first = list.first() - val errorMessage = "Missing definition for '$first' in definition '$beanDefinition'." - val generateParameterInjection = "- Fix your Koin configuration -\n${generateFixDefinition(first)}\n${generateInjectionCode(beanDefinition,first)}" - System.err.println("* ----- > $errorMessage\n$generateParameterInjection") - throw MissingKoinDefinitionException(errorMessage) + val first = list.first() + val errorMessage = "Missing definition for '$first' in definition '$beanDefinition'." + val generateParameterInjection = "- Fix your Koin configuration -\n${generateFixDefinition(first)}\n${generateInjectionCode(beanDefinition, first)}" + System.err.println("* ----- > $errorMessage\n$generateParameterInjection") + throw MissingKoinDefinitionException(errorMessage) } verificationByStatus[VerificationStatus.CIRCULAR]?.let { list -> - val errorMessage = "Circular injection between ${list.first()} and '${functionType.qualifiedName}'.\nFix your Koin configuration!" - System.err.println("* ----- > $errorMessage") - throw CircularInjectionException(errorMessage) + val errorMessage = "Circular injection between ${list.first()} and '${functionType.qualifiedName}'.\nFix your Koin configuration!" + System.err.println("* ----- > $errorMessage") + throw CircularInjectionException(errorMessage) } return verificationByStatus[VerificationStatus.OK]?.map { @@ -120,7 +120,7 @@ class Verification(val module: Module, extraTypes: List>, injections: ): List { val constructorParameters = constructorFunction.parameters - if (constructorParameters.isEmpty()){ + if (constructorParameters.isEmpty()) { println("| no dependency to check") } else { println("| ${constructorParameters.size} dependencies to check") @@ -133,11 +133,11 @@ class Verification(val module: Module, extraTypes: List>, injections: val hasDefinition = isClassInDefinitionIndex(index, ctorParamFullClassName) val isParameterInjected = isClassInInjectionIndex(functionType, ctorParamFullClassName) - if (isParameterInjected){ + if (isParameterInjected) { println("| dependency '$ctorParamLabel' is injected") } val isWhiteList = ctorParamFullClassName in extraKeys - if (isWhiteList){ + if (isWhiteList) { println("| dependency '$ctorParamLabel' is whitelisted") } val isDefinitionDeclared = hasDefinition || isParameterInjected || isWhiteList @@ -148,16 +148,16 @@ class Verification(val module: Module, extraTypes: List>, injections: //TODO refactor to attach type / case of error when { - !isDefinitionDeclared -> VerifiedParameter(ctorParamLabel,ctorParamClass,VerificationStatus.MISSING) - isCircular -> VerifiedParameter(ctorParamLabel,ctorParamClass,VerificationStatus.CIRCULAR) - else -> VerifiedParameter(ctorParamLabel,ctorParamClass,VerificationStatus.OK) + !isDefinitionDeclared -> VerifiedParameter(ctorParamLabel, ctorParamClass, VerificationStatus.MISSING) + isCircular -> VerifiedParameter(ctorParamLabel, ctorParamClass, VerificationStatus.CIRCULAR) + else -> VerifiedParameter(ctorParamLabel, ctorParamClass, VerificationStatus.OK) } } } private fun isClassInInjectionIndex( classOrigin: KClass<*>, - ctorParamFullClassName: String + ctorParamFullClassName: String, ): Boolean { return parameterInjectionIndex[classOrigin.getFullName()]?.let { ctorParamFullClassName in it } ?: false } @@ -166,7 +166,7 @@ class Verification(val module: Module, extraTypes: List>, injections: index.any { k -> k.contains(ctorParamFullClassName) } } -data class VerifiedParameter(val name : String, val type : KClass<*>, val status: VerificationStatus){ +data class VerifiedParameter(val name: String, val type: KClass<*>, val status: VerificationStatus) { override fun toString(): String = "[field:'$name' - type:'${type.qualifiedName}']" }