update kotlin samples

swagger-api · Nov 16, 2018 · 8813ead · 8813ead
1 parent 4c72ac0
commit 8813ead
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 35 deletions.
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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://petstore.swagger.io/v2") : ApiCl
  query = localVariableQuery,
  headers = localVariableHeaders
  )
- val response = request<Any?>(
+ val response = request<Unit>(
  localVariableConfig,
  localVariableBody
  )

diff --git a/...ient/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/...ient/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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://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:https://petstore.swagger.io/v2") : ApiCl
  query = localVariableQuery,
  headers = localVariableHeaders
  )
- val response = request<Any?>(
+ val response = request<Unit>(
  localVariableConfig,
  localVariableBody
  )

diff --git a/.../petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/.../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:https://swagger.io](http:https://swagger.io) or on [irc.freenode.net, #swagger](http:https://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