diff options
author | adamw <adam@warski.org> | 2018-03-21 19:01:02 -0400 |
---|---|---|
committer | adamw <adam@warski.org> | 2018-03-21 19:01:02 -0400 |
commit | d06c93b7691dec9b79e36c675440cfd28e93975c (patch) | |
tree | 5aaf420c913b1f25ce66cd07be6b904de8fdc748 /async-http-client-backend/src/main/scala/com | |
parent | 595b78eaf35673838697fe9ce8e6cf75bb2ac78b (diff) | |
download | sttp-d06c93b7691dec9b79e36c675440cfd28e93975c.tar.gz sttp-d06c93b7691dec9b79e36c675440cfd28e93975c.tar.bz2 sttp-d06c93b7691dec9b79e36c675440cfd28e93975c.zip |
Updating async-http-client
Diffstat (limited to 'async-http-client-backend/src/main/scala/com')
-rw-r--r-- | async-http-client-backend/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientBackend.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/async-http-client-backend/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientBackend.scala b/async-http-client-backend/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientBackend.scala index da40a18..30ae1ed 100644 --- a/async-http-client-backend/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientBackend.scala +++ b/async-http-client-backend/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientBackend.scala @@ -5,6 +5,8 @@ import java.nio.charset.Charset import com.softwaremill.sttp.ResponseAs.EagerResponseHandler import com.softwaremill.sttp._ +import io.netty.buffer.ByteBuf +import io.netty.handler.codec.http.HttpHeaders import org.asynchttpclient.AsyncHandler.State import org.asynchttpclient.handler.StreamedAsyncHandler import org.asynchttpclient.proxy.ProxyServer @@ -16,7 +18,6 @@ import org.asynchttpclient.{ DefaultAsyncHttpClient, DefaultAsyncHttpClientConfig, HttpResponseBodyPart, - HttpResponseHeaders, HttpResponseStatus, Param, RequestBuilder, @@ -56,7 +57,7 @@ abstract class AsyncHttpClientBackend[R[_], S](asyncHttpClient: AsyncHttpClient, override def responseMonad: MonadError[R] = rm - protected def streamBodyToPublisher(s: S): Publisher[ByteBuffer] + protected def streamBodyToPublisher(s: S): Publisher[ByteBuf] protected def publisherToStreamBody(p: Publisher[ByteBuffer]): S @@ -105,7 +106,7 @@ abstract class AsyncHttpClientBackend[R[_], S](asyncHttpClient: AsyncHttpClient, override def onBodyPartReceived(bodyPart: HttpResponseBodyPart): AsyncHandler.State = throw new IllegalStateException("Requested a streaming backend, unexpected eager body parts.") - override def onHeadersReceived(headers: HttpResponseHeaders): AsyncHandler.State = { + override def onHeadersReceived(headers: HttpHeaders): AsyncHandler.State = { builder.accumulate(headers) State.CONTINUE } @@ -234,7 +235,7 @@ abstract class AsyncHttpClientBackend[R[_], S](asyncHttpClient: AsyncHttpClient, response.getStatusCode, response.getStatusText, response.getHeaders - .iterator() + .iteratorAsString() .asScala .map(e => (e.getKey, e.getValue)) .toList, |