diff options
| author | adamw <adam@warski.org> | 2017-09-07 09:23:14 +0200 |
|---|---|---|
| committer | adamw <adam@warski.org> | 2017-09-07 09:23:14 +0200 |
| commit | 04f697f0b2016e9bdfa93eced3a48bb7d6e04a69 (patch) | |
| tree | dc57e8c17818305bc595b678d71900f0ddd2a943 /okhttp-handler/src/main/scala/com/softwaremill | |
| parent | 3c85a4a5acf7197c1822d4b6339168e36cf1b853 (diff) | |
| download | sttp-04f697f0b2016e9bdfa93eced3a48bb7d6e04a69.tar.gz sttp-04f697f0b2016e9bdfa93eced3a48bb7d6e04a69.tar.bz2 sttp-04f697f0b2016e9bdfa93eced3a48bb7d6e04a69.zip | |
Reformat
Diffstat (limited to 'okhttp-handler/src/main/scala/com/softwaremill')
| -rw-r--r-- | okhttp-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/okhttp-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala index 3e57930..c009fa5 100644 --- a/okhttp-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala +++ b/okhttp-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala @@ -154,8 +154,9 @@ object OkHttpHandler { .readTimeout(readTimeout, TimeUnit.MILLISECONDS) .build() - private[okhttp] def updateClientIfCustomReadTimeout[T, S](r: Request[T, S], - client: OkHttpClient): OkHttpClient = { + private[okhttp] def updateClientIfCustomReadTimeout[T, S]( + r: Request[T, S], + client: OkHttpClient): OkHttpClient = { val readTimeout = r.options.readTimeout if (readTimeout == DefaultReadTimeout) client else @@ -191,9 +192,9 @@ object OkHttpSyncHandler { def apply( connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) : SttpHandler[Id, Nothing] = - OkHttpSyncHandler( - OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, connectionTimeout.toMillis), - closeClient = true) + OkHttpSyncHandler(OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, + connectionTimeout.toMillis), + closeClient = true) def usingClient(client: OkHttpClient): SttpHandler[Id, Nothing] = OkHttpSyncHandler(client, closeClient = false) @@ -239,12 +240,13 @@ object OkHttpFutureHandler { new FollowRedirectsHandler[Future, Nothing]( new OkHttpFutureHandler(client, closeClient)) - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout)( + def apply(connectionTimeout: FiniteDuration = + SttpHandler.DefaultConnectionTimeout)( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) : SttpHandler[Future, Nothing] = - OkHttpFutureHandler( - OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, connectionTimeout.toMillis), - closeClient = true) + OkHttpFutureHandler(OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, + connectionTimeout.toMillis), + closeClient = true) def usingClient(client: OkHttpClient)(implicit ec: ExecutionContext = ExecutionContext.Implicits.global) |