[Maintenance] removal of OptIn and Suppress

Removal of redundant usages of `@OptIn`and `@Suppress` annotations
InsertKoinIO · Sep 22, 2024 · 63986a6 · 63986a6
1 parent 74f9198
commit 63986a6
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 57 deletions.
diff --git a/...d/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt b/...d/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt
@@ -16,7 +16,6 @@ import org.koin.test.android.helper.Helper.componentCallbacks
 import org.koin.test.android.helper.Helper.koinComponent
 import org.koin.test.android.helper.Helper.koinScopeComponent
 
-@Suppress("OPT_IN_IS_NOT_ENABLED")
 @OptIn(KoinInternalApi::class)
 class AndroidKoinScopeExtTest : KoinTest {
 

diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt
@@ -18,9 +18,7 @@ package org.koin.androidx.compose
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import org.koin.compose.currentKoinScope
-import org.koin.compose.rememberCurrentKoinScope
 import org.koin.core.Koin
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.context.GlobalContext
 import org.koin.core.parameter.ParametersDefinition
 import org.koin.core.qualifier.Qualifier
@@ -36,7 +34,6 @@ import org.koin.core.scope.Scope
  * @author Arnaud Giuliani
  * @author Henrique Horbovyi
  */
-@OptIn(KoinInternalApi::class)
 @Composable
 @Deprecated("use koinInject() instead")
 inline fun <reified T> get(

diff --git a/...mpose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt b/...mpose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:OptIn(KoinInternalApi::class)
-
 package org.koin.androidx.compose
 
 import android.app.Application
@@ -71,4 +69,4 @@ private fun Context.findContextForKoin(): ComponentCallbacks {
         context = context.baseContext
     }
     return applicationContext as Application
-}
+}
diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("UNCHECKED_CAST")
 
 package org.koin.core.instance
 

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(KoinInternalApi::class)
 
 package org.koin.core.module.dsl
 
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.definition.KoinDefinition
 import org.koin.core.module.Module
 

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(KoinInternalApi::class)
 
 package org.koin.core.module.dsl
 
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.definition.KoinDefinition
 import org.koin.dsl.ScopeDSL
 

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(KoinInternalApi::class)
 
 package org.koin.core.module.dsl
 
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.definition.KoinDefinition
-import org.koin.core.module.*
 import org.koin.dsl.ScopeDSL
 
 /**

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(KoinInternalApi::class)
 
 package org.koin.core.module.dsl
 
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.definition.KoinDefinition
 import org.koin.core.module.Module
 

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt
@@ -214,7 +214,6 @@ class Scope(
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     private fun <T> resolveInstance(
         qualifier: Qualifier?,
         clazz: KClass<*>,
@@ -243,34 +242,34 @@ class Scope(
         qualifier: Qualifier?,
         clazz: KClass<*>,
         instanceContext: InstanceContext,
-        parameterDef: ParametersDefinition?
+        parameterDef: ParametersDefinition?,
     ) = (
             _koin.instanceRegistry.resolveInstance(qualifier, clazz, this.scopeQualifier, instanceContext)
-        ?: run {
-            _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in injected parameters")
-            _parameterStackLocal.get()?.firstOrNull()?.getOrNull<T>(clazz)
-        }
-        ?: run {
-            if (!isRoot){
-                _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look at scope source" )
-                _source?.let { source ->
-                    if (clazz.isInstance(source) && qualifier == null) {
-                        _source as? T
+                ?: run {
+                    _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in injected parameters")
+                    _parameterStackLocal.get()?.firstOrNull()?.getOrNull<T>(clazz)
+                }
+                ?: run {
+                    if (!isRoot) {
+                        _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look at scope source")
+                        _source?.let { source ->
+                            if (clazz.isInstance(source) && qualifier == null) {
+                                _source as? T
+                            } else null
+                        }
                     } else null
                 }
-            } else null
-        }
-        ?: run {
-            _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in other scopes" )
-            findInOtherScope<T>(clazz, qualifier, parameterDef)
-        }
-        ?: run {
-            if (parameterDef != null) {
-                _parameterStackLocal.remove()
-                _koin.logger.debug("|- << parameters")
-            }
-            throwDefinitionNotFound(qualifier, clazz)
-        })
+                ?: run {
+                    _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in other scopes")
+                    findInOtherScope<T>(clazz, qualifier, parameterDef)
+                }
+                ?: run {
+                    if (parameterDef != null) {
+                        _parameterStackLocal.remove()
+                        _koin.logger.debug("|- << parameters")
+                    }
+                    throwDefinitionNotFound(qualifier, clazz)
+                })
 
     @Suppress("UNCHECKED_CAST")
     private fun <T> getFromSource(clazz: KClass<*>): T? {

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt
@@ -18,14 +18,15 @@ package org.koin.dsl
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.definition.Definition
 import org.koin.core.definition.KoinDefinition
-import org.koin.core.module.*
+import org.koin.core.module.KoinDslMarker
+import org.koin.core.module.Module
+import org.koin.core.module._scopedInstanceFactory
 import org.koin.core.qualifier.Qualifier
 
 /**
  * DSL Scope Definition
  */
 @OptIn(KoinInternalApi::class)
