diff options
author | Omar Alejandro Mainegra Sarduy <omainegra@gmail.com> | 2017-08-11 17:45:29 -0400 |
---|---|---|
committer | Omar Alejandro Mainegra Sarduy <omainegra@gmail.com> | 2017-08-11 17:45:29 -0400 |
commit | ad28cb44c9a39b6bb5b7176358381b19b6e9ac28 (patch) | |
tree | 7a0a10f6270e3233633eda1e7f6b90ea4a12085d /okhttp-client-handler/src/main/scala/com | |
parent | c6c1f5a34930946e8ab4e9248b9255ce2e1464fe (diff) | |
parent | 00e10184c05431d2692d2b54425481a67ee3bc8e (diff) | |
download | sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.tar.gz sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.tar.bz2 sttp-ad28cb44c9a39b6bb5b7176358381b19b6e9ac28.zip |
Merge branch 'master' into okhttp3-monix
# Conflicts:
# build.sbt
# okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
Diffstat (limited to 'okhttp-client-handler/src/main/scala/com')
-rw-r--r-- | okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala index 2090e02..8f21eb0 100644 --- a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala +++ b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala @@ -49,19 +49,19 @@ abstract class OkHttpClientHandler[R[_], S](client: OkHttpClient) private def setBody(requestBody: RequestBody[S]): Option[OkHttpRequestBody] = { requestBody match { case NoBody => None - case StringBody(b, encoding) => + case StringBody(b, encoding, _) => Some(OkHttpRequestBody.create(MediaType.parse(encoding), b)) - case ByteArrayBody(b) => Some(OkHttpRequestBody.create(null, b)) - case ByteBufferBody(b) => Some(OkHttpRequestBody.create(null, b.array())) - case InputStreamBody(b) => + case ByteArrayBody(b, _) => Some(OkHttpRequestBody.create(null, b)) + case ByteBufferBody(b, _) => + Some(OkHttpRequestBody.create(null, b.array())) + case InputStreamBody(b, _) => Some(new OkHttpRequestBody() { override def writeTo(sink: BufferedSink): Unit = sink.writeAll(Okio.source(b)) override def contentType(): MediaType = null }) - case PathBody(b) => Some(OkHttpRequestBody.create(null, b.toFile)) - case SerializableBody(f, t) => setBody(f(t)) - case StreamBody(s) => streamToRequestBody(s) + case PathBody(b, _) => Some(OkHttpRequestBody.create(null, b.toFile)) + case StreamBody(s) => streamToRequestBody(s) } } |