[Kotlin] Allow other content-types when only interested in status-cod…

…e / Unit (#19801) * Allow Unit response * Updating samples * Improve comment for Unit shortcut
OpenAPITools · Oct 7, 2024 · 7d1e999 · 7d1e999
1 parent 9a0fc59
commit 7d1e999
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 42 deletions.
diff --git a/...rc/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/...rc/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache
@@ -167,8 +167,11 @@ import com.squareup.moshi.adapter
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...khttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...khttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...le-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...le-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...cimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...cimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...lt-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...lt-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...in-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...in-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/.../petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/.../petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -124,8 +124,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...tstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...tstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -124,8 +124,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...n-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...n-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -126,8 +126,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...vm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...vm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -127,8 +127,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...tlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...tlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...e/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...e/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/.../kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/.../kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...me-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...me-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...tore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...tore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ internal open class ApiClient(val baseUrl: String, val client: Call.Factory = de
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...store/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...store/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...etstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...etstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...ore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...ore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")
 

diff --git a/...lient/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/...lient/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -125,8 +125,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val body = response.body
         if(body == null) {
             return null
-        }
-        if (T::class.java == File::class.java) {
+        } else if (T::class.java == Unit::class.java) {
+            // No need to parse the body when we're not interested in the body
+            // Useful when API is returning other Content-Type
+            return null
+        } else if (T::class.java == File::class.java) {
             // return tempFile
             val contentDisposition = response.header("Content-Disposition")