Update scalafmt-core to 3.8.2 (#3849)

Co-authored-by: scala-steward <scala-steward>
softwaremill · Jun 17, 2024 · f93ed86 · f93ed86
1 parent 74aa169
commit f93ed86
Show file tree

Hide file tree

Showing 32 changed files with 149 additions and 100 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -45,3 +45,6 @@ ab79cadbb13aac7c32015ce5caf24d57290ee59b
 
 # Scala Steward: Reformat with scalafmt 3.8.1
 e003ec3b61e3bd582ae6a5200177fa6433099c09
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+9b44bd1451b796259b0592afe54bb5891f63f48e
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.1
+version = 3.8.2
 maxColumn = 140
 runner.dialect = scala3
 fileOverride {

diff --git a/build.sbt b/build.sbt
@@ -506,7 +506,8 @@ lazy val perfTests: ProjectMatrix = (projectMatrix in file("perf-tests"))
     libraryDependencies ++= Seq(
       // Required to force newer jackson in Pekko, a version that is compatible with Gatling's Jackson dependency
       "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.11.3" % "test" exclude (
-        "com.fasterxml.jackson.core", "jackson-databind"
+        "com.fasterxml.jackson.core",
+        "jackson-databind"
       ),
       "io.gatling" % "gatling-test-framework" % "3.11.3" % "test" exclude ("com.fasterxml.jackson.core", "jackson-databind"),
       "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.1",

diff --git a/core/src/test/scala/sttp/tapir/SchemaMacroTest.scala b/core/src/test/scala/sttp/tapir/SchemaMacroTest.scala
@@ -224,7 +224,9 @@ class SchemaMacroTest extends AnyFlatSpec with Matchers with TableDrivenProperty
 
     parentSchema.name.map(_.fullName) shouldBe Some("CustomHericium")
     parentSchema.schemaType.asInstanceOf[SCoproduct[Hericium]].subtypes.flatMap(_.name.map(_.fullName)) should contain allOf (
-      "sttp.tapir.SchemaMacroTestData.Hericium.Abietis", "sttp.tapir.SchemaMacroTestData.Hericium.Botryoides", "CustomErinaceus"
+      "sttp.tapir.SchemaMacroTestData.Hericium.Abietis",
+      "sttp.tapir.SchemaMacroTestData.Hericium.Botryoides",
+      "CustomErinaceus"
     )
     child1Schema.name.map(_.fullName) shouldBe Some("CustomErinaceus")
     child2Schema.name.map(_.fullName) shouldBe Some("sttp.tapir.SchemaMacroTestData.Hericium.Botryoides")

diff --git a/docs/apispec-docs/src/main/scala/sttp/tapir/docs/apispec/schema/TSchemaToASchema.scala b/docs/apispec-docs/src/main/scala/sttp/tapir/docs/apispec/schema/TSchemaToASchema.scala
@@ -58,10 +58,13 @@ private[docs] class TSchemaToASchema(
                 .map(apply(_, allowReference = true))
                 .sortBy {
                   case schema if schema.$ref.isDefined => schema.$ref.get
-                  case schema => schema.`type`.collect {
-                    case List(t) => t.value
-                    case List(t, SchemaType.Null) => t.value
-                  }.getOrElse("") + schema.toString
+                  case schema =>
+                    schema.`type`
+                      .collect {
+                        case List(t)                  => t.value
+                        case List(t, SchemaType.Null) => t.value
+                      }
+                      .getOrElse("") + schema.toString
                 },
               d.map(tDiscriminatorToADiscriminator)
             )

diff --git a/integrations/iron/src/main/scala/sttp/iron/codec/iron/TapirCodecIron.scala b/integrations/iron/src/main/scala/sttp/iron/codec/iron/TapirCodecIron.scala
@@ -98,10 +98,10 @@ trait TapirCodecIron extends DescriptionWitness with LowPriorityValidatorForPred
       witness: ValueOf[NM]
   ): PrimitiveValidatorForPredicate[C[X], MinLength[NM]] =
     ValidatorForPredicate.fromPrimitiveValidator(Validator.minSize[X, C](witness.value))
-  
+
   inline given validatorForNonEmptyIterable[X, C[X] <: Iterable[X], NM <: Int]: PrimitiveValidatorForPredicate[C[X], Not[Empty]] =
     ValidatorForPredicate.fromPrimitiveValidator(Validator.minSize[X, C](1))
-  
+
   inline given validatorForMaxLengthOnIterable[X, C[X] <: Iterable[X], NM <: Int](using
       witness: ValueOf[NM]
   ): PrimitiveValidatorForPredicate[C[X], MaxLength[NM]] =
@@ -134,7 +134,7 @@ trait TapirCodecIron extends DescriptionWitness with LowPriorityValidatorForPred
       case _: (head *: tail) =>
         val headValidator: ValidatorForPredicate[N, ?] = summonFrom {
           case pv: PrimitiveValidatorForPredicate[N, head] => pv
-          case _ => summonInline[ValidatorForPredicate[N, head]]
+          case _                                           => summonInline[ValidatorForPredicate[N, head]]
         }
         headValidator.asInstanceOf[ValidatorForPredicate[N, Any]] :: summonValidators[N, tail]
   }

diff --git a/integrations/iron/src/main/scala/sttp/iron/codec/iron/UnionTypeMirror.scala b/integrations/iron/src/main/scala/sttp/iron/codec/iron/UnionTypeMirror.scala
@@ -10,7 +10,7 @@ trait UnionTypeMirror[A] {
   // Number of elements in the union
   def size: Int
 }
- 
+
 // Building a class is more convenient to instantiate using macros
 class UnionTypeMirrorImpl[A, T <: NonEmptyTuple](val size: Int) extends UnionTypeMirror[A] {
 

diff --git a/...tions/refined/src/test/scala-3/sttp/tapir/codec/refined/TapirCodecRefinedTestScala3.scala b/...tions/refined/src/test/scala-3/sttp/tapir/codec/refined/TapirCodecRefinedTestScala3.scala
@@ -161,8 +161,8 @@ class TapirCodecRefinedTestScala3 extends AnyFlatSpec with Matchers with TapirCo
       case Validator.Mapped(Validator.Any(List(Validator.Min(3, true), Validator.Max(-3, true))), _) =>
     }
   }
