Do not scan classpath on every HttpClient instantiation, provide bett…

…er error message
ktorio · Aug 22, 2018 · ce32922 · ce32922
1 parent 81f55a6
commit ce32922
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ktor-client/ktor-client-core/ktor-client-core-jvm/src/io/ktor/client/HttpClientJvm.kt b/ktor-client/ktor-client-core/ktor-client-core-jvm/src/io/ktor/client/HttpClientJvm.kt
@@ -7,11 +7,13 @@ import java.util.*
 actual fun HttpClient(
  useDefaultTransformers: Boolean,
  block: HttpClientConfig<*>.() -> Unit
-): HttpClient = HttpClient(findAvailableFactory(), useDefaultTransformers, block)
+): HttpClient = HttpClient(FACTORY, useDefaultTransformers, block)
 
 interface HttpClientEngineContainer {
  val factory: HttpClientEngineFactory<*>
 }
 
-internal fun findAvailableFactory(): HttpClientEngineFactory<*> =
- ServiceLoader.load(HttpClientEngineContainer::class.java).toList().first().factory
+private val FACTORY = ServiceLoader.load(HttpClientEngineContainer::class.java)
+ .toList()
+ .firstOrNull()
+ ?.factory ?: error("Failed to find HttpClientEngineContainer in classpath via ServiceLoader")