avoid blocling on lazy expression

InsertKoinIO · Dec 16, 2019 · 45ce7d2 · 45ce7d2
1 parent 6fb5ac1
commit 45ce7d2
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 32 deletions.
diff --git a/koin-projects/examples/coffee-maker/src/main/kotlin/org/koin/example/CoffeeApp.kt b/koin-projects/examples/coffee-maker/src/main/kotlin/org/koin/example/CoffeeApp.kt
@@ -13,10 +13,11 @@ class CoffeeApp : KoinComponent {
 
 fun main() {
     startKoin {
+        printLogger()
         modules(listOf(coffeeAppModule))
     }
     val coffeeShop = CoffeeApp()
-    measureDuration("Make coffee") {
+    measureDuration("Got Coffee") {
         coffeeShop.maker.brew()
     }
     stopKoin()

diff --git a/koin-projects/gradle/versions.gradle b/koin-projects/gradle/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     // Koin
-    koin_version = '2.1.0-alpha-8'
+    koin_version = '2.1.0-alpha-9'
 
     // Kotlin
     kotlin_version = '1.3.61'

diff --git a/...cts/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/compat/ScopeCompat.kt b/...cts/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/compat/ScopeCompat.kt
@@ -45,7 +45,7 @@ object ScopeCompat {
             clazz: Class<T>,
             qualifier: Qualifier? = null,
             parameters: ParametersDefinition? = null
-    ): Lazy<T> = lazy { scope.getViewModel(owner, clazz.kotlin, qualifier, parameters) }
+    ): Lazy<T> = lazy(LazyThreadSafetyMode.NONE) { scope.getViewModel(owner, clazz.kotlin, qualifier, parameters) }
 
 
     /**

diff --git a/...oin-android-viewmodel/src/main/java/org/koin/android/viewmodel/ext/android/FragmentExt.kt b/...oin-android-viewmodel/src/main/java/org/koin/android/viewmodel/ext/android/FragmentExt.kt
@@ -31,14 +31,14 @@ inline fun <reified T : ViewModel> Fragment.sharedViewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> =
-    lazy { getSharedViewModel<T>(qualifier, parameters) }
+    lazy(LazyThreadSafetyMode.NONE) { getSharedViewModel<T>(qualifier, parameters) }
 
 fun <T : ViewModel> Fragment.sharedViewModel(
     clazz: KClass<T>,
     qualifier: Qualifier? = null,
     parameters: ParametersDefinition? = null
 ): Lazy<T> =
-    lazy { getSharedViewModel(clazz, qualifier, parameters) }
+    lazy(LazyThreadSafetyMode.NONE) { getSharedViewModel(clazz, qualifier, parameters) }
 
 inline fun <reified T : ViewModel> Fragment.getSharedViewModel(
     qualifier: Qualifier? = null,

diff --git a/...droid-viewmodel/src/main/java/org/koin/android/viewmodel/ext/android/LifecycleOwnerExt.kt b/...droid-viewmodel/src/main/java/org/koin/android/viewmodel/ext/android/LifecycleOwnerExt.kt
@@ -44,14 +44,14 @@ fun <T : ViewModel> LifecycleOwner.viewModel(
         qualifier: Qualifier? = null,
         parameters: ParametersDefinition? = null
 ): Lazy<T> {
-        return lazy { getViewModel(clazz, qualifier, parameters) }
+        return lazy(LazyThreadSafetyMode.NONE) { getViewModel(clazz, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> LifecycleOwner.viewModel(
         qualifier: Qualifier? = null,
         noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-        return lazy { getViewModel(T::class, qualifier, parameters) }
+        return lazy(LazyThreadSafetyMode.NONE) { getViewModel(T::class, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> LifecycleOwner.getViewModel(

diff --git a/...-projects/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/koin/KoinExt.kt b/...-projects/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/koin/KoinExt.kt
@@ -14,7 +14,7 @@ inline fun <reified T : ViewModel> Koin.viewModel(
         qualifier: Qualifier? = null,
         noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> Koin.getViewModel(

diff --git a/...rojects/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/scope/ScopeExt.kt b/...rojects/koin-android-viewmodel/src/main/java/org/koin/android/viewmodel/scope/ScopeExt.kt
@@ -37,7 +37,7 @@ inline fun <reified T : ViewModel> Scope.viewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(owner, T::class, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(owner, T::class, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> Scope.getViewModel(

diff --git a/...-projects/koin-android/src/main/java/org/koin/android/ext/android/ComponentCallbackExt.kt b/...-projects/koin-android/src/main/java/org/koin/android/ext/android/ComponentCallbackExt.kt
@@ -24,7 +24,7 @@ fun ComponentCallbacks.getKoin() = when (this) {
 inline fun <reified T : Any> ComponentCallbacks.inject(
         qualifier: Qualifier? = null,
         noinline parameters: ParametersDefinition? = null
-) = lazy { get<T>(qualifier, parameters) }
+) = lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }
 
 /**
  * get given dependency for Android koincomponent

diff --git a/...s/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/compat/ScopeCompat.kt b/...s/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/compat/ScopeCompat.kt
@@ -45,7 +45,7 @@ object ScopeCompat {
             clazz: Class<T>,
             qualifier: Qualifier? = null,
             parameters: ParametersDefinition? = null
-    ): Lazy<T> = lazy { scope.getViewModel(owner, clazz.kotlin, qualifier, parameters) }
+    ): Lazy<T> = lazy(LazyThreadSafetyMode.NONE) { scope.getViewModel(owner, clazz.kotlin, qualifier, parameters) }
 
 
     /**

diff --git a/...n-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ext/android/FragmentExt.kt b/...n-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ext/android/FragmentExt.kt
@@ -31,14 +31,14 @@ inline fun <reified T : ViewModel> Fragment.sharedViewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> =
-    lazy { getSharedViewModel<T>(qualifier, parameters) }
+    lazy(LazyThreadSafetyMode.NONE) { getSharedViewModel<T>(qualifier, parameters) }
 
 fun <T : ViewModel> Fragment.sharedViewModel(
     clazz: KClass<T>,
     qualifier: Qualifier? = null,
     parameters: ParametersDefinition? = null
 ): Lazy<T> =
-    lazy { getSharedViewModel(clazz, qualifier, parameters) }
+    lazy(LazyThreadSafetyMode.NONE) { getSharedViewModel(clazz, qualifier, parameters) }
 
 inline fun <reified T : ViewModel> Fragment.getSharedViewModel(
     qualifier: Qualifier? = null,

diff --git a/...oidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ext/android/LifecycleOwnerExt.kt b/...oidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ext/android/LifecycleOwnerExt.kt
@@ -38,14 +38,14 @@ fun <T : ViewModel> LifecycleOwner.viewModel(
     qualifier: Qualifier? = null,
     parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(clazz, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(clazz, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> LifecycleOwner.viewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(T::class, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(T::class, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> LifecycleOwner.getViewModel(

diff --git a/...model/src/main/java/org/koin/androidx/viewmodel/ext/android/SavedStateRegistryOwnerExt.kt b/...model/src/main/java/org/koin/androidx/viewmodel/ext/android/SavedStateRegistryOwnerExt.kt
@@ -39,14 +39,14 @@ fun <T : ViewModel> SavedStateRegistryOwner.viewModel(
     qualifier: Qualifier? = null,
     parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(clazz, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(clazz, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> SavedStateRegistryOwner.viewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(T::class, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(T::class, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> SavedStateRegistryOwner.getViewModel(

diff --git a/...rojects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/koin/KoinExt.kt b/...rojects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/koin/KoinExt.kt
@@ -15,15 +15,15 @@ inline fun <reified T : ViewModel> Koin.viewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> Koin.viewModel(
     owner: SavedStateRegistryOwner,
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { _scopeRegistry.rootScope.getViewModel<T>(owner, qualifier, parameters) }
 }
 
 inline fun <reified T : ViewModel> Koin.getViewModel(

diff --git a/...jects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/scope/ScopeExt.kt b/...jects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/scope/ScopeExt.kt
@@ -36,15 +36,15 @@ inline fun <reified T : ViewModel> Scope.viewModel(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(owner,T::class,qualifier,parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(owner,T::class,qualifier,parameters) }
 }
 
 inline fun <reified T : ViewModel> Scope.viewModel(
     owner: SavedStateRegistryOwner,
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy { getViewModel(owner,T::class,qualifier,parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getViewModel(owner,T::class,qualifier,parameters) }
 }
 
 inline fun <reified T : ViewModel> Scope.getViewModel(

diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/KoinComponent.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/KoinComponent.kt
@@ -52,7 +52,7 @@ inline fun <reified T> KoinComponent.inject(
         qualifier: Qualifier? = null,
         noinline parameters: ParametersDefinition? = null
 ): Lazy<T> =
-        lazy { getKoin().get<T>(qualifier, parameters) }
+        lazy(LazyThreadSafetyMode.NONE) { getKoin().get<T>(qualifier, parameters) }
 
 /**
  * Get instance instance from Koin by Primary Type P, as secondary type S

diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/logger/EmptyLogger.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/logger/EmptyLogger.kt
@@ -3,7 +3,9 @@ package org.koin.core.logger
 /**
  * No loggings Logger
  */
-class EmptyLogger : Logger(Level.ERROR) {
+class EmptyLogger : Logger(Level.NONE) {
 
-    override fun log(level: Level, msg: MESSAGE) {}
+    override fun log(level: Level, msg: MESSAGE) {
+        System.err.println("should see this - $level - $msg")
+    }
 }
diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/logger/Logger.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/logger/Logger.kt
@@ -45,7 +45,7 @@ const val KOIN_TAG = "[Koin]"
  * Log Level
  */
 enum class Level {
-    DEBUG, INFO, ERROR
+    DEBUG, INFO, ERROR, NONE
 }
 
 typealias MESSAGE = String
diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/Scope.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/Scope.kt
@@ -58,7 +58,7 @@ data class Scope(
             qualifier: Qualifier? = null,
             noinline parameters: ParametersDefinition? = null
     ): Lazy<T> =
-            lazy { get<T>(qualifier, parameters) }
+            lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }
 
     /**
      * Lazy inject a Koin instance if available
@@ -73,7 +73,7 @@ data class Scope(
             qualifier: Qualifier? = null,
             noinline parameters: ParametersDefinition? = null
     ): Lazy<T?> =
-            lazy { getOrNull<T>(qualifier, parameters) }
+            lazy(LazyThreadSafetyMode.NONE) { getOrNull<T>(qualifier, parameters) }
 
     /**
      * Get a Koin instance

diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/java/KoinJavaComponent.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/java/KoinJavaComponent.kt
@@ -42,7 +42,7 @@ object KoinJavaComponent {
         qualifier: Qualifier? = null,
         parameters: ParametersDefinition? = null
     ): Lazy<T> {
-        return lazy { get(clazz, qualifier, parameters) }
+        return lazy(LazyThreadSafetyMode.NONE) { get(clazz, qualifier, parameters) }
     }
 
     /**

diff --git a/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorApplicationExt.kt b/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorApplicationExt.kt
@@ -43,7 +43,7 @@ inline fun <reified T : Any> Application.inject(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ) =
-        lazy { get<T>(qualifier, parameters) }
+        lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }
 
 /**
  * Retrieve given dependency for KoinComponent

diff --git a/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorRouteExt.kt b/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorRouteExt.kt
@@ -36,7 +36,7 @@ inline fun <reified T : Any> Route.inject(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ) =
-        lazy { get<T>(qualifier, parameters) }
+        lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }
 
 /**
  * Retrieve given dependency for KoinComponent

diff --git a/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorRoutingExt.kt b/koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KtorRoutingExt.kt
@@ -36,7 +36,7 @@ inline fun <reified T : Any> Routing.inject(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
 ) =
-        lazy { get<T>(qualifier, parameters) }
+        lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }
 
 /**
  * Retrieve given dependency for KoinComponent

diff --git a/koin-projects/koin-test/src/main/kotlin/org/koin/test/KoinTest.kt b/koin-projects/koin-test/src/main/kotlin/org/koin/test/KoinTest.kt
@@ -45,4 +45,4 @@ inline fun <reified T> KoinTest.get(
 inline fun <reified T> KoinTest.inject(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
-): Lazy<T> = lazy { get<T>(qualifier, parameters) }
+): Lazy<T> = lazy(LazyThreadSafetyMode.NONE) { get<T>(qualifier, parameters) }