add missing application/x-www-form-urlencoded when destructuring a request body (openapi-processor/openapi-processor-spring#479)

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -179,7 +179,8 @@ class  ApiConverter(
                 Documentation(
                     summary = operation.summary,
                     description = operation.description
-                ))
+                ),
+                requestBodies.consumesContentTypes)
 
             checkSuccessResponse(ep)
             ep
@@ -222,7 +223,11 @@ class  ApiConverter(
         return mappingFinder.findDropParameterTypeMappings(MappingFinderQuery(path, method))
     }
 
-    data class RequestBodies(val bodies: List<ModelRequestBody>, val parameters: List<ModelParameter>)
+    data class RequestBodies(
+        val bodies: List<ModelRequestBody>,
+        val parameters: List<ModelParameter>,
+        /* additional content types that are lost otherwise */
+        val consumesContentTypes: Set<String> = emptySet())
 
     private fun collectRequestBodies(requestBody: RequestBody?, ctx: ApiConverterContext): RequestBodies {
         if (requestBody == null) {
@@ -231,6 +236,7 @@ class  ApiConverter(
 
         val bodies: MutableList<ModelRequestBody> = mutableListOf()
         val params: MutableList<ModelParameter> = mutableListOf()
+        val consumesContentTypes = mutableSetOf<String>()
 
         requestBody.getContent().forEach { (contentType, mediaType) ->
             val info = SchemaInfo(
@@ -247,14 +253,15 @@ class  ApiConverter(
                 if (isBodyStyleObject(info)) {
                     bodies.add(createRequestBody(contentType, info, requestBody, ctx.dataTypes))
                 } else {
+                    consumesContentTypes.add(contentType)
                     params.addAll(createUrlencodedParameter(info, requestBody, ctx.dataTypes))
                 }
             } else {
                 bodies.add(createRequestBody(contentType, info, requestBody, ctx.dataTypes))
             }
         }
 
-        return RequestBodies(bodies, params)
+        return RequestBodies(bodies, params, consumesContentTypes)
     }
 
     private fun isBodyStyleObject(info: SchemaInfo): Boolean {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/Endpoint.kt

@@ -9,7 +9,6 @@ package io.openapiprocessor.core.model
 import io.openapiprocessor.core.model.parameters.MultipartParameter
 import io.openapiprocessor.core.model.parameters.Parameter
 import io.openapiprocessor.core.openapi.HttpMethod
-import kotlin.collections.plusAssign
 
 /**
  * Endpoint properties.
@@ -22,7 +21,9 @@ class Endpoint(
     val responses: Map<HttpStatus, List<Response>>,
     val operationId: String? = null,
     val deprecated: Boolean = false,
-    private val documentation: Documentation? = null
+    private val documentation: Documentation? = null,
+    /** additional content types that can't be autodetected here */
+    private val consumesContentTypes: Set<String> = emptySet()
 ) {
     // grouped responses
     val endpointResponses: List<EndpointResponse> = createEndpointResponses()
@@ -71,6 +72,8 @@ class Endpoint(
             contentTypes.add ("multipart/form-data")
         }
 
+        contentTypes.addAll (consumesContentTypes)
+
         return contentTypes
     }
 

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/ApiConverterRequestBodySpec.kt

@@ -10,6 +10,7 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.booleans.shouldBeFalse
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.collections.shouldBeEmpty
+import io.kotest.matchers.collections.shouldContainAnyOf
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
@@ -293,6 +294,8 @@ class ApiConverterRequestBodySpec: StringSpec({
         val foo = ep.parameters[0]
         val bar = ep.parameters[1]
 
+        ep.getConsumesContentTypes() shouldContainAnyOf listOf("application/x-www-form-urlencoded")
+
         foo.dataType.getName() shouldBe "string"
         foo.dataType.getTypeName() shouldBe "String"
         foo.name shouldBe "foo"
@@ -384,6 +387,8 @@ class ApiConverterRequestBodySpec: StringSpec({
         ep.parameters.isEmpty()
         val body = ep.requestBodies.first()
 
+        ep.getConsumesContentTypes() shouldContainAnyOf listOf("application/x-www-form-urlencoded")
+
         body.dataType.getTypeName() shouldBe "FooPostRequestBody"
         body.name shouldBe "body"
     }