diff options
author | adamw <adam@warski.org> | 2018-02-20 12:24:10 +0100 |
---|---|---|
committer | adamw <adam@warski.org> | 2018-02-20 12:24:10 +0100 |
commit | 52017e118df6cf22b95f4c10b6abe4162801a1ef (patch) | |
tree | 4acefa1d7de60c212c39b98bd93242e3b3db2791 /json | |
parent | e8b583709c9654c0ba16944a6242814d2355d4db (diff) | |
download | sttp-52017e118df6cf22b95f4c10b6abe4162801a1ef.tar.gz sttp-52017e118df6cf22b95f4c10b6abe4162801a1ef.tar.bz2 sttp-52017e118df6cf22b95f4c10b6abe4162801a1ef.zip |
New scalafmt settings
Diffstat (limited to 'json')
4 files changed, 7 insertions, 14 deletions
diff --git a/json/circe/src/main/scala/com/softwaremill/sttp/circe/package.scala b/json/circe/src/main/scala/com/softwaremill/sttp/circe/package.scala index ddc9583..d5b6a08 100644 --- a/json/circe/src/main/scala/com/softwaremill/sttp/circe/package.scala +++ b/json/circe/src/main/scala/com/softwaremill/sttp/circe/package.scala @@ -5,8 +5,7 @@ import io.circe.{Decoder, Encoder} package object circe { - implicit def circeBodySerializer[B]( - implicit encoder: Encoder[B]): BodySerializer[B] = + 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] = diff --git a/json/circe/src/test/scala/com/softwaremill/sttp/CirceTests.scala b/json/circe/src/test/scala/com/softwaremill/sttp/CirceTests.scala index 1e7dddc..d435267 100644 --- a/json/circe/src/test/scala/com/softwaremill/sttp/CirceTests.scala +++ b/json/circe/src/test/scala/com/softwaremill/sttp/CirceTests.scala @@ -84,8 +84,7 @@ class CirceTests extends FlatSpec with Matchers with EitherValues { case StringBody(body, "utf-8", Some(ApplicationJsonContentType)) => body case wrongBody => - fail( - s"Request body does not serialize to correct StringBody: $wrongBody") + fail(s"Request body does not serialize to correct StringBody: $wrongBody") } def runJsonResponseAs[A](responseAs: ResponseAs[A, Nothing]): String => A = @@ -95,8 +94,7 @@ class CirceTests extends FlatSpec with Matchers with EitherValues { case ResponseAsString("utf-8") => responseAs.g case ResponseAsString(encoding) => - fail( - s"MappedResponseAs wraps a ResponseAsString with wrong encoding: $encoding") + fail(s"MappedResponseAs wraps a ResponseAsString with wrong encoding: $encoding") case _ => fail("MappedResponseAs does not wrap a ResponseAsString") } diff --git a/json/json4s/src/main/scala/com/softwaremill/sttp/json4s/package.scala b/json/json4s/src/main/scala/com/softwaremill/sttp/json4s/package.scala index 4c7aa36..f19f776 100644 --- a/json/json4s/src/main/scala/com/softwaremill/sttp/json4s/package.scala +++ b/json/json4s/src/main/scala/com/softwaremill/sttp/json4s/package.scala @@ -4,11 +4,9 @@ import org.json4s._ import org.json4s.native.Serialization.{read, write} package object json4s { - implicit def json4sBodySerializer[B <: AnyRef]( - implicit formats: Formats = DefaultFormats): BodySerializer[B] = + implicit def json4sBodySerializer[B <: AnyRef](implicit formats: Formats = DefaultFormats): BodySerializer[B] = b => StringBody(write(b), Utf8, Some(ApplicationJsonContentType)) - def asJson[B: Manifest]( - implicit formats: Formats = DefaultFormats): ResponseAs[B, Nothing] = + def asJson[B: Manifest](implicit formats: Formats = DefaultFormats): ResponseAs[B, Nothing] = asString(Utf8).map(s => read[B](s)) } diff --git a/json/json4s/src/test/scala/com/softwaremill/sttp/Json4sTests.scala b/json/json4s/src/test/scala/com/softwaremill/sttp/Json4sTests.scala index bb4a774..c70a55c 100644 --- a/json/json4s/src/test/scala/com/softwaremill/sttp/Json4sTests.scala +++ b/json/json4s/src/test/scala/com/softwaremill/sttp/Json4sTests.scala @@ -49,8 +49,7 @@ class Json4sTests extends FlatSpec with Matchers with EitherValues { case StringBody(body, "utf-8", Some(ApplicationJsonContentType)) => body case wrongBody => - fail( - s"Request body does not serialize to correct StringBody: $wrongBody") + fail(s"Request body does not serialize to correct StringBody: $wrongBody") } def runJsonResponseAs[A](responseAs: ResponseAs[A, Nothing]): String => A = @@ -60,8 +59,7 @@ class Json4sTests extends FlatSpec with Matchers with EitherValues { case ResponseAsString("utf-8") => responseAs.g case ResponseAsString(encoding) => - fail( - s"MappedResponseAs wraps a ResponseAsString with wrong encoding: $encoding") + fail(s"MappedResponseAs wraps a ResponseAsString with wrong encoding: $encoding") case _ => fail("MappedResponseAs does not wrap a ResponseAsString") } |