Change MonadError syntax to improve type inference

2 files changed, 7 insertions, 9 deletions

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 4ae0e33..1ffd372 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
@@ -86,9 +86,9 @@ object OkHttpMonixHandler {
 private[monix] object TaskMonad extends MonadAsyncError[Task] {
   override def unit[T](t: T): Task[T] = Task.now(t)
 
-  override def map[T, T2](fa: Task[T], f: (T) => T2): Task[T2] = fa.map(f)
+  override def map[T, T2](fa: Task[T])(f: (T) => T2): Task[T2] = fa.map(f)
 
-  override def flatMap[T, T2](fa: Task[T], f: (T) => Task[T2]): Task[T2] =
+  override def flatMap[T, T2](fa: Task[T])(f: (T) => Task[T2]): Task[T2] =
     fa.flatMap(f)
 
   override def async[T](
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 af44132..cef7054 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
@@ -89,11 +89,11 @@ abstract class OkHttpHandler[R[_], S](client: OkHttpClient)
     val code = res.code()
 
     val body = if (codeIsSuccess(code)) {
-      responseMonad.map(responseHandler(res).handle(responseAs, responseMonad),
-                        Right(_: T))
+      responseMonad.map(responseHandler(res).handle(responseAs, responseMonad))(
+        Right(_))
     } else {
-      responseMonad.map(responseHandler(res).handle(asString, responseMonad),
-                        Left(_: String))
+      responseMonad.map(responseHandler(res).handle(asString, responseMonad))(
+        Left(_))
     }
 
     val headers = res
@@ -102,9 +102,7 @@ abstract class OkHttpHandler[R[_], S](client: OkHttpClient)
       .asScala
       .flatMap(name => res.headers().values(name).asScala.map((name, _)))
 
-    responseMonad.map(
-      body,
-      Response(_: Either[String, T], res.code(), headers.toList))
+    responseMonad.map(body)(Response(_, res.code(), headers.toList))
   }
 
   private def responseHandler(res: OkHttpResponse) =