Merge pull request http4s/http4s#1424 from aeons/kleislis-all-over

Deprecate Service and remove MaybeResponse
http4s · Oct 2, 2017 · 8953aef · 8953aef
2 parents 2cb71d2 + 8dfbc4b
commit 8953aef
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/async-http-client/src/main/scala/org/http4s/client/asynchttpclient/AsyncHttpClient.scala b/async-http-client/src/main/scala/org/http4s/client/asynchttpclient/AsyncHttpClient.scala
@@ -2,21 +2,22 @@ package org.http4s
 package client
 package asynchttpclient
 
+import cats.data.Kleisli
 import cats.effect._
 import cats.effect.implicits._
 import cats.implicits.{catsSyntaxEither => _, _}
-import fs2._
 import fs2.Stream._
+import fs2._
 import fs2.interop.reactivestreams.{StreamSubscriber, StreamUnicastPublisher}
 import java.nio.ByteBuffer
-import org.asynchttpclient.{Request => AsyncRequest, Response => _, _}
 import org.asynchttpclient.AsyncHandler.State
 import org.asynchttpclient.handler.StreamedAsyncHandler
 import org.asynchttpclient.request.body.generator.{
   BodyGenerator,
   ByteArrayBodyGenerator,
   ReactiveStreamsBodyGenerator
 }
+import org.asynchttpclient.{Request => AsyncRequest, Response => _, _}
 import org.http4s.util.threads._
 import org.reactivestreams.Publisher
 import scala.collection.JavaConverters._
@@ -45,7 +46,7 @@ object AsyncHttpClient {
       ec: ExecutionContext): Client[F] = {
     val client = new DefaultAsyncHttpClient(config)
     Client(
-      Service.lift { req: Request[F] =>
+      Kleisli { req =>
         F.async[DisposableResponse[F]] { cb =>
           client.executeRequest(toAsyncRequest(req), asyncHandler(cb))
           ()