Update scalafmt-core to 3.7.17 (softwaremill#3324)

jchyb · Nov 23, 2023 · fdfa3da · fdfa3da
1 parent 9ac47f0
commit fdfa3da
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -39,3 +39,6 @@ c40dbf3aafd72299a21b38125140249337c83e0f
 
 # Scala Steward: Reformat with scalafmt 3.7.15
 8b7ad6880d140468abf749eb7a5556dc7cd8d999
+
+# Scala Steward: Reformat with scalafmt 3.7.17
+ab79cadbb13aac7c32015ce5caf24d57290ee59b
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.15
+version = 3.7.17
 maxColumn = 140
 runner.dialect = scala3
 fileOverride {

diff --git a/client/play-client/src/main/scala/sttp/tapir/client/play/EndpointToPlayClient.scala b/client/play-client/src/main/scala/sttp/tapir/client/play/EndpointToPlayClient.scala
@@ -146,8 +146,10 @@ private[play] class EndpointToPlayClient(clientOptions: PlayClientOptions, ws: S
       case a: EndpointInput.Auth[_, _]               => setInputParams(a.input, params, req)
       case EndpointInput.Pair(left, right, _, split) => handleInputPair(left, right, params, split, req)
       case EndpointIO.Pair(left, right, _, split)    => handleInputPair(left, right, params, split, req)
-      case EndpointInput.MappedPair(wrapped, codec)  => handleMapped(wrapped.asInstanceOf[EndpointInput[Any]], codec.asInstanceOf[Mapping[Any, Any]], params, req)
-      case EndpointIO.MappedPair(wrapped, codec)     => handleMapped(wrapped.asInstanceOf[EndpointInput[Any]], codec.asInstanceOf[Mapping[Any, Any]], params, req)
+      case EndpointInput.MappedPair(wrapped, codec) =>
+        handleMapped(wrapped.asInstanceOf[EndpointInput[Any]], codec.asInstanceOf[Mapping[Any, Any]], params, req)
+      case EndpointIO.MappedPair(wrapped, codec) =>
+        handleMapped(wrapped.asInstanceOf[EndpointInput[Any]], codec.asInstanceOf[Mapping[Any, Any]], params, req)
     }
   }
 

diff --git a/...meria-server/cats/src/main/scala/sttp/tapir/server/armeria/cats/CatsMonadAsyncError.scala b/...meria-server/cats/src/main/scala/sttp/tapir/server/armeria/cats/CatsMonadAsyncError.scala
@@ -9,7 +9,7 @@ import sttp.tapir.integ.cats.effect.CatsMonadError
 private class CatsMonadAsyncError[F[_]](implicit F: Async[F]) extends CatsMonadError[F] with MonadAsyncError[F] {
   override def async[T](register: ((Either[Throwable, T]) => Unit) => Canceler): F[T] =
     F.async(cb => F.delay(register(cb)).map(c => Some(F.delay(c.cancel()))))
-  
-  override def blocking[T](t: => T): F[T] = 
+
+  override def blocking[T](t: => T): F[T] =
     F.blocking(t)
 }
diff --git a/...dkhttp-server/src/test/scala/sttp/tapir/server/jdkhttp/JdkHttpTestServerInterpreter.scala b/...dkhttp-server/src/test/scala/sttp/tapir/server/jdkhttp/JdkHttpTestServerInterpreter.scala
@@ -17,7 +17,10 @@ class JdkHttpTestServerInterpreter() extends TestServerInterpreter[Id, Any, JdkH
     JdkHttpServerInterpreter(serverOptions).toHandler(es)
   }
 
-  override def serverWithStop(routes: NonEmptyList[HttpHandler], gracefulShutdownTimeout: Option[FiniteDuration]): Resource[IO, (Port, KillSwitch)] = {
+  override def serverWithStop(
+      routes: NonEmptyList[HttpHandler],
+      gracefulShutdownTimeout: Option[FiniteDuration]
+  ): Resource[IO, (Port, KillSwitch)] = {
     val server = IO.blocking {
       val server = HttpServer.create(new InetSocketAddress(0), 0)
 
@@ -44,6 +47,8 @@ class JdkHttpTestServerInterpreter() extends TestServerInterpreter[Id, Any, JdkH
     }
 
     Resource
-      .make(server.map(s => (s.getAddress.getPort, IO.blocking(s.stop(gracefulShutdownTimeout.map(_.toSeconds.toInt).getOrElse(0)))))) { case (_, release) => release }
+      .make(server.map(s => (s.getAddress.getPort, IO.blocking(s.stop(gracefulShutdownTimeout.map(_.toSeconds.toInt).getOrElse(0)))))) {
+        case (_, release) => release
+      }
   }
 }
diff --git a/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyFutureServer.scala b/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyFutureServer.scala
@@ -84,7 +84,7 @@ case class NettyFutureServer(routes: Vector[FutureRoute], options: NettyFutureSe
       channelGroup: ChannelGroup,
       startNanos: Long,
       gracefulShutdownTimeoutNanos: Option[Long]
-  ): Future[Unit] =    
+  ): Future[Unit] =
     if (!channelGroup.isEmpty && gracefulShutdownTimeoutNanos.exists(_ >= System.nanoTime() - startNanos)) {
       Future {
         blocking {

diff --git a/server/tests/src/main/scala/sttp/tapir/server/tests/ServerGracefulShutdownTests.scala b/server/tests/src/main/scala/sttp/tapir/server/tests/ServerGracefulShutdownTests.scala
@@ -13,8 +13,8 @@ import sttp.tapir.tests._
 
 import scala.concurrent.duration._
 
-class ServerGracefulShutdownTests[F[_], OPTIONS, ROUTE](createServerTest: CreateServerTest[F, Any, OPTIONS, ROUTE], sleeper: Sleeper[F])(implicit
-    m: MonadError[F]
+class ServerGracefulShutdownTests[F[_], OPTIONS, ROUTE](createServerTest: CreateServerTest[F, Any, OPTIONS, ROUTE], sleeper: Sleeper[F])(
+    implicit m: MonadError[F]
 ) extends EitherValues {
   import createServerTest._
 

diff --git a/tests/src/main/scala/sttp/tapir/tests/ContentNegotiation.scala b/tests/src/main/scala/sttp/tapir/tests/ContentNegotiation.scala
@@ -70,9 +70,9 @@ object ContentNegotiation {
 
   val in_multipart_mixed_out_string: PublicEndpoint[String, Unit, String, Any] =
     endpoint.get
-        .in("content-negotiation" / "multipart-mixed")
-        .in(sttp.tapir.oneOfBody(ContentTypeRange("multipart", "mixed", "*") -> stringBody))
-        .out(stringBody)
+      .in("content-negotiation" / "multipart-mixed")
+      .in(sttp.tapir.oneOfBody(ContentTypeRange("multipart", "mixed", "*") -> stringBody))
+      .out(stringBody)
 
   val out_default_json_or_xml: PublicEndpoint[Unit, Unit, Organization, Any] =
     endpoint.get