Merge branch 'develop' into v2.7

Author: pjfanning

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

@@ -10,7 +10,7 @@ import io.swagger.v3.core.jackson.ModelResolver
 import io.swagger.v3.core.util.{Json, PrimitiveType}
 import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.media.{ArraySchema, Schema => SchemaAnnotation}
-import io.swagger.v3.oas.models.media.{ObjectSchema, Schema}
+import io.swagger.v3.oas.models.media.{MapSchema, ObjectSchema, Schema}
 import org.slf4j.LoggerFactory
 
 import java.lang.annotation.Annotation
@@ -294,17 +294,22 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
   }
 
   private[converter] def tryCorrectSchema(itemSchema: Schema[_], primitiveType: PrimitiveType): Schema[_] = {
-    Try {
-      val primitiveProperty = primitiveType.createProperty()
-      val propAsString = objectMapper.writeValueAsString(itemSchema)
-      val correctedSchema = objectMapper.readValue(propAsString, primitiveProperty.getClass)
-      correctedSchema.setType(primitiveProperty.getType)
-      Option(itemSchema.getFormat) match {
-        case Some(_) =>
-        case _ => correctedSchema.setFormat(primitiveProperty.getFormat)
+    itemSchema match {
+      case ms: MapSchema => ms
+      case _ => {
+        Try {
+          val primitiveProperty = primitiveType.createProperty()
+          val propAsString = objectMapper.writeValueAsString(itemSchema)
+          val correctedSchema = objectMapper.readValue(propAsString, primitiveProperty.getClass)
+          correctedSchema.setType(primitiveProperty.getType)
+          Option(itemSchema.getFormat) match {
+            case Some(_) =>
+            case _ => correctedSchema.setFormat(primitiveProperty.getFormat)
+          }
+          correctedSchema
+        }.toOption.getOrElse(itemSchema)
       }
-      correctedSchema
-    }.toOption.getOrElse(itemSchema)
+    }
   }
 
 

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

@@ -17,10 +17,12 @@ import scala.reflect.ClassTag
 class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with Matchers with OptionValues {
   override protected def beforeEach() = {
     SwaggerScalaModelConverter.setRequiredBasedOnAnnotation(true)
+    SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue(true)
   }
 
   override protected def afterEach() = {
     SwaggerScalaModelConverter.setRequiredBasedOnAnnotation(true)
+    SwaggerScalaModelConverter.setRequiredBasedOnDefaultValue(true)
   }
 
   trait TestScope {
@@ -389,6 +391,7 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
 
   it should "process Model with Scala BigDecimal with annotation" in new PropertiesScope[ModelWBigDecimalAnnotated]() {
     val fieldSchema = model.value.getProperties.get("field")
+    fieldSchema.getDeprecated shouldBe java.lang.Boolean.TRUE
     fieldSchema shouldBe a[StringSchema]
     fieldSchema.asInstanceOf[StringSchema].getExample shouldEqual ("42.0")
     nullSafeSeq(model.value.getRequired) shouldEqual Seq("field")
@@ -397,6 +400,7 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
   it should "map BigDecimal to schema type 'number'" in new PropertiesScope[ModelWBigDecimalNoType]() {
     val properties = model.value.getProperties
     val fieldSchema = properties.get("field")
+    fieldSchema.getDeprecated shouldBe null
     properties should have size 1
 
     fieldSchema shouldBe a[NumberSchema]
@@ -470,17 +474,27 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
   it should "default to supplied schema if it can't be corrected" in new PropertiesScope[ModelWMapStringCaseClass] {
     schemas should have size 2
 
+    nullSafeSeq(model.value.getRequired) shouldBe empty
     val mapField = model.value.getProperties.get("maybeMapStringCaseClass")
     mapField shouldBe a[MapSchema]
     mapField.getAdditionalProperties shouldBe a[Schema[_]]
     mapField.getAdditionalProperties.asInstanceOf[Schema[_]].get$ref() shouldBe "#/components/schemas/SomeCaseClass"
 
-
     val caseClassField = schemas("SomeCaseClass")
     caseClassField shouldBe a[Schema[_]]
     caseClassField.getProperties.get("field") shouldBe an[IntegerSchema]
   }
 
+  it should "handle Option[Map[String, Long]]" in new PropertiesScope[ModelWMapStringLong] {
+    schemas should have size 1
+
+    nullSafeSeq(model.value.getRequired) shouldBe empty
+    val mapField = model.value.getProperties.get("maybeMapStringLong")
+    mapField shouldBe a[MapSchema]
+    nullSafeMap(mapField.getProperties) shouldBe empty
+    mapField.getAdditionalProperties shouldBe a[Schema[_]]
+  }
+
   it should "process Model with Scala Seq" in new PropertiesScope[ModelWSeqString] {
     schemas should have size 1
     val stringsField = model.value.getProperties.get("strings")

src/test/scala/models/ModelWBigDecimalAnnotated.scala

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

src/test/scala/models/ModelWSeqString.scala

@@ -12,4 +12,6 @@ case class SomeCaseClass(field: Int)
 
 case class ModelWMapStringCaseClass(maybeMapStringCaseClass: Option[Map[String, SomeCaseClass]])
 
+case class ModelWMapStringLong(maybeMapStringLong: Option[Map[String, Long]])
+
 case class ModelWJavaMapString(strings: java.util.Map[String, String])