Merge pull request #8822 from Frozenstep/Frozenstep_kotlin_void_respo…

…nse_type Frozenstep kotlin void response type
swagger-api · Nov 16, 2018 · 4c72ac0 · 4c72ac0
2 parents 5c367fc + 9f2e8fb
commit 4c72ac0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache b/modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache
@@ -36,7 +36,7 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(base
  query = localVariableQuery,
  headers = localVariableHeaders
  )
- val response = request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Any?{{/returnType}}>(
+ val response = request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}>(
  localVariableConfig,
  localVariableBody
  )

diff --git a/...les/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache b/...les/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache
@@ -67,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/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin/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
  )
@@ -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
  )

diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/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/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin/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/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
@@ -67,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")