New scalafmt settings

7 files changed, 30 insertions, 74 deletions

diff --git a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
index 4e855fc..1d03154 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
@@ -94,25 +94,13 @@ class BasicTests
       }
     } ~ pathPrefix("set_cookies") {
       path("with_expires") {
-        setCookie(
-          HttpCookie("c",
-                     "v",
-                     expires = Some(DateTime(1997, 12, 8, 12, 49, 12)))) {
+        setCookie(HttpCookie("c", "v", expires = Some(DateTime(1997, 12, 8, 12, 49, 12)))) {
           complete("ok")
         }
       } ~ get {
-        setCookie(
-          HttpCookie("cookie1",
-                     "value1",
-                     secure = true,
-                     httpOnly = true,
-                     maxAge = Some(123L))) {
+        setCookie(HttpCookie("cookie1", "value1", secure = true, httpOnly = true, maxAge = Some(123L))) {
           setCookie(HttpCookie("cookie2", "value2")) {
-            setCookie(
-              HttpCookie("cookie3",
-                         "",
-                         domain = Some("xyz"),
-                         path = Some("a/b/c"))) {
+            setCookie(HttpCookie("cookie3", "", domain = Some("xyz"), path = Some("a/b/c"))) {
               complete("ok")
             }
           }
@@ -143,8 +131,7 @@ class BasicTests
             .mapAsync(1) { p =>
               val fv = p.entity.dataBytes.runFold(ByteString())(_ ++ _)
               fv.map(_.utf8String)
-                .map(v =>
-                  p.name + "=" + v + p.filename.fold("")(fn => s" ($fn)"))
+                .map(v => p.name + "=" + v + p.filename.fold("")(fn => s" ($fn)"))
             }
             .runFold(Vector.empty[String])(_ :+ _)
             .map(v => v.mkString(", "))
@@ -168,8 +155,7 @@ class BasicTests
         }
     } ~ pathPrefix("timeout") {
       complete {
-        akka.pattern.after(1.second, using = actorSystem.scheduler)(
-          Future.successful("Done"))
+        akka.pattern.after(1.second, using = actorSystem.scheduler)(Future.successful("Done"))
       }
     } ~ path("empty_unauthorized_response") {
       post {
@@ -184,9 +170,8 @@ class BasicTests
       }
     } ~ path("respond_with_iso_8859_2") {
       get { ctx =>
-        val entity = HttpEntity(
-          MediaTypes.`text/plain`.withCharset(HttpCharset.custom("ISO-8859-2")),
-          textWithSpecialCharacters)
+        val entity =
+          HttpEntity(MediaTypes.`text/plain`.withCharset(HttpCharset.custom("ISO-8859-2")), textWithSpecialCharacters)
         ctx.complete(HttpResponse(200, entity = entity))
       }
     }
@@ -195,30 +180,19 @@ class BasicTests
 
   var closeBackends: List[() => Unit] = Nil
 
-  runTests("HttpURLConnection")(HttpURLConnectionBackend(),
-                                ForceWrappedValue.id)
-  runTests("TryHttpURLConnection")(TryHttpURLConnectionBackend(),
-                                   ForceWrappedValue.scalaTry)
-  runTests("Akka HTTP")(AkkaHttpBackend.usingActorSystem(actorSystem),
-                        ForceWrappedValue.future)
-  runTests("Async Http Client - Future")(AsyncHttpClientFutureBackend(),
-                                         ForceWrappedValue.future)
-  runTests("Async Http Client - Scalaz")(AsyncHttpClientScalazBackend(),
-                                         ForceWrappedValue.scalazTask)
-  runTests("Async Http Client - Monix")(AsyncHttpClientMonixBackend(),
-                                        ForceWrappedValue.monixTask)
-  runTests("Async Http Client - Cats Effect")(
-    AsyncHttpClientCatsBackend[cats.effect.IO](),
-    ForceWrappedValue.catsIo)
+  runTests("HttpURLConnection")(HttpURLConnectionBackend(), ForceWrappedValue.id)
+  runTests("TryHttpURLConnection")(TryHttpURLConnectionBackend(), ForceWrappedValue.scalaTry)
+  runTests("Akka HTTP")(AkkaHttpBackend.usingActorSystem(actorSystem), ForceWrappedValue.future)
+  runTests("Async Http Client - Future")(AsyncHttpClientFutureBackend(), ForceWrappedValue.future)
+  runTests("Async Http Client - Scalaz")(AsyncHttpClientScalazBackend(), ForceWrappedValue.scalazTask)
+  runTests("Async Http Client - Monix")(AsyncHttpClientMonixBackend(), ForceWrappedValue.monixTask)
+  runTests("Async Http Client - Cats Effect")(AsyncHttpClientCatsBackend[cats.effect.IO](), ForceWrappedValue.catsIo)
   runTests("OkHttpSyncClientHandler")(OkHttpSyncBackend(), ForceWrappedValue.id)
-  runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureBackend(),
-                                                ForceWrappedValue.future)
-  runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixBackend(),
-                                               ForceWrappedValue.monixTask)
+  runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureBackend(), ForceWrappedValue.future)
+  runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixBackend(), ForceWrappedValue.monixTask)
 
