Update scalafmt-core to 2.7.0

xebia-functional · Sep 9, 2020 · 58f9197 · 58f9197
1 parent d4bede3
commit 58f9197
Show file tree

Hide file tree

Showing 12 changed files with 216 additions and 269 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.6.4
+version = 2.7.0
 
 style = defaultWithAlign
 maxColumn = 100

diff --git a/fetch-debug/src/main/scala/debug.scala b/fetch-debug/src/main/scala/debug.scala
@@ -39,16 +39,16 @@ object debug {
   def firstRequest(r: Round): Option[Long] =
     for {
       aQuery <- r.queries.headOption
-      firstR = r.queries.foldLeft(aQuery.start)({
-        case (acc, q) => acc min q.start
+      firstR = r.queries.foldLeft(aQuery.start)({ case (acc, q) =>
+        acc min q.start
       })
     } yield firstR
 
   def lastRequest(r: Round): Option[Long] =
     for {
       aQuery <- r.queries.headOption
-      lastR = r.queries.foldLeft(aQuery.end)({
-        case (acc, q) => acc max q.end
+      lastR = r.queries.foldLeft(aQuery.end)({ case (acc, q) =>
+        acc max q.end
       })
     } yield lastR
 

diff --git a/fetch-examples/src/test/scala/GithubExample.scala b/fetch-examples/src/test/scala/GithubExample.scala
@@ -196,9 +196,8 @@ class GithubExample extends AnyWordSpec with Matchers {
   case class Project(repo: Repo, contributors: List[Contributor], languages: List[Language])
 
   def fetchProject[F[_]: ConcurrentEffect](repo: Repo): Fetch[F, Project] =
-    (repoContributors(repo), repoLanguages(repo)).mapN({
-      case (contribs, langs) =>
-        Project(repo = repo, contributors = contribs, languages = langs)
+    (repoContributors(repo), repoLanguages(repo)).mapN({ case (contribs, langs) =>
+      Project(repo = repo, contributors = contribs, languages = langs)
     })
 
   def fetchOrg[F[_]: ConcurrentEffect](org: String) =

diff --git a/fetch-examples/src/test/scala/GraphQLExample.scala b/fetch-examples/src/test/scala/GraphQLExample.scala
@@ -204,8 +204,8 @@ class GraphQLExample extends AnyWordSpec with Matchers {
             repos
               .take(n)
               .traverse(repo =>
-                (Languages.fetch(repo), Collaborators.fetch(repo)).mapN {
-                  case (ls, cs) => Project(name >> Some(repo.name), ls, cs)
+                (Languages.fetch(repo), Collaborators.fetch(repo)).mapN { case (ls, cs) =>
+                  Project(name >> Some(repo.name), ls, cs)
                 }
               )
         } yield projects
@@ -233,20 +233,18 @@ class GraphQLExample extends AnyWordSpec with Matchers {
 
 object Parsers {
   def queryParser: Parser[OrganizationQuery] =
-    rawParser.map({
-      case (o, n) =>
-        OrganizationQuery(
-          o,
-          n.map({
-            case (i, name, langs, colls) =>
-              RepositoriesQuery(
-                i,
-                if (name) Some(()) else None,
-                if (langs) Some(LanguagesQuery()) else None,
-                if (colls) Some(CollaboratorsQuery()) else None
-              )
-          })
-        )
+    rawParser.map({ case (o, n) =>
+      OrganizationQuery(
+        o,
+        n.map({ case (i, name, langs, colls) =>
+          RepositoriesQuery(
+            i,
+            if (name) Some(()) else None,
+            if (langs) Some(LanguagesQuery()) else None,
+            if (colls) Some(CollaboratorsQuery()) else None
+          )
+        })
+      )
     })
 
   def rawParser: Parser[(String, Option[(Int, Boolean, Boolean, Boolean)])] =

diff --git a/fetch-examples/src/test/scala/Http4sExample.scala b/fetch-examples/src/test/scala/Http4sExample.scala
@@ -158,9 +158,8 @@ class Http4sExample extends AnyWordSpec with Matchers {
     val (log, results) = io.unsafeRunSync
 
     results
-      .map {
-        case (user, posts) =>
-          s"${user.username} has ${posts.size} posts"
+      .map { case (user, posts) =>
+        s"${user.username} has ${posts.size} posts"
       }
       .foreach(println)
     log.rounds.size shouldEqual 2

diff --git a/fetch-examples/src/test/scala/JedisExample.scala b/fetch-examples/src/test/scala/JedisExample.scala
@@ -96,13 +96,12 @@ object Binary {
   ): F[ByteArray] = {
     byteOutputStream
       .mproduct(outputStream(_))
-      .use({
-        case (byte, out) =>
-          S.delay {
-            out.writeObject(obj)
-            out.flush()
-            byte.toByteArray
-          }
+      .use({ case (byte, out) =>
+        S.delay {
+          out.writeObject(obj)
+          out.flush()
+          byte.toByteArray
+        }
       })
   }
 
@@ -111,12 +110,11 @@ object Binary {
   ): F[Option[A]] = {
     byteInputStream(bin)
       .mproduct(inputStream(_))
-      .use({
-        case (byte, in) =>
-          S.delay {
-            val obj = in.readObject()
-            Try(obj.asInstanceOf[A]).toOption
-          }
+      .use({ case (byte, in) =>
+        S.delay {
+          val obj = in.readObject()
+          Try(obj.asInstanceOf[A]).toOption
+        }
       })
   }
 }
@@ -161,9 +159,8 @@ case class RedisCache[F[_]: Sync](host: String) extends DataCache[F] {
       M: Monad[F]
   ): F[DataCache[F]] =
     for {
-      bin <- vs.traverse({
-        case (id, v) =>
-          Binary.serialize(v).tupleRight(cacheId(id, data))
+      bin <- vs.traverse({ case (id, v) =>
+        Binary.serialize(v).tupleRight(cacheId(id, data))
       })
       _ <- Sync[F].delay(bulkSet(bin))
     } yield this

diff --git a/fetch-examples/src/test/scala/MonixExample.scala b/fetch-examples/src/test/scala/MonixExample.scala
@@ -40,10 +40,9 @@ class MonixExample extends AnyWordSpec with Matchers {
     val task = Fetch.runLog[Task](fetch)
 
     task
-      .map({
-        case (log, result) =>
-          result shouldEqual Author(1, "William Shakespeare")
-          log.rounds.size shouldEqual 1
+      .map({ case (log, result) =>
+        result shouldEqual Author(1, "William Shakespeare")
+        log.rounds.size shouldEqual 1
       })
       .runToFuture
   }

diff --git a/fetch/src/main/scala/cache.scala b/fetch/src/main/scala/cache.scala
@@ -36,9 +36,8 @@ trait DataCache[F[_]] {
   def bulkInsert[I, A](vs: List[(I, A)], data: Data[I, A])(implicit
       M: Monad[F]
   ): F[DataCache[F]] = {
-    vs.foldLeftM(this) {
-      case (acc, (i, v)) =>
-        acc.insert(i, v, data)
+    vs.foldLeftM(this) { case (acc, (i, v)) =>
+      acc.insert(i, v, data)
     }
   }
 }

diff --git a/fetch/src/main/scala/fetch.scala b/fetch/src/main/scala/fetch.scala
@@ -227,17 +227,15 @@ object `package` {
   /* Combine two `RequestMap` instances to batch requests to the same data source. */
   private def combineRequestMaps[F[_]: Monad](x: RequestMap[F], y: RequestMap[F]): RequestMap[F] =
     RequestMap(
-      x.m.foldLeft(y.m) {
-        case (acc, (dsId, (ds, blocked))) =>
-          val combined = acc
-            .get(dsId)
-            .fold(
-              (ds, blocked)
-            )({
-              case (d, req) =>
-                (d, combineRequests(blocked, req))
-            })
-          acc.updated(dsId, combined)
+      x.m.foldLeft(y.m) { case (acc, (dsId, (ds, blocked))) =>
+        val combined = acc
+          .get(dsId)
+          .fold(
+            (ds, blocked)
+          )({ case (d, req) =>
+            (d, combineRequests(blocked, req))
+          })
+        acc.updated(dsId, combined)
       }
     )
 
@@ -581,8 +579,8 @@ object `package` {
           requests <- FetchExecution.parallel(
             NonEmptyList
               .fromListUnsafe(blocked)
-              .map({
-                case (ds, req) => runBlockedRequest(req, ds, cache, log)
+              .map({ case (ds, req) =>
+                runBlockedRequest(req, ds, cache, log)
               })
           )
           performedRequests = requests.foldLeft(List.empty[Request])(_ ++ _)
@@ -672,8 +670,8 @@ object `package` {
 
       // Remove cached IDs
       idLookups <- q.ids.traverse[F, (Any, Option[Any])]((i) => c.lookup(i, q.data).tupleLeft(i))
-      (uncachedIds, cached) = idLookups.toList.partitionEither {
-        case (i, result) => result.tupleLeft(i).toRight(i)
+      (uncachedIds, cached) = idLookups.toList.partitionEither { case (i, result) =>
+        result.tupleLeft(i).toRight(i)
       }
       cachedResults = cached.toMap
       result <- uncachedIds.toNel match {

diff --git a/fetch/src/test/scala/FetchBatchingTests.scala b/fetch/src/test/scala/FetchBatchingTests.scala
@@ -109,12 +109,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3, 4, 5)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 5
-        totalBatches(log.rounds) shouldEqual 3
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3, 4, 5)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 5
+      totalBatches(log.rounds) shouldEqual 3
     }).unsafeToFuture
   }
 
@@ -124,12 +123,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3, 4, 5)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 5
-        totalBatches(log.rounds) shouldEqual 3
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3, 4, 5)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 5
+      totalBatches(log.rounds) shouldEqual 3
     }).unsafeToFuture
   }
 
@@ -140,12 +138,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3, 4, 5)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 5 + 5
-        totalBatches(log.rounds) shouldEqual 3 + 3
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3, 4, 5)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 5 + 5
+      totalBatches(log.rounds) shouldEqual 3 + 3
     }).unsafeToFuture
   }
 
@@ -156,12 +153,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3, 4, 5)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 5 + 5
-        totalBatches(log.rounds) shouldEqual 3 + 3
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3, 4, 5)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 5 + 5
+      totalBatches(log.rounds) shouldEqual 3 + 3
     }).unsafeToFuture
   }
 
@@ -171,12 +167,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 3
-        totalBatches(log.rounds) shouldEqual 2
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 3
+      totalBatches(log.rounds) shouldEqual 2
     }).unsafeToFuture
   }
 
@@ -186,12 +181,11 @@ class FetchBatchingTests extends FetchSpec {
 
     val io = Fetch.runLog[IO](fetch)
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual List(1, 2, 3)
-        log.rounds.size shouldEqual 1
-        totalFetched(log.rounds) shouldEqual 3
-        totalBatches(log.rounds) shouldEqual 2
+    io.map({ case (log, result) =>
+      result shouldEqual List(1, 2, 3)
+      log.rounds.size shouldEqual 1
+      totalFetched(log.rounds) shouldEqual 3
+      totalBatches(log.rounds) shouldEqual 2
     }).unsafeToFuture
   }
 
@@ -209,9 +203,8 @@ class FetchBatchingTests extends FetchSpec {
       ids.toList.traverse(fetchBatchedDataBigId[IO])
     )
 
-    io.map({
-      case (log, result) =>
-        result shouldEqual ids.map(_.toString)
+    io.map({ case (log, result) =>
+      result shouldEqual ids.map(_.toString)
     }).unsafeToFuture
   }
 }