Merge pull request #8822 from Frozenstep/Frozenstep_kotlin_void_response_type

frantuma · web-flow · commit 4c72ac0c5a2f · 2018-11-16T16:10:39.000+01:00
Frozenstep kotlin void response type
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/modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache b/modules/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://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
         )
@@ -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
         )
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://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://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/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")

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(base`
`36`	`36`	`query = localVariableQuery,`
`37`	`37`	`headers = localVariableHeaders`
`38`	`38`	`)`
`39`		`- val response = request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Any?{{/returnType}}>(`
	`39`	`+ val response = request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}>(`
`40`	`40`	`localVariableConfig,`
`41`	`41`	`localVariableBody`
`42`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ open class ApiClient(val baseUrl: String) {`
`67`	`67`
`68`	`68`	`if(T::class.java == java.io.File::class.java){`
`69`	`69`	`return downloadFileFromResponse(response) as T`
	`70`	`+ } else if(T::class == kotlin.Unit::class) {`
	`71`	`+ return kotlin.Unit as T`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`var contentType = response.headers().get("Content-Type")`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli`
`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`	`)`
`@@ -78,7 +78,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli`
`78`	`78`	`query = localVariableQuery,`
`79`	`79`	`headers = localVariableHeaders`
`80`	`80`	`)`
`81`		`- val response = request<Any?>(`
	`81`	`+ val response = request<Unit>(`
`82`	`82`	`localVariableConfig,`
`83`	`83`	`localVariableBody`
`84`	`84`	`)`
`@@ -229,7 +229,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli`
`229`	`229`	`query = localVariableQuery,`
`230`	`230`	`headers = localVariableHeaders`
`231`	`231`	`)`
`232`		`- val response = request<Any?>(`
	`232`	`+ val response = request<Unit>(`
`233`	`233`	`localVariableConfig,`
`234`	`234`	`localVariableBody`
`235`	`235`	`)`
`@@ -268,7 +268,7 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli`
`268`	`268`	`query = localVariableQuery,`
`269`	`269`	`headers = localVariableHeaders`
`270`	`270`	`)`
`271`		`- val response = request<Any?>(`
	`271`	`+ val response = request<Unit>(`
`272`	`272`	`localVariableConfig,`
`273`	`273`	`localVariableBody`
`274`	`274`	`)`
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`	`)`