Update scalafmt-core to 3.6.1 (#215)

* Update scalafmt-core to 3.6.1

* Reformat with scalafmt 3.6.1

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.6.1' to .git-blame-ignore-revs

Author: scala-steward

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.6.1
+8790252edd105e64912f6e12da1ac2aa404c6fd8

.scalafmt.conf

@@ -1,5 +1,5 @@
 # https://scalameta.org/scalafmt/docs/configuration.html
-version = "3.5.9"
+version = "3.6.1"
 runner.dialect = scala213source3
 maxColumn = 140
 project.git = true

build.sbt

@@ -152,7 +152,7 @@ ThisBuild / githubWorkflowBuildPostamble := Seq(
     cond = Some("startsWith(matrix.scala, '2.13')")
   )
 )
-*/
+ */
 
 ThisBuild / githubWorkflowPublish := Seq(
   WorkflowStep.Sbt(

src/main/scala-2/com/github/swagger/scala/converter/SubtypeHelper.scala

@@ -16,8 +16,7 @@ object SubtypeHelper {
       if (classSymbol.isJava) {
         Seq.empty
       } else if (symbol.isClass) {
-        symbol.asClass.knownDirectSubclasses
-          .toSeq
+        symbol.asClass.knownDirectSubclasses.toSeq
           .sortBy(_.info.toString)
           .flatMap(s => if (s.isClass) Some(s.asClass) else None)
           .map(c => mirror.runtimeClass(c))

src/main/scala/com/github/swagger/scala/converter/SwaggerScalaModelConverter.scala

@@ -30,9 +30,9 @@ object SwaggerScalaModelConverter {
   private var requiredBasedOnDefaultValue = true
 
   /** If you use swagger annotations to override what is automatically derived, then be aware that
-    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required
-    * flag on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on
-    * the this module inferring the value (as it would if you don't annotate the classes or fields), then set
+    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required flag
+    * on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on the
+    * this module inferring the value (as it would if you don't annotate the classes or fields), then set
     * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to true and the required property on the annotation will be ignored,
     * unless the field is an [[Option]].
     *
@@ -44,11 +44,11 @@ object SwaggerScalaModelConverter {
     requiredBasedOnAnnotation = value
   }
 
-  /** If you use swagger annotations to override what is automatically derived, then this flag will not be used.
-    * If you rely on this module inferring the required flag (as it would if you don't annotate the classes or fields),
-    * then this flag will control how the required flag is derived when a default value exists.
-    * If [[SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue]] is true and a property has a default value, then it will not be required.
-    * However, if this flag is false, then a property will be required only if it's not an [[Option]].
+  /** If you use swagger annotations to override what is automatically derived, then this flag will not be used. If you rely on this module
+    * inferring the required flag (as it would if you don't annotate the classes or fields), then this flag will control how the required
+    * flag is derived when a default value exists. If [[SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue]] is true and a property
+    * has a default value, then it will not be required. However, if this flag is false, then a property will be required only if it's not
+    * an [[Option]].
     *
     * @param value
     *   true by default
@@ -59,28 +59,28 @@ object SwaggerScalaModelConverter {
   }
 
   /** If you use swagger annotations to override what is automatically derived, then be aware that
-    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required
-    * flag on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on
-    * the this module inferring the value (as it would if you don't annotate the classes or fields), then set
+    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required flag
+    * on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on the
+    * this module inferring the value (as it would if you don't annotate the classes or fields), then set
     * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to true and the required property on the annotation will be ignored,
     * unless the field is an [[Option]].
     *
-    * @return value
-    *   value: true by default
+    * @return
+    *   value value: true by default
     * @since v2.7.4
     */
   def isRequiredBasedOnAnnotation: Boolean = requiredBasedOnAnnotation
 
-  /** If you use swagger annotations to override what is automatically derived, then this flag will not be used.
-    * If you rely on this module inferring the required flag (as it would if you don't annotate the classes or fields),
-    * then this flag will control how the required flag is derived when a default value exists.
-    * If [[SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue]] is true and a property has a default value, then it will not be required.
-    * However, if this flag is false, then a property will be required only if it's not an [[Option]].
+  /** If you use swagger annotations to override what is automatically derived, then this flag will not be used. If you rely on this module
+    * inferring the required flag (as it would if you don't annotate the classes or fields), then this flag will control how the required
+    * flag is derived when a default value exists. If [[SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue]] is true and a property
+    * has a default value, then it will not be required. However, if this flag is false, then a property will be required only if it's not
+    * an [[Option]].
     *
     * @return
     *   value: true by default
     * @since v2.7.6
-   */
+    */
   def isRequiredBasedOnDefaultValue: Boolean = requiredBasedOnDefaultValue
 }
 
@@ -118,8 +118,12 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
     }
   }
 
-  private def resolveWithoutSubtypes(javaType: JavaType, `type`: AnnotatedType, context: ModelConverterContext,
-                                     chain: util.Iterator[ModelConverter]): Schema[_] = {
+  private def resolveWithoutSubtypes(
+      javaType: JavaType,
+      `type`: AnnotatedType,
+      context: ModelConverterContext,
+      chain: util.Iterator[ModelConverter]
+  ): Schema[_] = {
     val cls = javaType.getRawClass
     matchScalaPrimitives(`type`, cls).getOrElse {
       // Unbox scala options
@@ -128,7 +132,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
         val baseType =
           if (
             SwaggerScalaModelConverter.isRequiredBasedOnAnnotation
-              && annotatedOverrides.headOption.getOrElse(false)
+            && annotatedOverrides.headOption.getOrElse(false)
           ) new AnnotatedType()
           else new AnnotatedTypeForOption()
         resolve(nextType(baseType, `type`, javaType), context, chain)
@@ -198,7 +202,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
                   case _ => {
                     defaultValue match {
                       case Some(wrappedValue) => property.setDefault(wrappedValue)
-                      case None => //no default
+                      case None => // no default
                       case seq: Seq[_] => property.setDefault(seq.asJava)
                       case set: Set[_] => property.setDefault(set.asJava)
                       case dv => property.setDefault(dv)
@@ -317,7 +321,6 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
     }
   }
 
-
   private def getRequiredSettings(annotatedType: AnnotatedType): Seq[Boolean] = annotatedType match {
     case _: AnnotatedTypeForOption => Seq.empty
     case _ => getRequiredSettings(nullSafeSeq(annotatedType.getCtxAnnotations))

src/test/scala/com/github/swagger/scala/converter/ModelPropertyParserTest.scala

@@ -29,7 +29,9 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
     val converter = ModelConverters.getInstance()
   }
 
-  class PropertiesScope[A](requiredBasedAnnotation: Boolean = true, requiredBasedDefaultValue: Boolean = true, debug: Boolean = false)(implicit tt: ClassTag[A]) extends TestScope {
+  class PropertiesScope[A](requiredBasedAnnotation: Boolean = true, requiredBasedDefaultValue: Boolean = true, debug: Boolean = false)(
+      implicit tt: ClassTag[A]
+  ) extends TestScope {
     SwaggerScalaModelConverter.setRequiredBasedOnAnnotation(requiredBasedAnnotation)
     SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue(requiredBasedDefaultValue)
     val schemas = converter.readAll(tt.runtimeClass).asScala.toMap
@@ -161,7 +163,8 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
   }
 
   it should "prioritize required as specified in annotation by default" in new PropertiesScope[ModelWOptionIntSchemaOverrideForRequired](
-    true, true
+    true,
+    true
   ) {
     val requiredIntWithDefault = model.value.getProperties.get("requiredIntWithDefault")
     requiredIntWithDefault shouldBe an[IntegerSchema]
@@ -186,8 +189,11 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
     nullSafeSeq(model.value.getRequired).toSet shouldEqual Set("annotatedOptionalInt", "requiredInt")
   }
 
-  it should "prioritize required as specified in annotation and not based on default value" in new PropertiesScope[ModelWOptionIntSchemaOverrideForRequired](
-    true, false
+  it should "prioritize required as specified in annotation and not based on default value" in new PropertiesScope[
+    ModelWOptionIntSchemaOverrideForRequired
+  ](
+    true,
+    false
   ) {
     val requiredIntWithDefault = model.value.getProperties.get("requiredIntWithDefault")
     requiredIntWithDefault shouldBe an[IntegerSchema]
@@ -263,7 +269,14 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
     annotatedOptionalStringWithNoneDefault shouldBe an[StringSchema]
     annotatedOptionalStringWithNoneDefault.asInstanceOf[StringSchema].getDefault should be(null)
 
-    nullSafeSeq(model.value.getRequired).toSet shouldEqual Set("requiredInt", "requiredIntWithDefault", "annotatedRequiredInt", "annotatedRequiredIntWithDefault", "annotatedIntWithDefault", "annotatedOptionalInt")
+    nullSafeSeq(model.value.getRequired).toSet shouldEqual Set(
+      "requiredInt",
+      "requiredIntWithDefault",
+      "annotatedRequiredInt",
+      "annotatedRequiredIntWithDefault",
+      "annotatedIntWithDefault",
+      "annotatedOptionalInt"
+    )
   }
 
   it should "consider fields that aren't optional required if `requiredBasedAnnotation == true`" in new PropertiesScope[

src/test/scala/models/Animal.scala

@@ -8,4 +8,4 @@ class Dog(val name: String) extends Animal("Dog")
 
 class Cat(val name: String, val age: Int) extends Animal("Cat")
 
-case class PetOwner(owner: String, pet: Animal)
+case class PetOwner(owner: String, pet: Animal)

src/test/scala/models/ModelWBigDecimalAnnotated.scala

@@ -3,8 +3,7 @@ package models
 import io.swagger.v3.oas.annotations.media.Schema
 
 case class ModelWBigDecimalAnnotated(
-    @Schema(description = "bigdecimal value", `type` = "string", example = "42.0",
-          required = true, deprecated = true) field: BigDecimal
+    @Schema(description = "bigdecimal value", `type` = "string", example = "42.0", required = true, deprecated = true) field: BigDecimal
 )
 
 case class ModelWBigDecimalNoType(field: BigDecimal)