-  
-  "Generated schema for NonEmpty and MinSize" should "not be optional" in {    
+
+  "Generated schema for NonEmpty and MinSize" should "not be optional" in {
     assert(implicitly[Schema[List[Int]]].isOptional)
     assert(!implicitly[Schema[List[Int] Refined NonEmpty]].isOptional)
     assert(!implicitly[Schema[Set[Int] Refined NonEmpty]].isOptional)

diff --git a/json/pickler/src/main/scala/sttp/tapir/json/pickler/CreateDerivedEnumerationPickler.scala b/json/pickler/src/main/scala/sttp/tapir/json/pickler/CreateDerivedEnumerationPickler.scala
@@ -81,7 +81,8 @@ class CreateDerivedEnumerationPickler[T: ClassTag](
         upickleMacros.tagName[C],
         Annotator.Checker.Val(upickleMacros.getSingleton[C])
       )
-      override lazy val reader = annotate[C](SingletonReader[C](upickleMacros.getSingleton[C]), 
+      override lazy val reader = annotate[C](
+        SingletonReader[C](upickleMacros.getSingleton[C]),
         Annotator.defaultTagKey, // not used in enumerations
         upickleMacros.tagName[C]
       )

diff --git a/json/pickler/src/main/scala/sttp/tapir/json/pickler/Writers.scala b/json/pickler/src/main/scala/sttp/tapir/json/pickler/Writers.scala
@@ -62,7 +62,7 @@ private[pickler] trait Writers extends WritersVersionSpecific with UpickleHelper
           ctx,
           childWriters,
           childDefaults,
-          config.transientNone                  
+          config.transientNone
         )
     }
 
@@ -76,7 +76,12 @@ private[pickler] trait Writers extends WritersVersionSpecific with UpickleHelper
     else if upickleMacros.isSingleton[T]
     then // moved after "if MemberOfSealed" to handle case objects in hierarchy as case classes - with discriminator, for consistency
       // here we handle enums
-      annotate[T](SingletonWriter[T](null.asInstanceOf[T]), config.discriminator, upickleMacros.tagName[T], Annotator.Checker.Val(upickleMacros.getSingleton[T]))
+      annotate[T](
+        SingletonWriter[T](null.asInstanceOf[T]),
+        config.discriminator,
+        upickleMacros.tagName[T],
+        Annotator.Checker.Val(upickleMacros.getSingleton[T])
+      )
     else writer
 
   inline def macroSumW[T: ClassTag](childPicklers: => List[Pickler[? <: T]], subtypeDiscriminator: SubtypeDiscriminator[T])(using

diff --git a/json/pickler/src/test/scala/sttp/tapir/json/pickler/PicklerBasicTest.scala b/json/pickler/src/test/scala/sttp/tapir/json/pickler/PicklerBasicTest.scala
@@ -114,11 +114,15 @@ class PicklerBasicTest extends AnyFlatSpec with Matchers {
       jsonStr1 shouldBe """{"fieldA":"fieldA value","fieldB":-4018,"fieldC":true}"""
       jsonStr2 shouldBe """{"innerField":{"fieldA":"fieldA value2","fieldC":true}}"""
       jsonStr3 shouldBe """{"fieldA":"fieldA value","fieldC":true}"""
-      pickler1.toCodec.decode("""{"fieldA":"fieldA value3","fieldC":true}""") shouldBe Value(FlatClassWithOption("fieldA value3", None, true))
-      pickler1.toCodec.decode("""{"fieldA":"fieldA value4", "fieldB": null, "fieldC": true}""") shouldBe Value(FlatClassWithOption("fieldA value4", None, true))
+      pickler1.toCodec.decode("""{"fieldA":"fieldA value3","fieldC":true}""") shouldBe Value(
+        FlatClassWithOption("fieldA value3", None, true)
+      )
+      pickler1.toCodec.decode("""{"fieldA":"fieldA value4", "fieldB": null, "fieldC": true}""") shouldBe Value(
+        FlatClassWithOption("fieldA value4", None, true)
+      )
     }
   }
-  
+
   it should "serialize Options to nulls if transientNone = false" in {
     import generic.auto.* // for Pickler auto-derivation
 

diff --git a/json/pickler/src/test/scala/sttp/tapir/json/pickler/SchemaDerivationTest.scala b/json/pickler/src/test/scala/sttp/tapir/json/pickler/SchemaDerivationTest.scala
@@ -145,7 +145,9 @@ class SchemaGenericAutoTest extends AsyncFlatSpec with Matchers with Inside {
 
     parentSchema.name.map(_.fullName) shouldBe Some("CustomHericium")
     parentSchema.schemaType.asInstanceOf[SCoproduct[Hericium]].subtypes.flatMap(_.name.map(_.fullName)) should contain allOf (
-      "sttp.tapir.SchemaMacroTestData.Hericium.Abietis", "sttp.tapir.SchemaMacroTestData.Hericium.Botryoides", "CustomErinaceus"
+      "sttp.tapir.SchemaMacroTestData.Hericium.Abietis",
+      "sttp.tapir.SchemaMacroTestData.Hericium.Botryoides",
+      "CustomErinaceus"
     )
     child1Schema.name.map(_.fullName) shouldBe Some("CustomErinaceus")
     child2Schema.name.map(_.fullName) shouldBe Some("sttp.tapir.SchemaMacroTestData.Hericium.Botryoides")

diff --git a/openapi-codegen/cli/src/main/scala/sttp/tapir/codegen/GenScala.scala b/openapi-codegen/cli/src/main/scala/sttp/tapir/codegen/GenScala.scala
@@ -75,34 +75,55 @@ object GenScala {
       }
 
   val cmd: Command[IO[ExitCode]] = Command("genscala", "Generate Scala classes", helpFlag = true) {
-    (fileOpt, packageNameOpt, destDirOpt, objectNameOpt, targetScala3Opt, headTagForNamesOpt, jsonLibOpt, validateNonDiscriminatedOneOfsOpt, maxSchemasPerFileOpt)
-      .mapN { case (file, packageName, destDir, maybeObjectName, targetScala3, headTagForNames, jsonLib, validateNonDiscriminatedOneOfs, maxSchemasPerFile) =>
-        val objectName = maybeObjectName.getOrElse(DefaultObjectName)
-
-        def generateCode(doc: OpenapiDocument): IO[Unit] = for {
-          contents <- IO.pure(
-            BasicGenerator.generateObjects(
-              doc,
+    (
+      fileOpt,
+      packageNameOpt,
+      destDirOpt,
+      objectNameOpt,
+      targetScala3Opt,
+      headTagForNamesOpt,
+      jsonLibOpt,
+      validateNonDiscriminatedOneOfsOpt,
+      maxSchemasPerFileOpt
+    )
+      .mapN {
+        case (
+              file,
               packageName,
-              objectName,
+              destDir,
+              maybeObjectName,
               targetScala3,
               headTagForNames,
-              jsonLib.getOrElse("circe"),
+              jsonLib,
               validateNonDiscriminatedOneOfs,
-              maxSchemasPerFile.getOrElse(400)
+              maxSchemasPerFile
+            ) =>
+          val objectName = maybeObjectName.getOrElse(DefaultObjectName)
+
+          def generateCode(doc: OpenapiDocument): IO[Unit] = for {
+            contents <- IO.pure(
+              BasicGenerator.generateObjects(
+                doc,
+                packageName,
+                objectName,
+                targetScala3,
+                headTagForNames,
+                jsonLib.getOrElse("circe"),
+                validateNonDiscriminatedOneOfs,
+                maxSchemasPerFile.getOrElse(400)
+              )
             )
-          )
-          destFiles <- contents.toVector.traverse { case (fileName, content) => writeGeneratedFile(destDir, fileName, content) }
-          _ <- IO.println(s"Generated endpoints written to: ${destFiles.mkString(", ")}")
-        } yield ()
-
-        for {
-          parsed <- readFile(file).map(YamlParser.parseFile)
-          exitCode <- parsed match {
-            case Left(err)  => IO.println(s"Invalid YAML file: ${err.getMessage}").as(ExitCode.Error)
-            case Right(doc) => generateCode(doc).as(ExitCode.Success)
-          }
-        } yield exitCode
+            destFiles <- contents.toVector.traverse { case (fileName, content) => writeGeneratedFile(destDir, fileName, content) }
+            _ <- IO.println(s"Generated endpoints written to: ${destFiles.mkString(", ")}")
+          } yield ()
+
+          for {
+            parsed <- readFile(file).map(YamlParser.parseFile)
+            exitCode <- parsed match {
+              case Left(err)  => IO.println(s"Invalid YAML file: ${err.getMessage}").as(ExitCode.Error)
+              case Right(doc) => generateCode(doc).as(ExitCode.Success)
+            }
+          } yield exitCode
       }
   }
 

diff --git a/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala b/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala
@@ -102,7 +102,7 @@ class EndpointGenerator {
           m.responses.flatMap(_.content.map(c => (c.contentType, c.schema))))
           .collect { case (contentType, schema) if contentType == "application/json" => schema }
           .collect {
-            case ref: OpenapiSchemaRef if ref.isSchema => ref.stripped
+            case ref: OpenapiSchemaRef if ref.isSchema                        => ref.stripped
             case OpenapiSchemaArray(ref: OpenapiSchemaRef, _) if ref.isSchema => ref.stripped
             case OpenapiSchemaArray(OpenapiSchemaAny(_), _) =>
               bail("Cannot generate schema for 'Any' with jsoniter library")

diff --git a/.../sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip-zio/project/plugins.sbt b/.../sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip-zio/project/plugins.sbt
@@ -8,4 +8,4 @@
                                   |
                                   |""".stripMargin)
   else addSbtPlugin("com.softwaremill.sttp.tapir" % "sbt-openapi-codegen" % pluginVersion)
-}
+}
diff --git a/.../sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip-zio/src/test/scala/JsonRoundtrip.scala b/.../sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip-zio/src/test/scala/JsonRoundtrip.scala
@@ -68,7 +68,7 @@ class JsonRoundtrip extends AnyFreeSpec with Matchers {
 
     locally {
       val reqBody: ADTWithoutDiscriminator = SubtypeWithoutD3("a string", Some(123), Some(23.4))
-      val reqJsonBody  = reqBody.toJson(TapirGeneratedEndpointsJsonSerdes.aDTWithoutDiscriminatorJsonEncoder)
+      val reqJsonBody = reqBody.toJson(TapirGeneratedEndpointsJsonSerdes.aDTWithoutDiscriminatorJsonEncoder)
       val respBody: ADTWithoutDiscriminator = SubtypeWithoutD3("a string+SubtypeWithoutD3", Some(123), Some(23.4))
       val respJsonBody = respBody.toJson(TapirGeneratedEndpointsJsonSerdes.aDTWithoutDiscriminatorJsonEncoder)
       reqJsonBody shouldEqual """{"s":"a string","i":123,"d":23.4}"""

diff --git a/...egen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/project/plugins.sbt b/...egen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/project/plugins.sbt
@@ -8,4 +8,4 @@
                                   |
                                   |""".stripMargin)
   else addSbtPlugin("com.softwaremill.sttp.tapir" % "sbt-openapi-codegen" % pluginVersion)
-}
+}
diff --git a/...plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/project/plugins.sbt b/...plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/project/plugins.sbt
@@ -8,4 +8,4 @@
                                   |
                                   |""".stripMargin)
   else addSbtPlugin("com.softwaremill.sttp.tapir" % "sbt-openapi-codegen" % pluginVersion)
-}
+}
diff --git a/...t-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_scala3/project/plugins.sbt b/...t-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_scala3/project/plugins.sbt
@@ -8,4 +8,4 @@
                                   |
                                   |""".stripMargin)
   else addSbtPlugin("com.softwaremill.sttp.tapir" % "sbt-openapi-codegen" % pluginVersion)
-}
+}
diff --git a/server/core/src/test/scala/sttp/tapir/server/interpreter/ServerInterpreterTest.scala b/server/core/src/test/scala/sttp/tapir/server/interpreter/ServerInterpreterTest.scala
@@ -42,8 +42,8 @@ class ServerInterpreterTest extends AnyFlatSpec with Matchers {
     // added to the endpoint interceptor stack in the correct place
     val interceptor2 = new RequestInterceptor[Identity] {
       override def apply[R, B](
-                                responder: Responder[Identity, B],
-                                requestHandler: EndpointInterceptor[Identity] => RequestHandler[Identity, R, B]
+          responder: Responder[Identity, B],
+          requestHandler: EndpointInterceptor[Identity] => RequestHandler[Identity, R, B]
       ): RequestHandler[Identity, R, B] = RequestHandler.from { (request, endpoints, monad) =>
         callTrail.append("2 request")
         requestHandler(new AddToTrailInterceptor(callTrail.append(_: String), "2")).apply(request, endpoints)(monad)
@@ -141,8 +141,8 @@ class ServerInterpreterTest extends AnyFlatSpec with Matchers {
         }
 
         override def onSecurityFailure[A](ctx: SecurityFailureContext[Identity, A])(implicit
-                                                                                    monad: MonadError[Identity],
-                                                                                    bodyListener: BodyListener[Identity, B]
+            monad: MonadError[Identity],
+            bodyListener: BodyListener[Identity, B]
         ): Identity[ServerResponse[B]] = {
           addCallTrail(s"$prefix security failure")
           endpointHandler.onSecurityFailure(ctx)(idMonad, bodyListener)

diff --git a/server/jdkhttp-server/src/main/scala/sttp/tapir/server/jdkhttp/JdkHttpServer.scala b/server/jdkhttp-server/src/main/scala/sttp/tapir/server/jdkhttp/JdkHttpServer.scala
@@ -8,8 +8,8 @@ import java.net.InetSocketAddress
 import java.util.concurrent.Executor
 
 case class JdkHttpServer(
-                          endpoints: Vector[ServerEndpoint[Any, Identity]] = Vector.empty,
-                          options: JdkHttpServerOptions = JdkHttpServerOptions.Default
+    endpoints: Vector[ServerEndpoint[Any, Identity]] = Vector.empty,
+    options: JdkHttpServerOptions = JdkHttpServerOptions.Default
 ) {
 
   /** Sets the port to which the server will be bound. */

diff --git a/server/jdkhttp-server/src/main/scala/sttp/tapir/server/jdkhttp/JdkHttpServerOptions.scala b/server/jdkhttp-server/src/main/scala/sttp/tapir/server/jdkhttp/JdkHttpServerOptions.scala
@@ -46,17 +46,17 @@ import java.util.logging.{Level, Logger}
   *   entirely in memory. Default is 50MB.
   */
 case class JdkHttpServerOptions(
-                                 interceptors: List[Interceptor[Identity]],
-                                 createFile: ServerRequest => TapirFile,
-                                 deleteFile: TapirFile => Unit,
-                                 send404WhenRequestNotHandled: Boolean = true,
-                                 basePath: String = "/",
-                                 port: Int = 0,
-                                 host: String = "0.0.0.0",
-                                 executor: Option[Executor] = None,
-                                 httpsConfigurator: Option[HttpsConfigurator] = None,
-                                 backlogSize: Int = 0,
-                                 multipartFileThresholdBytes: Long = 52_428_800
+    interceptors: List[Interceptor[Identity]],
+    createFile: ServerRequest => TapirFile,
+    deleteFile: TapirFile => Unit,
+    send404WhenRequestNotHandled: Boolean = true,
+    basePath: String = "/",
+    port: Int = 0,
+    host: String = "0.0.0.0",
+    executor: Option[Executor] = None,
+    httpsConfigurator: Option[HttpsConfigurator] = None,
+    backlogSize: Int = 0,
+    multipartFileThresholdBytes: Long = 52_428_800
 ) {
   require(0 <= port && port <= 65535, "Port has to be in 1-65535 range or 0 if random!")
   def prependInterceptor(i: Interceptor[Identity]): JdkHttpServerOptions = copy(interceptors = i :: interceptors)