Allow overriding required-value in ArraySchema (#56)

Co-authored-by: Nicolai Holm <[email protected]>

Author: Solicia

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

@@ -10,7 +10,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.annotations.media.{ArraySchema, Schema => SchemaAnnotation}
 import io.swagger.v3.oas.models.media.Schema
 
 class AnnotatedTypeForOption extends AnnotatedType
@@ -74,6 +74,7 @@ class SwaggerScalaModelConverter extends ModelResolver(Json.mapper()) {
       nullSafeList(`type`.getCtxAnnotations).collect {
         case p: Parameter => p.required()
         case s: SchemaAnnotation => s.required()
+        case a: ArraySchema => a.arraySchema().required()
       }
     }
   }

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

@@ -348,6 +348,22 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     }
   }
 
+  it should "process Array-Model with Scala nonOption Seq" in {
+    val converter = ModelConverters.getInstance()
+    val schemas = converter.readAll(classOf[ModelWStringSeq]).asScala.toMap
+    val model = findModel(schemas, "ModelWStringSeq")
+    model should be(defined)
+    nullSafeList(model.value.getRequired) shouldEqual Seq()
+  }
+
+  it should "process Array-Model with forced required Scala Option Seq" in {
+    val converter = ModelConverters.getInstance()
+    val schemas = converter.readAll(classOf[ModelWOptionStringSeq]).asScala.toMap
+    val model = findModel(schemas, "ModelWOptionStringSeq")
+    model should be(defined)
+    nullSafeList(model.value.getRequired) shouldEqual Seq("listOfStrings")
+  }
+
   private def nullSafeList[T](list: java.util.List[T]): List[T] = Option(list) match {
     case None => List[T]()
     case Some(l) => l.asScala.toList

src/test/scala/models/ModelWOptionSeqString.scala

@@ -0,0 +1,7 @@
+package models
+
+import io.swagger.v3.oas.annotations.media.{ArraySchema, Schema}
+
+case class ModelWStringSeq(@ArraySchema(arraySchema = new Schema(required = false), schema = new Schema(implementation = classOf[String])) listOfStrings: Seq[String] = Seq.empty[String])
+
+case class ModelWOptionStringSeq(@ArraySchema(arraySchema = new Schema(required = true), schema = new Schema(implementation = classOf[String])) listOfStrings: Option[Seq[String]] = Some(Seq.empty[String]))