diff options
10 files changed, 31 insertions, 21 deletions
diff --git a/async-http-client-handler/cats/src/main/scala/com/softwaremill/sttp/asynchttpclient/cats/AsyncHttpClientCatsHandler.scala b/async-http-client-handler/cats/src/main/scala/com/softwaremill/sttp/asynchttpclient/cats/AsyncHttpClientCatsHandler.scala index 9948d42..fd4d88d 100644 --- a/async-http-client-handler/cats/src/main/scala/com/softwaremill/sttp/asynchttpclient/cats/AsyncHttpClientCatsHandler.scala +++ b/async-http-client-handler/cats/src/main/scala/com/softwaremill/sttp/asynchttpclient/cats/AsyncHttpClientCatsHandler.scala @@ -47,7 +47,8 @@ object AsyncHttpClientCatsHandler { new FollowRedirectsHandler[F, Nothing]( new AsyncHttpClientCatsHandler(asyncHttpClient, closeClient)) - def apply[F[_]: Async](connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) + def apply[F[_]: Async]( + connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) : SttpHandler[F, Nothing] = AsyncHttpClientCatsHandler( AsyncHttpClientHandler.defaultClient(connectionTimeout.toMillis.toInt), diff --git a/async-http-client-handler/fs2/src/main/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2Handler.scala b/async-http-client-handler/fs2/src/main/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2Handler.scala index a33932b..1462951 100644 --- a/async-http-client-handler/fs2/src/main/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2Handler.scala +++ b/async-http-client-handler/fs2/src/main/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2Handler.scala @@ -64,7 +64,8 @@ object AsyncHttpClientFs2Handler { * e.g. mapping responses. Defaults to the global execution * context. */ - def apply[F[_]: Effect](connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout)( + def apply[F[_]: Effect](connectionTimeout: FiniteDuration = + SttpHandler.DefaultConnectionTimeout)( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) : SttpHandler[F, Stream[F, ByteBuffer]] = AsyncHttpClientFs2Handler[F]( diff --git a/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureHandler.scala b/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureHandler.scala index 6e0a22c..371b23c 100644 --- a/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureHandler.scala +++ b/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureHandler.scala @@ -45,7 +45,8 @@ object AsyncHttpClientFutureHandler { * e.g. mapping responses. Defaults to the global execution * context. */ - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout)( + def apply(connectionTimeout: FiniteDuration = + SttpHandler.DefaultConnectionTimeout)( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) : SttpHandler[Future, Nothing] = AsyncHttpClientFutureHandler( diff --git a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/AsyncHttpClientMonixHandler.scala b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/AsyncHttpClientMonixHandler.scala index 7cfcb43..f01725f 100644 --- a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/AsyncHttpClientMonixHandler.scala +++ b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/AsyncHttpClientMonixHandler.scala @@ -62,7 +62,8 @@ object AsyncHttpClientMonixHandler { * @param s The scheduler used for streaming request bodies. Defaults to the * global scheduler. */ - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout)( + def apply(connectionTimeout: FiniteDuration = + SttpHandler.DefaultConnectionTimeout)( implicit s: Scheduler = Scheduler.Implicits.global) : SttpHandler[Task, Observable[ByteBuffer]] = AsyncHttpClientMonixHandler( diff --git a/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/AsyncHttpClientScalazHandler.scala b/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/AsyncHttpClientScalazHandler.scala index 0e80a29..2ba00d7 100644 --- a/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/AsyncHttpClientScalazHandler.scala +++ b/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/AsyncHttpClientScalazHandler.scala @@ -43,7 +43,8 @@ object AsyncHttpClientScalazHandler { new FollowRedirectsHandler[Task, Nothing]( new AsyncHttpClientScalazHandler(asyncHttpClient, closeClient)) - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) + def apply( + connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) : SttpHandler[Task, Nothing] = AsyncHttpClientScalazHandler( AsyncHttpClientHandler.defaultClient(connectionTimeout.toMillis.toInt), diff --git a/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala b/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala index 984ecf6..8b6d49c 100644 --- a/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala +++ b/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala @@ -297,7 +297,8 @@ abstract class AsyncHttpClientHandler[R[_], S](asyncHttpClient: AsyncHttpClient, object AsyncHttpClientHandler { - private[asynchttpclient] def defaultClient(connectionTimeout: Int): AsyncHttpClient = + private[asynchttpclient] def defaultClient( + connectionTimeout: Int): AsyncHttpClient = new DefaultAsyncHttpClient( new DefaultAsyncHttpClientConfig.Builder() .setConnectTimeout(connectionTimeout) diff --git a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionHandler.scala b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionHandler.scala index 9b73298..c482e6d 100644 --- a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionHandler.scala +++ b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionHandler.scala @@ -258,7 +258,8 @@ class HttpURLConnectionHandler private (connectionTimeout: FiniteDuration) object HttpURLConnectionHandler { - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) + def apply( + connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout) : SttpHandler[Id, Nothing] = new FollowRedirectsHandler[Id, Nothing]( new HttpURLConnectionHandler(connectionTimeout)) diff --git a/core/src/main/scala/com/softwaremill/sttp/SttpHandler.scala b/core/src/main/scala/com/softwaremill/sttp/SttpHandler.scala index b2019dc..cb03567 100644 --- a/core/src/main/scala/com/softwaremill/sttp/SttpHandler.scala +++ b/core/src/main/scala/com/softwaremill/sttp/SttpHandler.scala @@ -23,4 +23,4 @@ trait SttpHandler[R[_], -S] { object SttpHandler { private[sttp] val DefaultConnectionTimeout = 30.seconds -}
\ No newline at end of file +} diff --git a/okhttp-handler/monix/src/main/scala/com/softwaremill/sttp/okhttp/monix/OkHttpMonixHandler.scala b/okhttp-handler/monix/src/main/scala/com/softwaremill/sttp/okhttp/monix/OkHttpMonixHandler.scala index 8d20bad..b4bcbcf 100644 --- a/okhttp-handler/monix/src/main/scala/com/softwaremill/sttp/okhttp/monix/OkHttpMonixHandler.scala +++ b/okhttp-handler/monix/src/main/scala/com/softwaremill/sttp/okhttp/monix/OkHttpMonixHandler.scala @@ -85,12 +85,13 @@ object OkHttpMonixHandler { implicit s: Scheduler): SttpHandler[Task, Observable[ByteBuffer]] = new FollowRedirectsHandler(new OkHttpMonixHandler(client, closeClient)(s)) - def apply(connectionTimeout: FiniteDuration = SttpHandler.DefaultConnectionTimeout)( + def apply(connectionTimeout: FiniteDuration = + SttpHandler.DefaultConnectionTimeout)( implicit s: Scheduler = Scheduler.Implicits.global) : SttpHandler[Task, Observable[ByteBuffer]] = - OkHttpMonixHandler( - OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, connectionTimeout.toMillis), - closeClient = true)(s) + OkHttpMonixHandler(OkHttpHandler.defaultClient(DefaultReadTimeout.toMillis, + connectionTimeout.toMillis), + closeClient = true)(s) def usingClient(client: OkHttpClient)(implicit s: Scheduler = Scheduler.Implicits.global) 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) |