diff options
author | Bjørn Madsen <bm@aeons.dk> | 2017-08-09 22:17:53 +0200 |
---|---|---|
committer | Bjørn Madsen <bm@aeons.dk> | 2017-08-09 22:17:53 +0200 |
commit | 85f93f2ccd282cdfceda8ae76cdf3cbb36d20883 (patch) | |
tree | f656e434375c0515051f30eab6f09406d1c759b5 /okhttp-client-handler | |
parent | 18db8e9d1ee240d11b558cdb9b5c850c5b063080 (diff) | |
download | sttp-85f93f2ccd282cdfceda8ae76cdf3cbb36d20883.tar.gz sttp-85f93f2ccd282cdfceda8ae76cdf3cbb36d20883.tar.bz2 sttp-85f93f2ccd282cdfceda8ae76cdf3cbb36d20883.zip |
Move default content type to BasicRequestBody
Revert BodySerializer to be a function, and remove SerializableBody
Diffstat (limited to 'okhttp-client-handler')
-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 79ca98b..f7c4466 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) => None + case PathBody(b, _) => Some(OkHttpRequestBody.create(null, b.toFile)) + case StreamBody(s) => None } } |