Merge pull request #1 from volanty/issue-74

fix npe when missing required field
volanty · Sep 14, 2020 · 7444799 · 7444799
2 parents 4d60e2a + 96c06ce
commit 7444799
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPIRequiredFieldException.kt b/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPIRequiredFieldException.kt
@@ -0,0 +1,3 @@
+package com.papsign.ktor.openapigen.exceptions
+
+class OpenAPIRequiredFieldException (override val message: String) : Exception(message)
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/parameters/handlers/ModularParameterHandler.kt b/src/main/kotlin/com/papsign/ktor/openapigen/parameters/handlers/ModularParameterHandler.kt
@@ -7,6 +7,7 @@ import com.papsign.ktor.openapigen.annotations.parameters.HeaderParam
 import com.papsign.ktor.openapigen.annotations.parameters.PathParam
 import com.papsign.ktor.openapigen.annotations.parameters.QueryParam
 import com.papsign.ktor.openapigen.annotations.parameters.apiParam
+import com.papsign.ktor.openapigen.exceptions.OpenAPIRequiredFieldException
 import com.papsign.ktor.openapigen.model.operation.ParameterLocation
 import com.papsign.ktor.openapigen.model.operation.ParameterModel
 import com.papsign.ktor.openapigen.model.schema.SchemaModel
@@ -26,7 +27,10 @@ class ModularParameterHandler<T>(val parsers: Map<KParameter, Builder<*>>, val c
     ParameterHandler<T> {
 
     override fun parse(parameters: Parameters, headers: Headers): T {
-        return constructor.callBy(parsers.mapValues { it.value.build(it.key.name.toString(), it.key.remapOpenAPINames(parameters.toMap() + headers.toMap())) })
+        return constructor.callBy(parsers.mapValues {
+            it.value.build(it.key.name.toString(), it.key.remapOpenAPINames(parameters.toMap() + headers.toMap()))
+                ?: throw OpenAPIRequiredFieldException("""The field ${it.key.openAPIName ?: "unknow field"} is required""")
+        })
     }
 
     override fun getParameters(apiGen: OpenAPIGen, provider: ModuleProvider<*>): List<ParameterModel<*>> {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.papsign.ktor.openapigen.exceptions

		class OpenAPIRequiredFieldException (override val message: String) : Exception(message)