Revert "[Kotlin] fix #20231, OkHttp client can handle a field with a list of…" (#20257)

This reverts commit 71ccc88037216d973b0df12d4b6c618ae00b355b.

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache

@@ -114,48 +114,6 @@ import com.squareup.moshi.adapter
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -167,18 +125,21 @@ import com.squareup.moshi.adapter
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ public open class ApiClient(public val baseUrl: String, public val client: Call.
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ public open class ApiClient(public val baseUrl: String, public val client: Call.
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -87,48 +87,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -140,18 +98,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -88,48 +88,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -141,18 +99,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -86,48 +86,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -139,18 +97,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()

samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -85,48 +85,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         return contentType ?: "application/octet-stream"
     }
 
-    /**
-     * Adds a File to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is a File
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param file The file that will be added as the field value
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, file: File) {
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${file.name}\"")
-        val fileMediaType = guessContentTypeFromFile(file).toMediaTypeOrNull()
-        addPart(
-            partHeaders.toHeaders(),
-            file.asRequestBody(fileMediaType)
-        )
-    }
-
-    /**
-     * Adds any type to a MultipartBody.Builder
-     * Defined a helper in the requestBody method to not duplicate code
-     * It will be used when the content is a FormDataMediaType and the body of the PartConfig is not a File.
-     *
-     * @param name The field name to add in the request
-     * @param headers The headers that are in the PartConfig
-     * @param obj The field name to add in the request
-     * @return The method returns Unit but the new Part is added to the Builder that the extension function is applying on
-     * @see requestBody
-     */
-    protected fun <T> MultipartBody.Builder.addPartToMultiPart(name: String, headers: Map<String, String>, obj: T?) {
-        if (obj == null) return
-        val partHeaders = headers.toMutableMap() +
-            ("Content-Disposition" to "form-data; name=\"$name\"")
-        addPart(
-            partHeaders.toHeaders(),
-            parameterToString(obj).toRequestBody(null)
-        )
-    }
-
     protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
         when {
             content is ByteArray -> content.toRequestBody((mediaType ?: guessContentTypeFromByteArray(content)).toMediaTypeOrNull())
@@ -138,18 +96,21 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                         // content's type *must* be Map<String, PartConfig<*>>
                         @Suppress("UNCHECKED_CAST")
                         (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            when (part.body) {
+                            if (part.body is File) {
-                                is File -> addPartToMultiPart(name, part.headers, part.body)
+                                val partHeaders = part.headers.toMutableMap() +
-                                is List<*> -> {
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                    part.body.forEach {
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                        if (it is File) {
+                                addPart(
-                                            addPartToMultiPart(name, part.headers, it)
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
                             } else {
-                                            addPartToMultiPart(name, part.headers, it)
+                                val partHeaders = part.headers.toMutableMap() +
-                                        }
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                    }
+                                addPart(
-                               }
+                                    partHeaders.toHeaders(),
-                               else -> addPartToMultiPart(name, part.headers, part.body)
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
                             }
                         }
                     }.build()