extra option override test

Author: pjfanning

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

@@ -160,6 +160,32 @@ class ModelPropertyParserTest extends FlatSpec with Matchers {
     requiredItems shouldBe List("forcedRequired", "required")
   }
 
+  it should "process all properties as required barring Option[_] or if overridden in annotation (Schema annotation)" in {
+    val schemas = ModelConverters
+      .getInstance()
+      .readAll(classOf[ModelWithOptionAndNonOption2])
+      .asScala
+
+    val model = schemas("ModelWithOptionAndNonOption2")
+    model should not be (null)
+    model.getProperties() should not be (null)
+
+    val optional = model.getProperties().get("optional")
+    optional should not be (null)
+
+    val required = model.getProperties().get("required")
+    required should not be (null)
+
+    val forcedRequired = model.getProperties().get("forcedRequired")
+    forcedRequired should not be (null)
+
+    val forcedOptional = model.getProperties().get("forcedOptional")
+    forcedOptional should not be (null)
+
+    val requiredItems = nullSafeList(model.getRequired)
+    requiredItems shouldBe List("forcedRequired", "required")
+  }
+
   it should "handle null properties from converters later in the chain" in {
     object CustomConverter extends ModelConverter {
       override def resolve(`type`: AnnotatedType, context: ModelConverterContext, chain: util.Iterator[ModelConverter]): Schema[_] = {

src/test/scala/models/ModelWOptionString.scala

@@ -1,6 +1,7 @@
 package models
 
 import io.swagger.v3.oas.annotations.Parameter
+import io.swagger.v3.oas.annotations.media.Schema
 
 case class ModelWOptionString (
            stringOpt: Option[String],
@@ -14,3 +15,9 @@ case class ModelWithOptionAndNonOption(required: String,
                                        @Parameter(required = false) forcedOptional: String,
                                        @Parameter(required = true) forcedRequired: Option[String]
                                       )
+
+case class ModelWithOptionAndNonOption2(required: String,
+                                        optional: Option[String],
+                                        @Schema(required = false, implementation = classOf[String]) forcedOptional: String,
+                                        @Schema(required = true, implementation = classOf[String]) forcedRequired: Option[String]
+                                       )