Skip to content

Commit 8e7afa0

Browse files
authored
ignore array schema items (#313)
1 parent b41fbee commit 8e7afa0

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
239239
} else {
240240
val arraySchemaOverride = propertyAnnotations.collectFirst { case as: ArraySchemaAnnotation => as }
241241
arraySchemaOverride.flatMap { as =>
242-
val itemSchema = if (as.items() == null || as.items().implementation() == VoidClass) as.schema() else as.items()
242+
val itemSchema = as.schema()
243243
val classOption: Option[Class[_]] = if (itemSchema == null || itemSchema.implementation() == VoidClass) {
244244
None
245245
} else {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ class ModelPropertyParserTest extends AnyFlatSpec with BeforeAndAfterEach with M
182182
val arraySchema = numbers.asInstanceOf[ArraySchema]
183183
arraySchema.getMinItems shouldEqual 2
184184
arraySchema.getMaxItems shouldEqual 10
185-
// assertion disabled due to https://github.com/swagger-api/swagger-core/issues/4610
186-
// arraySchema.getItems shouldBe an[IntegerSchema]
185+
arraySchema.getItems shouldBe a[NumberSchema]
187186
}
188187

189188
it should "process AddRequestOldStyleAnnotation" in new PropertiesScope[AddRequestOldStyleAnnotation] {

src/test/scala/models/AddRequest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package models
22

33
import io.swagger.v3.oas.annotations.media.{ArraySchema, Schema}
44

5-
case class AddRequest(@ArraySchema(items = new Schema(implementation = classOf[Long]), minItems = 2, maxItems = 10)
6-
numbers: Array[Double])
5+
case class AddRequest(@ArraySchema(minItems = 2, maxItems = 10) numbers: Array[Double])
76

87
case class AddRequestOldStyleAnnotation(@ArraySchema(schema = new Schema(implementation = classOf[Long]), minItems = 2, maxItems = 10)
98
numbers: Array[Double])

0 commit comments

Comments
 (0)