Merge pull request #8924 from swagger-api/update-kotlin-samples

frantuma · web-flow · commit 3b8c2f3214db · 2018-11-16T16:51:25.000+01:00
update kotlin samples
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/PetApi.kt
@@ -40,7 +40,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -78,7 +78,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -229,7 +229,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -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")
@@ -268,7 +268,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -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")
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
@@ -39,7 +39,7 @@ class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiC
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/UserApi.kt
@@ -39,7 +39,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -76,7 +76,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -113,7 +113,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -150,7 +150,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -263,7 +263,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -301,7 +301,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/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)
@@ -58,6 +67,8 @@ open class ApiClient(val baseUrl: String) {
         
         if(T::class.java == java.io.File::class.java){
             return downloadFileFromResponse(response) as T
+        } else if(T::class == kotlin.Unit::class) {
+            return kotlin.Unit as T
         }
         
         var contentType = response.headers().get("Content-Type")
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/PetApi.kt
@@ -41,7 +41,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -79,7 +79,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -230,7 +230,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -254,7 +254,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")
@@ -269,7 +269,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -294,7 +294,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")
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
@@ -40,7 +40,7 @@ class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiC
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/UserApi.kt
@@ -40,7 +40,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -77,7 +77,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -114,7 +114,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -151,7 +151,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -264,7 +264,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
@@ -302,7 +302,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val response = request<Any?>(
+        val response = request<Unit>(
             localVariableConfig,
             localVariableBody
         )
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/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)
@@ -58,6 +67,8 @@ open class ApiClient(val baseUrl: String) {
         
         if(T::class.java == java.io.File::class.java){
             return downloadFileFromResponse(response) as T
+        } else if(T::class == kotlin.Unit::class) {
+            return kotlin.Unit as T
         }
         
         var contentType = response.headers().get("Content-Type")
diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,7 +2,7 @@
 
 This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
 
-Generated by Swagger Codegen 2.4.0-SNAPSHOT (2018-10-21T21:30:13.105-05:00).
+Generated by Swagger Codegen 2.4.0-SNAPSHOT (2018-11-16T16:11:36.668+01:00).
 
 ## Requires
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiC`
`39`	`39`	`query = localVariableQuery,`
`40`	`40`	`headers = localVariableHeaders`
`41`	`41`	`)`
`42`		`- val response = request<Any?>(`
	`42`	`+ val response = request<Unit>(`
`43`	`43`	`localVariableConfig,`
`44`	`44`	`localVariableBody`
`45`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`39`	`39`	`query = localVariableQuery,`
`40`	`40`	`headers = localVariableHeaders`
`41`	`41`	`)`
`42`		`- val response = request<Any?>(`
	`42`	`+ val response = request<Unit>(`
`43`	`43`	`localVariableConfig,`
`44`	`44`	`localVariableBody`
`45`	`45`	`)`
`@@ -76,7 +76,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`76`	`76`	`query = localVariableQuery,`
`77`	`77`	`headers = localVariableHeaders`
`78`	`78`	`)`
`79`		`- val response = request<Any?>(`
	`79`	`+ val response = request<Unit>(`
`80`	`80`	`localVariableConfig,`
`81`	`81`	`localVariableBody`
`82`	`82`	`)`
`@@ -113,7 +113,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`113`	`113`	`query = localVariableQuery,`
`114`	`114`	`headers = localVariableHeaders`
`115`	`115`	`)`
`116`		`- val response = request<Any?>(`
	`116`	`+ val response = request<Unit>(`
`117`	`117`	`localVariableConfig,`
`118`	`118`	`localVariableBody`
`119`	`119`	`)`
`@@ -150,7 +150,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`150`	`150`	`query = localVariableQuery,`
`151`	`151`	`headers = localVariableHeaders`
`152`	`152`	`)`
`153`		`- val response = request<Any?>(`
	`153`	`+ val response = request<Unit>(`
`154`	`154`	`localVariableConfig,`
`155`	`155`	`localVariableBody`
`156`	`156`	`)`
`@@ -263,7 +263,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`263`	`263`	`query = localVariableQuery,`
`264`	`264`	`headers = localVariableHeaders`
`265`	`265`	`)`
`266`		`- val response = request<Any?>(`
	`266`	`+ val response = request<Unit>(`
`267`	`267`	`localVariableConfig,`
`268`	`268`	`localVariableBody`
`269`	`269`	`)`
`@@ -301,7 +301,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`301`	`301`	`query = localVariableQuery,`
`302`	`302`	`headers = localVariableHeaders`
`303`	`303`	`)`
`304`		`- val response = request<Any?>(`
	`304`	`+ val response = request<Unit>(`
`305`	`305`	`localVariableConfig,`
`306`	`306`	`localVariableBody`
`307`	`307`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiC`
`40`	`40`	`query = localVariableQuery,`
`41`	`41`	`headers = localVariableHeaders`
`42`	`42`	`)`
`43`		`- val response = request<Any?>(`
	`43`	`+ val response = request<Unit>(`
`44`	`44`	`localVariableConfig,`
`45`	`45`	`localVariableBody`
`46`	`46`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`40`	`40`	`query = localVariableQuery,`
`41`	`41`	`headers = localVariableHeaders`
`42`	`42`	`)`
`43`		`- val response = request<Any?>(`
	`43`	`+ val response = request<Unit>(`
`44`	`44`	`localVariableConfig,`
`45`	`45`	`localVariableBody`
`46`	`46`	`)`
`@@ -77,7 +77,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`77`	`77`	`query = localVariableQuery,`
`78`	`78`	`headers = localVariableHeaders`
`79`	`79`	`)`
`80`		`- val response = request<Any?>(`
	`80`	`+ val response = request<Unit>(`
`81`	`81`	`localVariableConfig,`
`82`	`82`	`localVariableBody`
`83`	`83`	`)`
`@@ -114,7 +114,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`114`	`114`	`query = localVariableQuery,`
`115`	`115`	`headers = localVariableHeaders`
`116`	`116`	`)`
`117`		`- val response = request<Any?>(`
	`117`	`+ val response = request<Unit>(`
`118`	`118`	`localVariableConfig,`
`119`	`119`	`localVariableBody`
`120`	`120`	`)`
`@@ -151,7 +151,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`151`	`151`	`query = localVariableQuery,`
`152`	`152`	`headers = localVariableHeaders`
`153`	`153`	`)`
`154`		`- val response = request<Any?>(`
	`154`	`+ val response = request<Unit>(`
`155`	`155`	`localVariableConfig,`
`156`	`156`	`localVariableBody`
`157`	`157`	`)`
`@@ -264,7 +264,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`264`	`264`	`query = localVariableQuery,`
`265`	`265`	`headers = localVariableHeaders`
`266`	`266`	`)`
`267`		`- val response = request<Any?>(`
	`267`	`+ val response = request<Unit>(`
`268`	`268`	`localVariableConfig,`
`269`	`269`	`localVariableBody`
`270`	`270`	`)`
`@@ -302,7 +302,7 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl`
`302`	`302`	`query = localVariableQuery,`
`303`	`303`	`headers = localVariableHeaders`
`304`	`304`	`)`
`305`		`- val response = request<Any?>(`
	`305`	`+ val response = request<Unit>(`
`306`	`306`	`localVariableConfig,`
`307`	`307`	`localVariableBody`
`308`	`308`	`)`