diff options
author | adamw <adam@warski.org> | 2017-10-06 14:19:44 +0200 |
---|---|---|
committer | adamw <adam@warski.org> | 2017-10-06 14:19:44 +0200 |
commit | bb7abc189d9a5f079caa47a4508b5ae585dc8bcf (patch) | |
tree | 4d096e1b0c78156df923a7cf3282a86507b8ef8b /async-http-client-backend/future | |
parent | 43baccc0edf12e8951c903d6697d7ee24a201e63 (diff) | |
download | sttp-bb7abc189d9a5f079caa47a4508b5ae585dc8bcf.tar.gz sttp-bb7abc189d9a5f079caa47a4508b5ae585dc8bcf.tar.bz2 sttp-bb7abc189d9a5f079caa47a4508b5ae585dc8bcf.zip |
#10: add proxy support
Diffstat (limited to 'async-http-client-backend/future')
-rw-r--r-- | async-http-client-backend/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureBackend.scala | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/async-http-client-backend/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureBackend.scala b/async-http-client-backend/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureBackend.scala index a46ed0d..6778fa0 100644 --- a/async-http-client-backend/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureBackend.scala +++ b/async-http-client-backend/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/AsyncHttpClientFutureBackend.scala @@ -3,7 +3,12 @@ package com.softwaremill.sttp.asynchttpclient.future import java.nio.ByteBuffer import com.softwaremill.sttp.asynchttpclient.AsyncHttpClientBackend -import com.softwaremill.sttp.{FollowRedirectsBackend, FutureMonad, SttpBackend} +import com.softwaremill.sttp.{ + FollowRedirectsBackend, + FutureMonad, + SttpBackend, + SttpBackendOptions +} import org.asynchttpclient.{ AsyncHttpClient, AsyncHttpClientConfig, @@ -11,7 +16,6 @@ import org.asynchttpclient.{ } import org.reactivestreams.Publisher -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} class AsyncHttpClientFutureBackend private ( @@ -45,13 +49,11 @@ object AsyncHttpClientFutureBackend { * e.g. mapping responses. Defaults to the global execution * context. */ - def apply(connectionTimeout: FiniteDuration = - SttpBackend.DefaultConnectionTimeout)( + def apply(options: SttpBackendOptions = SttpBackendOptions.Default)( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) : SttpBackend[Future, Nothing] = - AsyncHttpClientFutureBackend( - AsyncHttpClientBackend.defaultClient(connectionTimeout.toMillis.toInt), - closeClient = true) + AsyncHttpClientFutureBackend(AsyncHttpClientBackend.defaultClient(options), + closeClient = true) /** * @param ec The execution context for running non-network related operations, |