extend test

Author: pjfanning

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

@@ -9,6 +9,7 @@ import io.swagger.v3.core.converter._
 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.{Schema => SchemaAnnotation}
 import io.swagger.v3.oas.models.media.{Schema, StringSchema}
 
 class AnnotatedTypeForOption extends AnnotatedType
@@ -26,14 +27,7 @@ class SwaggerScalaModelConverter extends ModelResolver(Json.mapper()) {
 
     matchScalaPrimitives(`type`, cls).getOrElse {
       // Unbox scala options
-      val annotatedOverrides = `type` match {
-        case _: AnnotatedTypeForOption => Seq.empty
-        case _ => {
-          nullSafeList(`type`.getCtxAnnotations).collect {
-            case p: Parameter => p.required()
-          }
-        }
-      }
+      val annotatedOverrides = getRequiredSettings(`type`)
       if (_isOptional(`type`, cls)) {
         val baseType = if (annotatedOverrides.headOption.getOrElse(false)) new AnnotatedType() else new AnnotatedTypeForOption()
         resolve(nextType(baseType, `type`, cls, javaType), context, chain)
@@ -54,6 +48,16 @@ class SwaggerScalaModelConverter extends ModelResolver(Json.mapper()) {
     }
   }
 
+  private def getRequiredSettings(`type`: AnnotatedType): Seq[Boolean] = `type` match {
+    case _: AnnotatedTypeForOption => Seq.empty
+    case _ => {
+      nullSafeList(`type`.getCtxAnnotations).collect {
+        case p: Parameter => p.required()
+        case s: SchemaAnnotation => s.required()
+      }
+    }
+  }
+
   private def matchScalaPrimitives(`type`: AnnotatedType, nullableClass: Class[_]): Option[Schema[_]] = {
     Option(nullableClass).flatMap { cls =>
       // handle scala enums
@@ -126,9 +130,12 @@ class SwaggerScalaModelConverter extends ModelResolver(Json.mapper()) {
   private def setRequired(annotatedType: AnnotatedType): Unit = annotatedType match {
     case _: AnnotatedTypeForOption => // not required
     case _ => {
-      Option(annotatedType.getParent).foreach { parent =>
-        Option(annotatedType.getPropertyName).foreach { n =>
-          addRequiredItem(parent, n)
+      val required = getRequiredSettings(annotatedType).headOption.getOrElse(true)
+      if (required) {
+        Option(annotatedType.getParent).foreach { parent =>
+          Option(annotatedType.getPropertyName).foreach { n =>
+            addRequiredItem(parent, n)
+          }
         }
       }
     }

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

@@ -119,8 +119,7 @@ class ModelPropertyParserTest extends FlatSpec with Matchers {
     val optInt = model.get.getProperties().get("optInt")
     optInt should not be (null)
     optInt shouldBe a [IntegerSchema]
-    //there is a bug that the override causes the field to be marked as required
-    //nullSafeList(model.get.getRequired) shouldBe empty
+    nullSafeList(model.get.getRequired) shouldBe empty
   }
 
   it should "process Model with Scala Option Boolean" in {