fix: Schema is null (ePages-de#260)

Kieun · Feb 21, 2024 · ff600fa · ff600fa
1 parent e16f028
commit ff600fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...napi3-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3Generator.kt b/...napi3-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3Generator.kt
@@ -86,7 +86,7 @@ object OpenApi3Generator {
 
     private fun OpenAPI.makeSubSchema() {
         val schemas = this.components.schemas
-        val subSchemas = mutableMapOf<String, Schema<Any>>()
+        val subSchemas = mutableMapOf<String, Schema<Any>?>()
         schemas.forEach {
             val schema = it.value
             if (schema.properties != null) {
@@ -99,14 +99,14 @@ object OpenApi3Generator {
         }
     }
 
-    private fun makeSubSchema(schemas: MutableMap<String, Schema<Any>>, properties: Map<String, Schema<Any>>) {
-        properties.asSequence().filter { it.value.title != null }.forEach {
+    private fun makeSubSchema(schemas: MutableMap<String, Schema<Any>?>, properties: Map<String, Schema<Any>?>) {
+        properties.asSequence().filter { it.value?.title != null }.forEach {
             val objectMapper = jacksonObjectMapper()
             val subSchema = it.value
             val strSubSchema = objectMapper.writeValueAsString(subSchema)
-            val copySchema = objectMapper.readValue(strSubSchema, subSchema.javaClass)
+            val copySchema = objectMapper.readValue(strSubSchema, subSchema?.javaClass)
             val schemaTitle = copySchema.title
-            subSchema.`$ref`("#/components/schemas/$schemaTitle")
+            subSchema?.`$ref`("#/components/schemas/$schemaTitle")
             schemas[schemaTitle] = copySchema
             makeSubSchema(schemas, copySchema.properties)
         }

diff --git a/...3-generator/src/test/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3GeneratorTest.kt b/...3-generator/src/test/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3GeneratorTest.kt
@@ -1100,6 +1100,11 @@ class OpenApi3GeneratorTest {
                     description = "product id",
                     type = "STRING"
                 ),
+                FieldDescriptor(
+                    path = "null_value",
+                    description = "null_value",
+                    type = "NULL"
+                ),
                 FieldDescriptor(
                     path = "option",
                     description = "option",