-  def runTests[R[_]](name: String)(
-      implicit backend: SttpBackend[R, Nothing],
-      forceResponse: ForceWrappedValue[R]): Unit = {
+  def runTests[R[_]](name: String)(implicit backend: SttpBackend[R, Nothing],
+                                   forceResponse: ForceWrappedValue[R]): Unit = {
 
     closeBackends = (() => backend.close()) :: closeBackends
 
@@ -373,8 +347,7 @@ class BasicTests
       name should "read response headers" in {
         val response = getHeaders.response(sttpIgnore).send().force()
         response.headers should have length (6)
-        response.headers("Cache-Control").toSet should be(
-          Set("no-cache", "max-age=1000"))
+        response.headers("Cache-Control").toSet should be(Set("no-cache", "max-age=1000"))
         response.header("Server") should be('defined)
         response.header("server") should be('defined)
         response.header("Server").get should startWith("akka-http")
@@ -405,11 +378,7 @@ class BasicTests
         response.cookies should have length (3)
         response.cookies.toSet should be(
           Set(
-            Cookie("cookie1",
-                   "value1",
-                   secure = true,
-                   httpOnly = true,
-                   maxAge = Some(123L)),
+            Cookie("cookie1", "value1", secure = true, httpOnly = true, maxAge = Some(123L)),
             Cookie("cookie2", "value2"),
             Cookie("cookie3", "", domain = Some("xyz"), path = Some("a/b/c"))
           ))
@@ -443,8 +412,7 @@ class BasicTests
         val req = secureBasic
         val resp = req.send().force()
         resp.code should be(401)
-        resp.header("WWW-Authenticate") should be(
-          Some("""Basic realm="test realm",charset=UTF-8"""))
+        resp.header("WWW-Authenticate") should be(Some("""Basic realm="test realm",charset=UTF-8"""))
       }
 
       name should "perform basic authorization" in {
@@ -586,8 +554,7 @@ class BasicTests
       }
 
       name should "send a multipart message with filenames" in {
-        val req = mp.multipartBody(multipart("p1", "v1").fileName("f1"),
-                                   multipart("p2", "v2").fileName("f2"))
+        val req = mp.multipartBody(multipart("p1", "v1").fileName("f1"), multipart("p2", "v2").fileName("f2"))
         val resp = req.send().force()
         resp.unsafeBody should be("p1=v1 (f1), p2=v2 (f2)")
       }
diff --git a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
index 66d040c..881c60e 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
@@ -7,8 +7,7 @@ import scala.tools.reflect.ToolBoxError
 class IllTypedTests extends FlatSpec with Matchers {
   "compilation" should "fail when trying to stream using the default backend" in {
     val thrown = intercept[ToolBoxError] {
-      EvalScala(
-        """
+      EvalScala("""
         import com.softwaremill.sttp._
         import akka.stream.scaladsl.Source
         import akka.util.ByteString
@@ -30,7 +29,6 @@ class IllTypedTests extends FlatSpec with Matchers {
         """)
     }
 
-    thrown.getMessage should include(
-      "This is a partial request, the method & url are not specified")
+    thrown.getMessage should include("This is a partial request, the method & url are not specified")
   }
 }
diff --git a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
index f7faf64..e3dbe2c 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
@@ -38,9 +38,7 @@ class StreamingTests
   runTests("Monix OkHttp", new OkHttpMonixStreamingTests)
   runTests("fs2 Async Http Client", new AsyncHttpClientFs2StreamingTests)
 
-  def runTests[R[_], S](
-      name: String,
-      testStreamingBackend: TestStreamingBackend[R, S]): Unit = {
+  def runTests[R[_], S](name: String, testStreamingBackend: TestStreamingBackend[R, S]): Unit = {
     import testStreamingBackend._
 
     closeBackends = (() => backend.close()) :: closeBackends
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala
index 3fca682..d8fbb82 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala
@@ -10,8 +10,7 @@ import com.softwaremill.sttp.{ForceWrappedValue, SttpBackend}
 
 import scala.concurrent.Future
 
-class AkkaHttpStreamingTests(actorSystem: ActorSystem)(
-    implicit materializer: Materializer)
+class AkkaHttpStreamingTests(actorSystem: ActorSystem)(implicit materializer: Materializer)
     extends TestStreamingBackend[Future, Source[ByteString, Any]] {
 
   override implicit val backend: SttpBackend[Future, Source[ByteString, Any]] =
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala
index ec6ce05..82f36be 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala
@@ -8,8 +8,7 @@ import com.softwaremill.sttp.asynchttpclient.fs2.AsyncHttpClientFs2Backend
 import com.softwaremill.sttp.{ForceWrappedValue, SttpBackend}
 import fs2._
 
-class AsyncHttpClientFs2StreamingTests
-    extends TestStreamingBackend[IO, Stream[IO, ByteBuffer]] {
+class AsyncHttpClientFs2StreamingTests extends TestStreamingBackend[IO, Stream[IO, ByteBuffer]] {
 
   override implicit val backend: SttpBackend[IO, Stream[IO, ByteBuffer]] =
     AsyncHttpClientFs2Backend[IO]()
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala
index 3510fbc..acd67a7 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala
@@ -6,15 +6,13 @@ import com.softwaremill.sttp.ForceWrappedValue
 import monix.eval.Task
 import monix.reactive.Observable
 
-trait MonixBaseBackend
-    extends TestStreamingBackend[Task, Observable[ByteBuffer]] {
+trait MonixBaseBackend extends TestStreamingBackend[Task, Observable[ByteBuffer]] {
 
   override implicit def forceResponse: ForceWrappedValue[Task] =
     ForceWrappedValue.monixTask
 
   override def bodyProducer(body: String): Observable[ByteBuffer] =
-    Observable.fromIterable(
-      body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b))))
+    Observable.fromIterable(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b))))
 
   override def bodyConsumer(stream: Observable[ByteBuffer]): Task[String] =
     stream
diff --git a/tests/src/test/scala/com/softwaremill/sttp/testHelpers.scala b/tests/src/test/scala/com/softwaremill/sttp/testHelpers.scala
index c926840..1a57b7e 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/testHelpers.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/testHelpers.scala
@@ -18,10 +18,7 @@ import scala.language.higherKinds
 import scala.util.Try
 import scalaz._
 
-trait TestHttpServer
-    extends BeforeAndAfterAll
-    with ScalaFutures
-    with TestingPatience {
+trait TestHttpServer extends BeforeAndAfterAll with ScalaFutures with TestingPatience {
   this: Suite =>
   protected implicit val actorSystem: ActorSystem = ActorSystem("sttp-test")
   import actorSystem.dispatcher