Merge 4391742 into 23c9d51

ePages-de · Dec 21, 2018 · 33ccea1 · 33ccea1
2 parents 23c9d51 + 4391742
commit 33ccea1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -103,7 +103,7 @@ subprojects {
                 }
             }
         }
-        
+
         apply(plugin = "com.jfrog.bintray")
         configure<BintrayExtension> {
             user = project.findProperty("bintrayUser") as String? ?: System.getenv("BINTRAY_USER")

diff --git a/.../kotlin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGenerator.kt b/.../kotlin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGenerator.kt
@@ -229,7 +229,14 @@ class JsonSchemaFromFieldDescriptorsGenerator {
                 "null" -> NullSchema.builder()
                 "empty" -> EmptySchema.builder()
                 "object" -> ObjectSchema.builder()
-                "array" -> ArraySchema.builder()
+                "array" -> ArraySchema.builder().allItemSchema(CombinedSchema.oneOf(
+                        listOf(
+                                ObjectSchema.builder().build(),
+                                BooleanSchema.builder().build(),
+                                StringSchema.builder().build(),
+                                NumberSchema.builder().build()
+                        )
+                ).build())
                 "boolean" -> BooleanSchema.builder()
                 "number" -> NumberSchema.builder()
                 "string" -> StringSchema.builder()

diff --git a/...lin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGeneratorTest.kt b/...lin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGeneratorTest.kt
@@ -183,6 +183,17 @@ class JsonSchemaFromFieldDescriptorsGeneratorTest {
         then(JsonPath.read<String>(schemaString, "properties.id.description")).isNotEmpty()
     }
 
+    @Test
+    fun should_generate_schema_for_unspecified_array_contents() {
+        givenFieldDescriptorUnspecifiedArrayItems()
+
+        whenSchemaGenerated()
+
+        then(schema).isInstanceOf(ObjectSchema::class.java)
+        thenSchemaIsValid()
+        thenSchemaValidatesJson("""{ some: [ { "a": "b" } ] }""")
+    }
+
     private fun thenSchemaIsValid() {
 
         val report = JsonSchemaFactory.byDefault()
@@ -213,6 +224,10 @@ class JsonSchemaFromFieldDescriptorsGeneratorTest {
         fieldDescriptors = listOf(FieldDescriptor("[][]", "some", "ARRAY"))
     }
 
+    private fun givenFieldDescriptorUnspecifiedArrayItems() {
+        fieldDescriptors = listOf(FieldDescriptor("some[]", "some", "ARRAY"))
+    }
+
     private fun givenFieldDescriptorWithInvalidType() {
         fieldDescriptors = listOf(FieldDescriptor("id", "some", "invalid-type"))
     }