From 81d290bc8658841f48d8a7fc10d88813eba16ffc Mon Sep 17 00:00:00 2001 From: adamw Date: Mon, 24 Jul 2017 17:05:07 +0200 Subject: Hiding specific implementation types --- .../sttp/asynchttpclient/future/FutureAsyncHttpClientHandler.scala | 7 ++++--- .../sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala | 7 ++++--- .../sttp/asynchttpclient/scalaz/ScalazAsyncHttpClientHandler.scala | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'async-http-client-handler') diff --git a/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/FutureAsyncHttpClientHandler.scala b/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/FutureAsyncHttpClientHandler.scala index 11808d3..b0a36f9 100644 --- a/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/FutureAsyncHttpClientHandler.scala +++ b/async-http-client-handler/future/src/main/scala/com/softwaremill/sttp/asynchttpclient/future/FutureAsyncHttpClientHandler.scala @@ -2,6 +2,7 @@ package com.softwaremill.sttp.asynchttpclient.future import java.nio.ByteBuffer +import com.softwaremill.sttp.SttpHandler import com.softwaremill.sttp.asynchttpclient.{ AsyncHttpClientHandler, MonadAsyncError @@ -39,7 +40,7 @@ object FutureAsyncHttpClientHandler { */ def apply()( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) - : FutureAsyncHttpClientHandler = + : SttpHandler[Future, Nothing] = new FutureAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) @@ -50,7 +51,7 @@ object FutureAsyncHttpClientHandler { */ def usingConfig(cfg: AsyncHttpClientConfig)( implicit ec: ExecutionContext = ExecutionContext.Implicits.global) - : FutureAsyncHttpClientHandler = + : SttpHandler[Future, Nothing] = new FutureAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) @@ -61,7 +62,7 @@ object FutureAsyncHttpClientHandler { */ def usingClient(client: AsyncHttpClient)(implicit ec: ExecutionContext = ExecutionContext.Implicits.global) - : FutureAsyncHttpClientHandler = + : SttpHandler[Future, Nothing] = new FutureAsyncHttpClientHandler(client, closeClient = false) } diff --git a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala index 8e6c70d..2357c06 100644 --- a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala +++ b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala @@ -2,6 +2,7 @@ package com.softwaremill.sttp.asynchttpclient.monix import java.nio.ByteBuffer +import com.softwaremill.sttp.SttpHandler import com.softwaremill.sttp.asynchttpclient.{ AsyncHttpClientHandler, MonadAsyncError @@ -43,7 +44,7 @@ object MonixAsyncHttpClientHandler { * global scheduler. */ def apply()(implicit s: Scheduler = Scheduler.Implicits.global) - : MonixAsyncHttpClientHandler = + : SttpHandler[Task, Observable[ByteBuffer]] = new MonixAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) @@ -53,7 +54,7 @@ object MonixAsyncHttpClientHandler { */ def usingConfig(cfg: AsyncHttpClientConfig)(implicit s: Scheduler = Scheduler.Implicits.global) - : MonixAsyncHttpClientHandler = + : SttpHandler[Task, Observable[ByteBuffer]] = new MonixAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) @@ -63,7 +64,7 @@ object MonixAsyncHttpClientHandler { */ def usingClient(client: AsyncHttpClient)(implicit s: Scheduler = Scheduler.Implicits.global) - : MonixAsyncHttpClientHandler = + : SttpHandler[Task, Observable[ByteBuffer]] = new MonixAsyncHttpClientHandler(client, closeClient = false) } diff --git a/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/ScalazAsyncHttpClientHandler.scala b/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/ScalazAsyncHttpClientHandler.scala index f4de2eb..ef06a41 100644 --- a/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/ScalazAsyncHttpClientHandler.scala +++ b/async-http-client-handler/scalaz/src/main/scala/com/softwaremill/sttp/asynchttpclient/scalaz/ScalazAsyncHttpClientHandler.scala @@ -2,6 +2,7 @@ package com.softwaremill.sttp.asynchttpclient.scalaz import java.nio.ByteBuffer +import com.softwaremill.sttp.SttpHandler import com.softwaremill.sttp.asynchttpclient.{ AsyncHttpClientHandler, MonadAsyncError @@ -31,13 +32,13 @@ class ScalazAsyncHttpClientHandler private (asyncHttpClient: AsyncHttpClient, } object ScalazAsyncHttpClientHandler { - def apply(): ScalazAsyncHttpClientHandler = + def apply(): SttpHandler[Task, Nothing] = new ScalazAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) - def usingConfig(cfg: AsyncHttpClientConfig): ScalazAsyncHttpClientHandler = + def usingConfig(cfg: AsyncHttpClientConfig): SttpHandler[Task, Nothing] = new ScalazAsyncHttpClientHandler(new DefaultAsyncHttpClient(), closeClient = true) - def usingClient(client: AsyncHttpClient): ScalazAsyncHttpClientHandler = + def usingClient(client: AsyncHttpClient): SttpHandler[Task, Nothing] = new ScalazAsyncHttpClientHandler(client, closeClient = false) } -- cgit v1.2.3