-@Suppress("UNUSED_PARAMETER")
 @KoinDslMarker
 class ScopeDSL(val scopeQualifier: Qualifier, val module: Module) {
 

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt
@@ -38,7 +38,6 @@ class ParametersInjectionTest {
         assertEquals(42, a.id)
     }
 
-    @OptIn(KoinInternalApi::class)
     @Test
     fun inject_param_get_or_null() {
         ensureCanInjectParam(
@@ -355,7 +354,6 @@ class ParametersInjectionTest {
     }
 
     @Test
-    @OptIn(ExperimentalCoroutinesApi::class)
     fun `inject across multiple threads`(): TestResult {
         val times = 100
 

diff --git a/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt b/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt
@@ -13,7 +13,6 @@ import org.koin.test.mock.declareMock
 import org.mockito.BDDMockito.given
 import org.mockito.Mockito
 
-@Suppress("UNCHECKED_CAST")
 class DeclareMockTests : AutoCloseKoinTest() {
 
     @get:Rule

diff --git a/...n-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt b/...n-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt
@@ -11,7 +11,6 @@ import org.koin.test.KoinTest
 import org.koin.test.Simple
 import org.koin.test.inject
 
-@Suppress("UNCHECKED_CAST")
 class DeclareKoinContextFromExtensionTest : KoinTest {
 
     @JvmField

diff --git a/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt b/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt
@@ -14,7 +14,6 @@ import org.koin.test.mock.declareMock
 import org.mockito.BDDMockito.given
 import org.mockito.Mockito
 
-@Suppress("UNCHECKED_CAST")
 class DeclareMockTests : AutoCloseKoinTest() {
 
     @JvmField

diff --git a/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt b/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt
@@ -1,7 +1,6 @@
 package org.koin.test.verify
 
 import org.koin.core.annotation.KoinExperimentalAPI
-import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.module.Module
 import org.koin.core.time.Timer
 import kotlin.reflect.KClass
@@ -31,7 +30,6 @@ fun List<Module>.verifyAll(extraTypes: List<KClass<*>> = listOf()) {
  *
  * Help to check current factory of a Module
  */
-@OptIn(KoinInternalApi::class)
 @KoinExperimentalAPI
 object Verify {
 

diff --git a/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt b/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt
@@ -1,11 +1,11 @@
 package org.koin.ktor.ext
 
-import io.ktor.server.application.*
-import io.ktor.server.testing.*
+import io.ktor.server.application.install
+import io.ktor.server.testing.withApplication
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Test
-import org.koin.core.annotation.KoinReflectAPI
 import org.koin.core.context.stopKoin
 import org.koin.dsl.module
 import org.koin.ktor.plugin.Koin
@@ -21,11 +21,10 @@ class Foo(val name: String = "")
 class Bar(val name: String = "")
 class Bar2(val name: String = "")
 
-@OptIn(KoinReflectAPI::class)
 class KoinFeatureTest {
 
     @After
-    fun after(){
+    fun after() {
         stopKoin()
     }