Merge pull request #8827 from Frozenstep/Frozenstep-Kotlin-fixing-file-uploading

Frozenstep kotlin fixing file uploading

Author: frantuma

modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache

@@ -21,7 +21,7 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(base
     */{{#returnType}}
     @Suppress("UNCHECKED_CAST"){{/returnType}}
     fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
-        val localVariableBody: kotlin.Any? = {{#hasBodyParam}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}null{{/hasFormParams}}{{#hasFormParams}}mapOf({{#formParams}}"{{{baseName}}}" to "${{paramName}}"{{#hasMore}}, {{/hasMore}}{{/formParams}}){{/hasFormParams}}{{/hasBodyParam}}
+        val localVariableBody: kotlin.Any? = {{#hasBodyParam}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}null{{/hasFormParams}}{{#hasFormParams}}mapOf({{#formParams}}"{{{baseName}}}" to {{paramName}}{{#hasMore}}, {{/hasMore}}{{/formParams}}){{/hasFormParams}}{{/hasBodyParam}}
         val localVariableQuery: MultiValueMap = {{^hasQueryParams}}mapOf(){{/hasQueryParams}}{{#hasQueryParams}}mapOf({{#queryParams}}"{{baseName}}" to {{#isContainer}}toMultiValue({{paramName}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf("${{paramName}}"){{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}){{/hasQueryParams}}
 
         val contentHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf({{#hasFormParams}}"Content-Type" to "multipart/form-data"{{/hasFormParams}})

modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache

@@ -34,13 +34,22 @@ open class ApiClient(val baseUrl: String) {
                     MediaType.parse(mediaType), content
             )
         } else if(mediaType == FormDataMediaType) {
-            var builder = FormBody.Builder()
+           val requestBodyBuilder = MultipartBody.Builder().setType(MultipartBody.FORM)
+
             // content's type *must* be Map<String, Any>
             @Suppress("UNCHECKED_CAST")
-            (content as Map<String,String>).forEach { key, value ->
-                builder = builder.add(key, value)
+            (content as Map<String,Any>).forEach { key, value ->
+                if(value::class == File::class) {
+                    val file = value as File
+                    requestBodyBuilder.addFormDataPart(key, file.name, RequestBody.create(MediaType.parse("application/octet-stream"), file))
+                } else {
+                    val stringValue = value as String
+                    requestBodyBuilder.addFormDataPart(key, stringValue)
+                }
+                TODO("Handle other types inside FormDataMediaType")
             }
-            return builder.build()
+
+            return requestBodyBuilder.build()
         }  else if(mediaType == JsonMediaType) {
             return RequestBody.create(
                     MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content)

samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/PetApi.kt

@@ -253,7 +253,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     * @return void
     */
     fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String, status: kotlin.String) : Unit {
-        val localVariableBody: kotlin.Any? = mapOf("name" to "$name", "status" to "$status")
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
         val localVariableQuery: MultiValueMap = mapOf()
 
         val contentHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf("Content-Type" to "multipart/form-data")
@@ -293,7 +293,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     */
     @Suppress("UNCHECKED_CAST")
     fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String, file: java.io.File) : ApiResponse {
-        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to "$additionalMetadata", "file" to "$file")
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
         val localVariableQuery: MultiValueMap = mapOf()
 
         val contentHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf("Content-Type" to "multipart/form-data")

samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt

@@ -34,13 +34,22 @@ open class ApiClient(val baseUrl: String) {
                     MediaType.parse(mediaType), content
             )
         } else if(mediaType == FormDataMediaType) {
-            var builder = FormBody.Builder()
+           val requestBodyBuilder = MultipartBody.Builder().setType(MultipartBody.FORM)
+
             // content's type *must* be Map<String, Any>
             @Suppress("UNCHECKED_CAST")
-            (content as Map<String,String>).forEach { key, value ->
-                builder = builder.add(key, value)
+            (content as Map<String,Any>).forEach { key, value ->
+                if(value::class == File::class) {
+                    val file = value as File
+                    requestBodyBuilder.addFormDataPart(key, file.name, RequestBody.create(MediaType.parse("application/octet-stream"), file))
+                } else {
+                    val stringValue = value as String
+                    requestBodyBuilder.addFormDataPart(key, stringValue)
+                }
+                TODO("Handle other types inside FormDataMediaType")
             }
-            return builder.build()
+
+            return requestBodyBuilder.build()
         }  else if(mediaType == JsonMediaType) {
             return RequestBody.create(
                     MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content)