Move default content type to BasicRequestBody

Revert BodySerializer to be a function, and remove SerializableBody

1 files changed, 4 insertions, 7 deletions

diff --git a/circe/src/main/scala/com/softwaremill/sttp/circe.scala b/circe/src/main/scala/com/softwaremill/sttp/circe.scala
index f273e42..95a72e1 100644
--- a/circe/src/main/scala/com/softwaremill/sttp/circe.scala
+++ b/circe/src/main/scala/com/softwaremill/sttp/circe.scala
@@ -1,18 +1,15 @@
 package com.softwaremill.sttp
 
-import com.softwaremill.sttp.model.{ResponseAs, StringBody}
+import com.softwaremill.sttp.model._
 import io.circe.parser._
 import io.circe.{Decoder, Encoder}
 
-import scala.language.higherKinds
-
 package object circe {
   private[sttp] val ApplicationJsonContentType = "application/json"
 
-  implicit def circeBodySerializer[B: Encoder]: BodySerializer[B] =
-    BodySerializer.instance(
-      body => StringBody(Encoder[B].apply(body).noSpaces, Utf8),
-      ApplicationJsonContentType)
+  implicit def circeBodySerializer[B](
+      implicit encoder: Encoder[B]): BodySerializer[B] =
+    b => StringBody(encoder(b).noSpaces, Utf8, Some(ApplicationJsonContentType))
 
   def asJson[B: Decoder]: ResponseAs[Either[io.circe.Error, B], Nothing] =
     asString(Utf8).map(decode[B])